Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz-ghs/order/classes/OrderClass.php

@@ -4,6 +4,7 @@ namespace bizGhs\order\classes;
 
 use biz\express\classes\ExpressClass;
 use biz\shop\classes\ShopClass;
+use biz\shop\services\ShopService;
 use biz\sj\classes\MerchantClass;
 use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\traits\OrderTrait;
@@ -13,6 +14,10 @@ use bizGhs\admin\classes\AdminClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\stat\classes\StatOrderCountClass;
 use bizGhs\stat\classes\StatYjClass;
+use bizHd\stat\classes\StatIncomeClass;
+use bizHd\stat\classes\StatIncomeMonthClass;
+use bizHd\stat\classes\StatOrderClass;
+use bizHd\stat\classes\StatOrderMonthClass;
 use common\components\imgUtil;
 use common\components\orderSn;
 use common\components\stringUtil;
@@ -104,9 +109,18 @@ class OrderClass extends BaseClass
             $weight = bcadd($w, $weight, 2);
         }
         $data['weight'] = $weight;
-
         $return = self::add($data);
 
+        //当天收入，当月收入，总收入，总订单+1
+        StatIncomeClass::updateOrInsert($return['merchantId'], $return['shopId'], $return['actPrice']);
+        StatIncomeMonthClass::updateOrInsert($return['merchantId'], $return['shopId'], $return['actPrice']);
+        ShopService::updateTotalIncome($return['shopId'], $return['actPrice']);
+        ShopService::totalOrderPlus($return['shopId']);
+        //今日订单+1
+        StatOrderClass::updateOrInsert($return['merchantId'], $return['shopId']);
+        //本月订单+1
+        StatOrderMonthClass::updateOrInsert($return['merchantId'], $return['shopId']);
+
         if ($customOrder == false) {
             //0正常订单 1欠款
             $debt = $data['debt'] ?? 0;
@@ -127,16 +141,6 @@ class OrderClass extends BaseClass
             }
         }
 
-        //当天收入，当月收入，总收入，总订单+1
-//        StatIncomeClass::updateOrInsert($return['merchantId'],$return['shopId'],$return['actPrice']);
-//        StatIncomeMonthClass::updateOrInsert($return['merchantId'],$return['shopId'],$return['actPrice']);
-//        ShopService::updateTotalIncome($return['shopId'],$return['actPrice']);
-//        ShopService::totalOrderPlus($return['shopId']);
-//        //今日订单+1
-//        StatOrderClass::updateOrInsert($return['merchantId'],$return['shopId']);
-//        //本月订单+1
-//        StatOrderMonthClass::updateOrInsert($return['merchantId'],$return['shopId']);
-
         return $return;
     }
 
@@ -458,12 +462,14 @@ class OrderClass extends BaseClass
 
         OrderSendClass::withoutSend($order);
 
-        //待发货订单-1，完成订单+1
-        $sjId = $order['merchantId'];
-        $asset = MerchantAssetClass::getByMerchantId($sjId, true);
-        $asset->finishOrder += 1;
-        $asset->unSendOrder -= 1;
-        $asset->save();
+        //完成订单+1
+        $shopId = $order['shopId'] ?? 0;
+        $shop = ShopClass::getById($shopId, true);
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
+        $shop->finishOrder += 1;
+        $shop->save();
 
         return self::TOTAL_FLOW;
     }