11.19

fuintAdmin_zt/src/views/financialStatement/dai_yunyingfenxi/tab/paytype.vue

@@ -46,19 +46,19 @@
       <div class="wrap-boxs">
         <div class="k_" id="k_1">
           <div class="size_" >活跃油站汇总数/合作油站汇总数</div>
-          <div class="title_">{{ orderStatistics.allOrderStoreId?orderStatistics.allOrderStoreId:0 }}/{{orderStatistics.totalCount}}</div>
+          <div class="title_">{{ orderStatistics.allOrderStoreId?orderStatistics.allOrderStoreId:0 }}/{{orderStatistics.totalCount ? orderStatistics.totalCount : 0}}</div>
         </div>
         <div class="k_" id="k_2">
           <div class="size_" >交易金额汇总数（元）/交易笔数</div>
-          <div class="title_">{{ orderStatistics.totalPayMoney?orderStatistics.totalPayMoney:0 }}/{{orderStatistics.totalTransactionCount}}</div>
+          <div class="title_">{{ orderStatistics.totalPayMoney?orderStatistics.totalPayMoney:0 }}/{{orderStatistics.totalTransactionCount ? orderStatistics.totalTransactionCount : 0}}</div>
         </div>
         <div class="k_" id="k_3">
           <div class="size_">退款金额（元）/退款笔数</div>
-          <div class="title_">{{ orderStatistics.refMoney?orderStatistics.refMoney:0 }}/{{orderStatistics.refCount}}</div>
+          <div class="title_">{{ orderStatistics.refMoney?orderStatistics.refMoney:0 }}/{{orderStatistics.refCount ? orderStatistics.refCount : 0 }}</div>
         </div>
         <div class="k_" id="k_4">
           <div class="size_">新增油站数</div>
-          <div class="title_">{{ orderStatistics.totalCount?orderStatistics.totalCount:0 }}</div>
+          <div class="title_">{{ orderStatistics.newStoreTotal?orderStatistics.newStoreTotal:0 }}</div>
         </div>
       </div>
     </div>

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue

@@ -99,7 +99,12 @@
               <span v-if="scope.row.paymentType=='CASH'">现金</span>
               <span v-else-if="scope.row.paymentType=='WECHAT'">微信</span>
               <span v-else-if="scope.row.paymentType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
+              <span v-else-if="scope.row.paymentType=='UNIONPAY'">银联二维码</span>
+              <span v-else-if="scope.row.paymentType=='APPLET_CODE'">小程序码</span>
+              <span v-else-if="scope.row.paymentType=='card_value'">储值卡</span>
+              <span v-else-if="scope.row.paymentType=='fule_card'">囤油卡</span>
+              <span v-else-if="scope.row.paymentType=='car_card_value'">车队卡</span>
+              <span v-else-if="scope.row.paymentType=='after_pay'">挂账</span>
             </template>
           </el-table-column>
           <el-table-column prop="status" align="center" label="订单状态">

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue

@@ -100,7 +100,12 @@
               <span v-if="scope.row.payType=='CASH'">现金</span>
               <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
               <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
+              <span v-else-if="scope.row.payType=='UNIONPAY'">银联二维码</span>
+              <span v-else-if="scope.row.payType=='APPLET_CODE'">小程序码</span>
+              <span v-else-if="scope.row.payType=='card_value'">储值卡</span>
+              <span v-else-if="scope.row.payType=='fule_card'">囤油卡</span>
+              <span v-else-if="scope.row.payType=='car_card_value'">车队卡</span>
+              <span v-else-if="scope.row.payType=='after_pay'">挂账</span>
             </template>
           </el-table-column>
           <el-table-column prop="orderStatus" align="center" label="订单状态">

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue

@@ -98,7 +98,12 @@
               <span v-if="scope.row.payType=='CASH'">现金</span>
               <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
               <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
+              <span v-else-if="scope.row.payType=='UNIONPAY'">银联二维码</span>
+              <span v-else-if="scope.row.payType=='APPLET_CODE'">小程序码</span>
+              <span v-else-if="scope.row.payType=='card_value'">储值卡</span>
+              <span v-else-if="scope.row.payType=='fule_card'">囤油卡</span>
+              <span v-else-if="scope.row.payType=='car_card_value'">车队卡</span>
+              <span v-else-if="scope.row.payType=='after_pay'">挂账</span>
             </template>
           </el-table-column>
           <el-table-column prop="status" align="center" label="订单状态">

fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue

@@ -101,7 +101,12 @@
               <span v-if="scope.row.paymentType=='CASH'">现金</span>
               <span v-else-if="scope.row.paymentType=='WECHAT'">微信</span>
               <span v-else-if="scope.row.paymentType=='ALIPAY'">支付宝</span>
-              <span v-else="">余额</span>
+              <span v-else-if="scope.row.paymentType=='UNIONPAY'">银联二维码</span>
+              <span v-else-if="scope.row.paymentType=='APPLET_CODE'">小程序码</span>
+              <span v-else-if="scope.row.paymentType=='card_value'">储值卡</span>
+              <span v-else-if="scope.row.paymentType=='fule_card'">囤油卡</span>
+              <span v-else-if="scope.row.paymentType=='car_card_value'">车队卡</span>
+              <span v-else-if="scope.row.paymentType=='after_pay'">挂账</span>
             </template>
           </el-table-column>
           <el-table-column prop="payStatus" align="center" label="订单状态">

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

