shish 1 год назад
Родитель
Сommit
efe4e71008

+ 2 - 0
app-ghs/controllers/RefundController.php

@@ -277,6 +277,8 @@ class RefundController extends BaseController
         $shopAdmin = $this->shopAdmin;
         $adminName = $shopAdmin['name'] ?? '';
         $post['shopAdminName'] = $adminName;
+        //属于售后报损
+        $post['saleType'] = 1;
 
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();

+ 5 - 2
biz-ghs/order/classes/StockWastageOrderClass.php

@@ -53,7 +53,7 @@ class StockWastageOrderClass extends BaseClass
         return $data;
     }
 
-    public static function addOrder($post,$shop=null,$check=false)
+    public static function addOrder($post, $shop = null, $check = false)
     {
         $mainId = $post['mainId'] ?? 0;
         $data = [];
@@ -64,6 +64,8 @@ class StockWastageOrderClass extends BaseClass
         $data['shopId'] = $post['shopId'];
         $data['shopAdminId'] = $post['shopAdminId'] ?? 0;
         $data['shopAdminName'] = $post['shopAdminName'] ?? '';
+        $saleType = $post['saleType'] ?? 0;
+        $data['saleType'] = $saleType;
 
         //花材列表
         $ghsItemInfo = $post['product'];
@@ -74,7 +76,7 @@ class StockWastageOrderClass extends BaseClass
         if (!empty($ghsItemInfo)) {
             $ids = [];
             foreach ($ghsItemInfo as $current) {
-                $productId = $current['productId']??0;
+                $productId = $current['productId'] ?? 0;
                 $ids[] = $productId;
                 $bigNum = $current['bigNum'] ?? 0;
                 $totalNum = bcadd($totalNum, $bigNum, 2);
@@ -115,6 +117,7 @@ class StockWastageOrderClass extends BaseClass
         $batchData = self::groupOrderItem($ghsItemInfo, $orderSn);
         foreach ($batchData as $currentItem) {
             $currentItem['mainId'] = $mainId;
+            $currentItem['saleType'] = $saleType;
             StockWastageOrderItemClass::add($currentItem);
         }
         $orderData = self::getOrderDetail($orderSn, $mainId);