Merge branch 'refs/heads/dev-对账管理' into dev-test

src/main/java/com/sqx/modules/goods/service/impl/GoodsShopServiceImpl.java

@@ -1,5 +1,6 @@
 package com.sqx.modules.goods.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
@@ -366,13 +367,15 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
 
     @Override
     public Result selectStoreData(DataCenterQuery query) {
-        HashMap hashMap = new HashMap();
-        BigDecimal sumMoney = appOrderDao.selectSumMoney(query);
-        int countOrder = appOrderDao.selectCountOrder(query);
-        //到店订单数
-        int takeCount = dataCentreDao.selectTakeCount(1,query);
+        if (StrUtil.isNotBlank(query.getDate())) {
+            query.setStartTime(query.getStartTime() + " 00:00:00");
+            query.setEndTime(query.getEndTime() + " 23:59:59");
+        }
+
         //外卖订单数
         int takeCount2 = dataCentreDao.selectTakeCount(2,query);
+        //到店订单数
+        int takeCount = dataCentreDao.selectTakeCount(1,query);
         //到店订单金额
         BigDecimal takeMoney = dataCentreDao.selectTakeMoney(1,query);
         //外卖订单金额
@@ -381,6 +384,12 @@ public class GoodsShopServiceImpl extends ServiceImpl<GoodsShopDao, GoodsShop> i
         int cancelOrderCount = dataCentreDao.cancelOrderCount(query);
         //退款金额
         BigDecimal cancelOrderMoney = dataCentreDao.cancelOrderMoney(query);
+
+        BigDecimal sumMoney = appOrderDao.selectSumMoney(query);
+
+        int countOrder = appOrderDao.selectCountOrder(query);
+
+        HashMap hashMap = new HashMap();
         hashMap.put("takeCount", takeCount);
         hashMap.put("takeCount2", takeCount2);
         hashMap.put("takeMoney", takeMoney);

src/main/java/com/sqx/modules/reconciliation/service/impl/PlatformBillServiceImpl.java

@@ -392,7 +392,7 @@ public class PlatformBillServiceImpl extends ServiceImpl<PlatformBillMapper, Pla
         if (prePlatformBillOptional.isPresent()) {
             platformBill.setStartMoney(prePlatformBillOptional.get().getEndMoney());
         } else {
-            platformBill.setStartMoney(sum(shopPlatformBills, PlatformBill::getShopBalance));
+            platformBill.setStartMoney(sum(shopPlatformBills, PlatformBill::getShopBalance).add(sum(riderPlatformBills, PlatformBill::getShopBalance)));
         }
 
         // 期末金额 = 期初金额 + 当天收入 - 商家当天提现金额（已转账和待转账） - 骑手当天提现金额（已转账+待转账+已拒绝）