@@ -327,7 +327,7 @@
         real_name,
         update_time as updateTime,
         create_time as createTime,
-        status as payStatus,
+        pay_status as payStatus,
         mt_staff_id,
         card_value_id,
         store_id from card_value_record) a

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

@@ -771,7 +771,7 @@
         d.dept_name AS deptName,
         s.name AS storeName,
         SUM(COALESCE(a.pay_money, 0)) AS payMoney,
-        count(*) count,
+        count(a.id) count,
         sum( CASE WHEN a.pay_type = 'WECHAT' THEN a.pay_money ELSE 0 END ) wechatMoney,
         sum( CASE WHEN a.pay_type = 'CASH' THEN a.pay_money ELSE 0 END ) cashMoney,
         sum( CASE WHEN a.pay_type = 'balance' THEN a.pay_money ELSE 0 END ) balanceMoney,
@@ -780,8 +780,8 @@
         count( CASE WHEN a.STATUS = 'refund' THEN 1 ELSE NULL END ) refCount
 
         from mt_store s
-        LEFT JOIN all_order_info a on s.id=a.store_id
+        inner JOIN all_order_info a on s.id=a.store_id
-        LEFT JOIN sys_dept d on d.dept_id = s.contract_dept_id
+        inner JOIN sys_dept d on d.dept_id = s.contract_dept_id
         where
         <if test="order.storeIds != null">
             s.id in
@@ -798,14 +798,6 @@
             and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') &lt;=
             date_format(#{order.params.endTime},'%y%m%d') )
         </if>
-        <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
-            and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') &gt;=
-            date_format(#{order.params.beginTime},'%y%m%d'))
-        </if>
-        <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
-            and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') &lt;=
-            date_format(#{order.params.endTime},'%y%m%d') )
-        </if>
         GROUP BY s.id
         ORDER BY payMoney DESC
     </select>
@@ -877,8 +869,6 @@
     </select>
     <select id="getFenxiByDailiTypeBydata" resultType="java.util.Map">
         SELECT
-        -- 总条数，因为连表去重
-        COUNT(DISTINCT s.id) AS totalCount,
         -- 交易总金额
         SUM(COALESCE(a.pay_money, 0)) AS totalPayMoney,
         -- 交易笔数
@@ -907,15 +897,6 @@
             and ( a.create_time IS NULL OR date_format(a.create_time,'%y%m%d') &lt;=
             date_format(#{order.params.endTime},'%y%m%d') )
         </if>
-        <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
-            and (s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') &gt;=
-            date_format(#{order.params.beginTime},'%y%m%d'))
-        </if>
-        <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
-            and ( s.create_time IS NULL OR date_format(s.create_time,'%y%m%d') &lt;=
-            date_format(#{order.params.endTime},'%y%m%d') )
-        </if>
-
     </select>
 
 

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

@@ -321,7 +321,12 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
 //      单独查询活跃的油站店铺
         String allOrderInfoCountByStoreId = allOrderInfoMapper.getAllOrderInfoCountByStoreId(allOrderInfo);
         fenxiByDailiTypeBydata.put("allOrderStoreId", allOrderInfoCountByStoreId);
-
+//      油站总数
+        int totalCount = mtStoreMapper.getStoreTotal();
+        fenxiByDailiTypeBydata.put("totalCount", totalCount);
+//      单独查询新增的油站店铺
+        int newStoreTotal = mtStoreMapper.getNewStoreTotal(allOrderInfo);
+        fenxiByDailiTypeBydata.put("newStoreTotal", newStoreTotal);
         return fenxiByDailiTypeBydata;
     }
 

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/MtStoreMapper.java

@@ -1,5 +1,6 @@
 package com.fuint.business.store.mapper;
 
+import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.store.vo.StoreNumVo;
 import com.fuint.repository.bean.StoreDistanceBean;
 import com.fuint.business.store.entity.MtStore;
@@ -76,4 +77,8 @@ public interface MtStoreMapper extends BaseMapper<MtStore> {
      * @return
      */
     List<StoreNumVo> selectStoreNumByMonth(@Param("storeVo") MtStore store,@Param("storeIds") List<Integer> storeIds);
+
+    int getNewStoreTotal(@Param("order") AllOrderInfo allOrderInfo);
+
+    int getStoreTotal();
 }

fuintBackend/fuint-application/src/main/java/com/fuint/business/store/mapper/xml/MtStoreMapper.xml

@@ -144,4 +144,19 @@
         tradeTime) t
         GROUP BY t.tradeTime
     </select>
+    <select id="getNewStoreTotal" resultType="java.lang.Integer">
+        select count(DISTINCT id) FROM mt_store
+            <where>
+                 <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                    and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+                </if>
+                <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                    and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+                </if>
+            </where>
+    </select>
+    <select id="getStoreTotal" resultType="java.lang.Integer">
+         select count(DISTINCT id) FROM mt_store
+    </select>
+
 </mapper>