shish 4 tahun lalu
induk
melakukan
8234e9f3f5

+ 14 - 0
biz-ghs/order/classes/OrderClass.php

@@ -13,6 +13,7 @@ use biz\stat\classes\StatKhCgClass;
 use biz\stat\classes\StatOrderCountClass;
 use biz\stat\classes\StatOutClass;
 use biz\stat\classes\StatRefundClass;
+use biz\stock\classes\StockClass;
 use bizGhs\custom\models\Custom;
 use bizGhs\express\services\DadaExpressServices;
 use bizGhs\order\models\Order;
@@ -112,6 +113,8 @@ class OrderClass extends BaseClass
         if ($order->stockChange == 1) {
             util::fail('您已操作过了');
         }
+        $sjId = $data['sjId'] ?? 0;
+        $shopId = $data['shopId'] ?? 0;
         //product [{"productId":"3674","num":0,"price":1}]
         $product = $data['product'] ?? '';
         if (empty($product)) {
@@ -153,6 +156,17 @@ class OrderClass extends BaseClass
             $productWeight = $info[$productId]['weight'] ?? 0;
             $currentWeight = bcmul($productWeight, $num, 2);
             $weight = bcadd($currentWeight, $weight, 2);
+
+            //减少库存
+            $unitType = $val->xhUnitType ?? 0;
+            $bigNum = 0;
+            $smallNum = 0;
+            if ($unitType == dict::getDict('unitType', 'big')) {
+                $bigNum = $num;
+            } else {
+                $smallNum = $num;
+            }
+            StockClass::stockSellItem($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum);
         }
 
         $order->itemPrice = $itemPrice;

+ 2 - 22
biz-hd/purchase/classes/PurchaseClass.php

@@ -62,8 +62,6 @@ class PurchaseClass extends BaseClass
         }
         $sjId = $data['sjId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
-        $mainId = $data['mainId'] ?? 0;
-
         //product [{"productId":"3674","num":0,"price":1}]
         $product = $data['product'] ?? '';
         if (empty($product)) {
@@ -85,8 +83,6 @@ class PurchaseClass extends BaseClass
             $price = $product[$productId]['price'] ?? 0;
             $totalPrice = bcmul($num, $price, 2);
             $itemPrice = bcadd($itemPrice, $totalPrice, 2);
-            $ratio = $val->ratio ?? 20;
-            $ptItemId = $val->itemId ?? 0;
             $val->price = $price;
             $val->itemNum = $num;
             $val->preTotalPrice = $totalPrice;
@@ -106,27 +102,11 @@ class PurchaseClass extends BaseClass
             $smallNum = 0;
             if ($unitType == dict::getDict('unitType', 'big')) {
                 $bigNum = $num;
-                $totalNum = $num;
             } else {
                 $smallNum = $num;
-                $totalNum = bcdiv($num, $ratio, 2);
             }
             //增加库存
-            $stockRespond = StockClass::purchaseItem($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum);
-
-            //增加记录
-            $recordData = [];
-            $recordData['sjId'] = $sjId;
-            $recordData['mainId'] = $mainId;
-            $recordData['shopId'] = $shopId;
-            $recordData['itemId'] = $ptItemId;
-            $recordData['itemNum'] = $totalNum;
-            $recordData['oldStock'] = $stockRespond['oldStock'];
-            $recordData['newStock'] = $stockRespond['newStock'];
-            $recordData['productId'] = $productId;
-            $recordData['orderSn'] = $orderSn;
-            StockRecordClass::addPurchaseOrderRecord($recordData);
-
+            StockClass::purchaseItem($orderSn, $sjId, $shopId, $productId, $bigNum, $smallNum);
         }
 
         $cg->itemPrice = $itemPrice;
@@ -196,7 +176,7 @@ class PurchaseClass extends BaseClass
             $sjId = $cg->sjId ?? 0;
             $shopId = $cg->shopId ?? 0;
             $ghsName = $cg->ghsName ?? '';
-            $event = "预订单多付退款({$ghsName})";
+            $event = "预订单多退少补({$ghsName})";
             $capitalData = [
                 'capitalType' => $currentType,
                 'io' => 1,

+ 2 - 2
common/components/dict.php

@@ -236,8 +236,8 @@ class dict
             40 => ['link' => '', 'name' => '销售退款', 'orderLink' => '', 'id' => 40,],
             45 => ['link' => '', 'name' => '盘点', 'orderLink' => '', 'id' => 45,],
             46 => ['link' => '', 'name' => '佣金', 'orderLink' => '', 'id' => 46,],
-            48 => ['link' => '', 'name' => '预订单多付退款', 'orderLink' => '', 'id' => 48,],
-            50 => ['link' => '', 'name' => '预订单多付退款', 'orderLink' => '', 'id' => 50,],
+            48 => ['link' => '', 'name' => '预订单多退少补', 'orderLink' => '', 'id' => 48,],
+            50 => ['link' => '', 'name' => '预订单多退少补', 'orderLink' => '', 'id' => 50,],
         ],
 
         //用户来源