生日快乐

biz-hd/goods/classes/GoodsClass.php

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

biz-hd/work/classes/WorkClass.php

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

biz-mall/order/classes/OrderGoodsClass.php

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