no message

fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml

@@ -161,34 +161,36 @@
         SELECT
             -- 当天的数据和条数
             CAST((SELECT COUNT(*) FROM card_value_record WHERE DATE(create_time) = CURDATE() and store_id = #{storeId}) AS CHAR) AS today_count,
-            CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE DATE(create_time) = CURDATE()and store_id = #{storeId}) AS CHAR) AS today_sum,
+            CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END )  FROM card_value_record WHERE DATE(create_time) = CURDATE()and store_id = #{storeId}) AS CHAR) AS today_sum,
 
             -- 当周的数据和条数
             CAST((SELECT COUNT(*) FROM card_value_record WHERE WEEK(create_time) = WEEK(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_week_count,
-            CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE WEEK(create_time) = WEEK(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_week_sum,
+            CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END )   FROM card_value_record WHERE WEEK(create_time) = WEEK(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_week_sum,
 
             -- 当月的数据和条数
             CAST((SELECT COUNT(*) FROM card_value_record WHERE MONTH(create_time) = MONTH(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_month_count,
-            CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE MONTH(create_time) = MONTH(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_month_sum,
+            CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END )   FROM card_value_record WHERE MONTH(create_time) = MONTH(CURDATE())and store_id = #{storeId}) AS CHAR) AS this_month_sum,
 
             -- 昨天的数据
             CAST((SELECT COUNT(*) FROM card_value_record WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)and store_id = #{storeId}) AS CHAR) AS yesterday_count,
-            CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)and store_id = #{storeId}) AS CHAR) AS yesterday_sum,
+            CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END )   FROM card_value_record WHERE DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY)and store_id = #{storeId}) AS CHAR) AS yesterday_sum,
 
             -- 上周的数据
             CAST((SELECT COUNT(*) FROM card_value_record WHERE WEEK(create_time) = WEEK(DATE_SUB(CURDATE(), INTERVAL 1 WEEK))and store_id = #{storeId}) AS CHAR) AS last_week_count,
-            CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE WEEK(create_time) = WEEK(DATE_SUB(CURDATE(), INTERVAL 1 WEEK))and store_id = #{storeId}) AS CHAR) AS last_week_sum,
+            CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END )   FROM card_value_record WHERE WEEK(create_time) = WEEK(DATE_SUB(CURDATE(), INTERVAL 1 WEEK))and store_id = #{storeId}) AS CHAR) AS last_week_sum,
 
             -- 上个月的数据
             CAST((SELECT COUNT(*) FROM card_value_record WHERE MONTH(create_time) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))and store_id = #{storeId}) AS CHAR) AS last_month_count,
-            CAST((SELECT SUM(recharge_balance) FROM card_value_record WHERE MONTH(create_time) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))and store_id = #{storeId}) AS CHAR) AS last_month_sum;
+            CAST((SELECT SUM(recharge_balance)+SUM( CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END )   FROM card_value_record WHERE MONTH(create_time) = MONTH(DATE_SUB(CURDATE(), INTERVAL 1 MONTH))and store_id = #{storeId}) AS CHAR) AS last_month_sum;
     </select>
 
     <select id="prepaidCardSales" resultType="java.util.Map">
 
         SELECT
             date_range.date AS sales_day,
-            COALESCE(SUM(card_value_record.recharge_balance), 0) AS total_sales
+            COALESCE(SUM(card_value_record.recharge_balance), 0) +
+            COALESCE(SUM(CASE WHEN card_value_record.payment_type = 'CASH' THEN card_value_record.amount ELSE 0 END), 0)
+                AS total_sales
         FROM
             (
                 SELECT CURDATE() - INTERVAL (a.a + (10 * b.a) + (100 * c.a)) DAY AS date
@@ -200,7 +202,9 @@
             (
                 SELECT
                     DATE(create_time) AS create_time,
-                    recharge_balance
+                    recharge_balance,
+                    payment_type,
+                    amount
                 FROM
                     card_value_record
                 WHERE
@@ -222,7 +226,8 @@
 
         SELECT
             date_range.date AS sales_day,
-            COALESCE(SUM(card_fuel_record.recharge_balance), 0) AS total_sales
+            COALESCE(SUM(card_fuel_record.recharge_balance), 0)
+                AS total_sales
         FROM
             (
                 SELECT CURDATE() - INTERVAL (a.a + (10 * b.a) + (100 * c.a)) DAY AS date

fuintBackend/fuint-application/src/main/java/com/fuint/business/member/mapper/xml/LJStaffMapper.xml

@@ -56,13 +56,15 @@
                 GROUP BY staff_id
             ) oo ON ms.id = oo.staff_id
                 LEFT JOIN (
-                SELECT mt_staff_id, COALESCE(SUM(recharge_balance), 0) AS recharge_balance
+                SELECT mt_staff_id, COALESCE(SUM(recharge_balance), 0) +
+                COALESCE(SUM(CASE WHEN payment_type = 'CASH' THEN amount ELSE 0 END), 0) as recharge_balance
+
                 FROM card_value_record
                 WHERE pay_status = 'paid'
                 GROUP BY mt_staff_id
             ) cvr ON ms.id = cvr.mt_staff_id
                 LEFT JOIN (
-                SELECT mt_staff_id, COALESCE(SUM(recharge_balance), 0) AS recharge_balance
+                SELECT mt_staff_id, COALESCE(SUM(recharge_balance), 0) as recharge_balance
                 FROM card_fuel_record
                 WHERE pay_status = 'paid'
                 GROUP BY mt_staff_id

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml

@@ -6,7 +6,8 @@
         select sum(pay_money)
         from all_order_info
         <where>
-            store_id IN
+            pay_type != 'CASH'
+            and store_id IN
                 <foreach collection="list" item="list" separator="," open="(" close=")">
                     #{list.storeId}
                 </foreach>

fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java

@@ -1530,8 +1530,7 @@ return stringDoubleMap;
         return cardValueRecordMapper.prepaidCardSales(storeId);
     }
 
-    // 储值卡销售额
+    // 储值卡销售额Override
-    @Override
     public List<Map<String, String>>  tunFuelCardSales() {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         Integer storeId = nowAccountInfo.getStoreId();

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/OilTankMapper.java

@@ -108,5 +108,7 @@ public interface OilTankMapper {
     int accumulate(OilTank oilTank);
 
     int accumulate2(OilTank oilTank);
+
+    OilTank selectByName(@Param("oilTank") OilTank oilTank);
 }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/mapper/xml/OilTankMapper.xml

@@ -283,6 +283,10 @@
         </where>
         ORDER BY update_time DESC
     </select>
+    <select id="selectByName" resultType="com.fuint.business.petrolStationManagement.entity.OilTank">
+        select *  from oil_tank where tank_name = #{oilTank.tankName} and store_id = #{oilTank.storeId} limit 1
+
+    </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">

fuintBackend/fuint-application/src/main/java/com/fuint/business/petrolStationManagement/service/impl/OilTankServiceImpl.java

@@ -86,9 +86,12 @@ public class OilTankServiceImpl implements OilTankService {
      */
     @Override
     public OilTank insert(OilTank oilTank) {
+
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         oilTank.setStoreId(nowAccountInfo.getStoreId());
         oilTank.setCreateBy(nowAccountInfo.getStaffId().toString());
+        OilTank oilTank1 = oilTankDao.selectByName(oilTank);
+        if (ObjectUtil.isNotEmpty(oilTank1)) throw new RuntimeException("油罐名称不得重复！");
         this.oilTankDao.insert(oilTank);
 
 
@@ -116,6 +119,10 @@ public class OilTankServiceImpl implements OilTankService {
      */
     @Override
     public OilTank update(OilTank oilTank) {
+        OilTank oilTank1 = oilTankDao.selectByName(oilTank);
+
+        if (ObjectUtil.isNotEmpty(oilTank1) && !oilTank1.getId().equals(oilTank.getId())) throw new RuntimeException("油罐名称不得重复！");
+
         this.oilTankDao.update(oilTank);
         return this.queryById(oilTank.getId());
     }

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -59,18 +59,18 @@
               placement="bottom-start"
               width="400"
               trigger="click">
-              <div>
+                <div>
-                <div v-if="fullReduceDiscount.length>0">
+                  <div v-if="fullReduceDiscount.length>0">
-                  <el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
+                    <el-checkbox-group v-model="checkedCities1" @change="handleCheckedCitiesChange1">
-                    <el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.gunName" :key="index">
+                      <el-checkbox v-for="(item,index) in fullReduceDiscount" :label="item.gunName" :key="index">
-                      <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
+                        <div style="display: flex;justify-content: space-between;height: 40px;line-height: 40px;">
-                        <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
+                          <div style="width: 200px">{{ getName(oilNameList,item.oilName) }}_{{getName1(gunList,item.gunName)}}</div>
-                        <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
+                          <div style="line-height: 20px;width:150px;font-size: 12px;text-align: right">
-                          <div style="color: red">-￥{{ item.discount }}</div>
+                            <div style="color: red">-￥{{ item.discount }}</div>
-                          <div style="color: grey" v-if="item.type!=1">满减优惠</div>
+                            <div style="color: grey" v-if="item.type!=1">满减优惠</div>
-                          <div style="color: grey" v-if="item.type!=2">折扣优惠</div>
+                            <div style="color: grey" v-if="item.type!=2">折扣优惠</div>
+                          </div>
                         </div>
-                      </div>
                     </el-checkbox>
                   </el-checkbox-group>
                 </div>