备注

biz-hd/goods/classes/GoodsClass.php

@@ -591,6 +591,7 @@ class GoodsClass extends BaseClass
             $shopId = $params['shopId'] ?? 0;
             $orderPrice = $params['orderPrice'] ?? 0;
             $fromType = $params['fromType'] ?? 1;
+            $remark = $params['remark'] ?? '';
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
@@ -612,7 +613,6 @@ class GoodsClass extends BaseClass
             }
             $params = [
                 'goods' => [['productId' => $goodsId, 'num' => abs($newStock)]],
-                'remark' => '',
                 'sjId' => $sjId,
                 'mainId' => $mainId,
                 'orderSn' => $orderSn,
@@ -626,6 +626,7 @@ class GoodsClass extends BaseClass
                 'bookName' => $bookName,
                 'orderPrice' => $orderPrice,
                 'fromType' => $fromType,
+                'remark' => $remark,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

biz-mall/order/classes/OrderGoodsClass.php

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