根据文档调整-https://shimo.im/docs/VMAPLEXVPWiabGAg

src/main/java/com/sqx/modules/datacentre/service/impl/DataCentreServiceImpl.java

@@ -320,10 +320,10 @@ public class DataCentreServiceImpl implements DataCentreService {
         HashMap<String, Object> hashMap = new HashMap();
         //总收入
         BigDecimal allBigDecimal = dataCentreDao.tcwmplatformMoney(date, dateType);
-        //平台收入
-        BigDecimal adminBigDecimal = dataCentreDao.tcwmShopMoney(date, dateType);
+        //商家收入
+        BigDecimal shopBigDecimal = dataCentreDao.tcwmShopMoney(date, dateType);
         //商铺收入
-        BigDecimal shopBigDecimal = allBigDecimal.subtract(adminBigDecimal);
+        BigDecimal adminBigDecimal = allBigDecimal.subtract(shopBigDecimal);
         hashMap.put("allBigDecimal", allBigDecimal);
         hashMap.put("adminBigDecimal", adminBigDecimal);
         hashMap.put("shopBigDecimal", shopBigDecimal);

src/main/java/com/sqx/modules/order/service/impl/AppAppOrderServiceImpl.java

@@ -1066,7 +1066,9 @@ public class AppAppOrderServiceImpl extends ServiceImpl<AppOrderDao, TbOrder> im
         if (shopIds != -1 && shopIds != 0) {
             shopMoney = shopMoney.subtract(couponMoney);
         }
-
+        if(tbOrder.getAutoSendOrder()!=null && tbOrder.getAutoSendOrder()==1){
+            shopMoney=shopMoney.add(tbOrder.getErrandMoney());
+        }
 
 
         tbOrder.setShopIncomeMoney(shopMoney);