shish 4 年 前
コミット
a29df84405

+ 2 - 0
biz-hd/goods/classes/GoodsClass.php

@@ -593,6 +593,7 @@ class GoodsClass extends BaseClass
             $fromType = $params['fromType'] ?? 1;
             $remark = $params['remark'] ?? '';
             $orderDebtPrice = $params['orderDebtPrice'] ?? 0;
+            $sendType = $params['sendType'] ?? 0;
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
@@ -628,6 +629,7 @@ class GoodsClass extends BaseClass
                 'orderPrice' => $orderPrice,
                 'orderDebtPrice' => $orderDebtPrice,
                 'fromType' => $fromType,
+                'sendType' => $sendType,
                 'remark' => $remark,
             ];
             $main = MainClass::getById($mainId, true);

+ 2 - 0
biz-hd/work/classes/WorkClass.php

@@ -118,6 +118,7 @@ class WorkClass extends BaseClass
         $staffId = $data['staffId'] ?? 0;
         $orderPrice = $data['orderPrice'] ?? 0;
         $orderDebtPrice = $data['orderDebtPrice'] ?? 0;
+        $sendType = $data['sendType'] ?? 0;
         $fromType = $data['fromType'] ?? 1;
 
         $ids = array_column($goods, 'productId');
@@ -181,6 +182,7 @@ class WorkClass extends BaseClass
                 'orderPrice' => $orderPrice,
                 'orderDebtPrice' => $orderDebtPrice,
                 'fromType' => $fromType,
+                'sendType' => $sendType,
             ];
             self::createFinish($current, $main);
         }

+ 2 - 1
biz-mall/order/classes/OrderGoodsClass.php

@@ -33,7 +33,8 @@ class OrderGoodsClass extends BaseClass
                 $fromType = $order->fromType ?? 1;
                 $remark = $order->remark ?? '';
                 $orderDebtPrice = $order->remainDebtPrice ?? 0;
-                $params = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shopId' => $shopId,
+                $sendType = $order->sendType ?? 0;
+                $params = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shopId' => $shopId, 'sendType' => $sendType,
                     'fromType' => $fromType, 'orderPrice' => $orderPrice, 'remark' => $remark, 'orderDebtPrice' => $orderDebtPrice];
                 $flower = $goods->flower ?? 0;
                 //鲜花类不需要验证库存,库存可以负数,并相应生成制作单