退货退款

biz-ghs/order/classes/RefundOrderItemClass.php

@@ -14,7 +14,7 @@ class RefundOrderItemClass extends BaseClass
 
     public static $baseFile = '\bizGhs\order\models\RefundOrderItem';
 
-    public static function addData($data)
+    public static function addData($data, $order)
     {
         $productId = $data['productId'] ?? 0;
         $mainId = $data['mainId'] ?? 0;
@@ -37,18 +37,6 @@ class RefundOrderItemClass extends BaseClass
         $stockInfo = ProductClass::addStock($productId, $bigNum, $smallNum);
         $oldStock = $stockInfo['oldStock'] ?? 0;
         $newStock = $stockInfo['newStock'] ?? 0;
-        $data['itemStock'] = $oldStock;
-        $data['newStock'] = $newStock;
-        self::add($data);
-
-        //花材销量统计变动
-        $refundStat = [
-            'mainId' => $mainId,
-            'productId' => $productId,
-            'itemNum' => $xhNum,
-            'itemPrice' => $xhUnitPrice,
-        ];
-        StatItemClass::refundReplace($refundStat);
 
         //库存变动记录
         $recordData = [];
@@ -64,6 +52,20 @@ class RefundOrderItemClass extends BaseClass
         $recordData['productId'] = $productId;
         $recordData['newStock'] = $newStock;// 最新库存
         StockRecordClass::ghsRefundAddRecord($recordData);
+
+
+        $data['itemStock'] = $oldStock;
+        $data['newStock'] = $newStock;
+        self::add($data);
+
+        //花材销量统计变动
+        $refundStat = [
+            'mainId' => $mainId,
+            'productId' => $productId,
+            'itemNum' => $xhNum,
+            'itemPrice' => $xhUnitPrice,
+        ];
+        StatItemClass::refundReplace($refundStat);
     }
 
     public static function batchAddOrderItem($data)

biz-ghs/order/services/OrderService.php

@@ -804,7 +804,6 @@ class OrderService extends BaseService
         $saleRefund = RefundOrderService::addRefund($post, $order);
         $saleRefundId = $saleRefund->id;
 
-
         $purchaseId = $order->purchaseId;
         $cg = PurchaseClass::getLockById($purchaseId);
         if (empty($cg)) {

biz-ghs/order/services/RefundOrderService.php

@@ -112,7 +112,7 @@ class RefundOrderService extends BaseService
                     'xhPrice' => $xhPrice,
                     'mainId' => $mainId,
                 ];
-                RefundOrderItemClass::addData($thisItemData);
+                RefundOrderItemClass::addData($thisItemData,$order);
             }
 
         }