shish 4 سال پیش
والد
کامیت
b8e804f484
3فایلهای تغییر یافته به همراه6 افزوده شده و 1 حذف شده
  1. 2 0
      biz-hd/goods/classes/GoodsClass.php
  2. 2 0
      biz-hd/work/classes/WorkClass.php
  3. 2 1
      biz-mall/order/classes/OrderGoodsClass.php

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

@@ -594,6 +594,7 @@ class GoodsClass extends BaseClass
             $remark = $params['remark'] ?? '';
             $orderDebtPrice = $params['orderDebtPrice'] ?? 0;
             $sendType = $params['sendType'] ?? 0;
+            $thirdSn = $params['thirdSn'] ?? '';
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
@@ -631,6 +632,7 @@ class GoodsClass extends BaseClass
                 'fromType' => $fromType,
                 'sendType' => $sendType,
                 'remark' => $remark,
+                'thirdSn' => $thirdSn,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

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

@@ -120,6 +120,7 @@ class WorkClass extends BaseClass
         $orderDebtPrice = $data['orderDebtPrice'] ?? 0;
         $sendType = $data['sendType'] ?? 0;
         $fromType = $data['fromType'] ?? 1;
+        $thirdSn = $data['thirdSn'] ?? '';
 
         $ids = array_column($goods, 'productId');
         $info = GoodsClass::getByIds($ids, null, 'id');
@@ -183,6 +184,7 @@ class WorkClass extends BaseClass
                 'orderDebtPrice' => $orderDebtPrice,
                 'fromType' => $fromType,
                 'sendType' => $sendType,
+                'thirdSn' => $thirdSn,
             ];
             self::createFinish($current, $main);
         }

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

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