shish před 4 roky
rodič
revize
89d0d3ce73

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

@@ -121,6 +121,7 @@ class OrderClass extends BaseClass
         $data['sendCost'] = $sendCost;
         $data['bigNum'] = $respond['bigNum'] ?? 0;
         $data['smallNum'] = $respond['smallNum'] ?? 0;
+        $data['itemNum'] = $respond['totalItemNum'] ?? 0;
 
         //默认订单要打单
         $data['needPrint'] = $data['needPrint'] ?? dict::getDict('needPrint', 'need');

+ 8 - 0
biz-ghs/order/services/RefundOrderService.php

@@ -53,6 +53,14 @@ class RefundOrderService extends BaseService
 
         $data['bigNum'] = $sumNum['bigNum'] ?? 0;// 总的大单位数量 总共多少扎
         $data['smallNum'] = $sumNum['smallNum'] ?? 0; //总的小单位数量 总共多少支
+
+        //限制小单位退货,这样大单位就量总数量
+        if ($data['smallNum'] > 0) {
+            util::fail('暂时只支持整扎退款');
+        }
+        $data['itemNum'] = $data['bigNum'];
+        $data['customId'] = $order->customId ?? 0;
+
         $data['remark'] = $post['remark'] ?? '';
         $refundPrice = $post['price'] ?? 0;
         if (is_numeric($refundPrice) == false || $refundPrice < 0) {

+ 4 - 1
biz-ghs/product/classes/ProductClass.php

@@ -677,6 +677,8 @@ class ProductClass extends BaseClass
         $priceMap = CustomClass::$levelPriceKeyMap;
         $addPriceMap = CustomClass::$levelAddPriceKeyMap;
 
+        $totalItemNum = 0;
+
         foreach ($itemInfo as $v) {
             $productId = $v['productId'];
             $itemId = $productData[$productId]['itemId'] ?? 0;
@@ -684,6 +686,7 @@ class ProductClass extends BaseClass
             $cost = $productData[$productId]['cost'] ?? 0;
             //大小数量合并多少扎
             $itemNum = self::mergeItemNum($v['bigNum'], $v['smallNum'], $ratio);
+            $totalItemNum = bcadd($totalItemNum, $itemNum, 2);
 
             //供应商开单可以传单价过来
             $changePrice = isset($v['price']) && $v['price'] > 0 ? $v['price'] : 0;
@@ -726,7 +729,7 @@ class ProductClass extends BaseClass
             $data[] = $tmp;
         }
 
-        return ['product' => $data, 'smallNum' => $totalSmallNum, 'bigNum' => $totalBigNum, 'price' => $totalPrice];
+        return ['product' => $data, 'smallNum' => $totalSmallNum, 'bigNum' => $totalBigNum, 'price' => $totalPrice, 'totalItemNum' => $totalItemNum];
     }
 
     //  //修改某个花材的成本价(采购之后要用到) linqh 2021.04.06