shish пре 4 година
родитељ
комит
cbdc2b72b4

+ 0 - 4
biz-ghs/order/classes/OrderItemClass.php

@@ -64,10 +64,6 @@ class OrderItemClass extends BaseClass
             $val['orderSn'] = $orderSn;
             $item = self::add($val, true);
 
-            if ($stockMayChange == true) {
-                StatBookClass::bookOrderAdd($val, $post);
-            }
-
             $currentId = $item->id ?? 0;
             if (isset($item->variety) && $item->variety == 1) {
                 //小菊

+ 13 - 4
biz-ghs/order/services/OrderService.php

@@ -6,6 +6,7 @@ use biz\ghs\classes\GhsClass;
 use biz\shop\classes\ShopAdminClass;
 use biz\shop\classes\ShopCapitalClass;
 use biz\shop\classes\ShopClass;
+use biz\stat\classes\StatBookClass;
 use biz\stat\classes\StatKdClass;
 use biz\stat\classes\StatKhCgClass;
 use biz\stat\classes\StatSaleClass;
@@ -14,6 +15,7 @@ use bizGhs\base\services\BaseService;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\classes\OrderClass;
 use bizGhs\order\classes\OrderExpressClass;
+use bizGhs\order\classes\OrderItemClass;
 use bizGhs\order\classes\OrderSendClass;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\shop\classes\MainClass;
@@ -638,7 +640,8 @@ class OrderService extends BaseService
         if (isset($order->debt) == false) {
             util::fail('订单有问题,没有欠款项');
         }
-
+        $orderId = $order->id;
+        $orderSn = $order->orderSn ?? '';
         $customId = $order->customId;
         $custom = CustomClass::getLockById($customId);
         if (empty($custom)) {
@@ -663,6 +666,15 @@ class OrderService extends BaseService
         //预订单的待发货订单增加
         if ($book == 1) {
             $main->unSendOrder += 1;
+
+            //预订单统计数量增加
+            $itemList = OrderItemClass::getAllByCondition(['orderSn' => $orderSn], null, '*', null, true);
+            if (!empty($itemList)) {
+                foreach ($itemList as $currentItem) {
+                    StatBookClass::bookOrderAdd($currentItem, $order);
+                }
+            }
+
         } else {
             $main->finishOrder += 1;
         }
@@ -672,17 +684,14 @@ class OrderService extends BaseService
         $totalSale = bcadd($main->totalSale, $amount, 2);
         $main->totalSale = $totalSale;
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            //客户欠款支付会增加【应收客户款】
             $currentGathering = bcadd($main->mayGathering, $realPrice, 2);
             $main->mayGathering = $currentGathering;
-            //客户第一次欠款的增加一个欠款客户
             if ($custom->debtNum == 0) {
                 $main->mayGatheringNum += 1;
             }
         }
         $main->save();
 
-        $orderId = $order->id;
         $capitalType = dict::getDict('capitalType', 'xhGhsOrder', 'id');
         $shopAdminId = $order->shopAdminId ?? 0;
         $shopAdminName = $order->shopAdminName ?? '';

+ 7 - 7
biz/stat/classes/StatBookClass.php

@@ -10,15 +10,15 @@ class StatBookClass extends BaseClass
     public static $baseFile = '\biz\stat\models\StatBook';
 
     //预订单统计 ssh 20220402
-    public static function bookOrderAdd($info, $params, $date = null)
+    public static function bookOrderAdd($item, $order, $date = null)
     {
-        $mainId = $info['mainId'] ?? 0;
-        $itemId = $info['productId'] ?? 0;
-        $ptItemId = $info['itemId'] ?? 0;
+        $mainId = $item->mainId ?? 0;
+        $itemId = $item->productId ?? 0;
+        $ptItemId = $item->itemId ?? 0;
         //预订单只会有大单位
-        $num = $info['xhNum'] ?? 0;
-        $name = $info['name'] ?? '';
-        $sendTimeWant = $params['sendTimeWant'] ?? '';
+        $num = $item->xhNum ?? 0;
+        $name = $item->name ?? '';
+        $sendTimeWant = $order->sendTimeWant ?? '';
         if (empty($date) && !empty($sendTimeWant)) {
             $date = date("Ymd", strtotime($sendTimeWant));
         }