kind

biz-hd/goods/classes/GoodsClass.php

@@ -715,8 +715,6 @@ class GoodsClass extends BaseClass
             $anonymity = $params['anonymity'] ?? 0;
             $manyType = $params['manyType'] ?? 0;
             $sendNum = $params['sendNum'] ?? '';
-            $kindId = $params['kindId'] ?? 0;
-            $kindName = $params['kindName'] ?? '';
             $hasReachTime = 0;
             $reachPeriod = 0;
             $reachDate = '0000-00-00';
@@ -761,8 +759,6 @@ class GoodsClass extends BaseClass
                 'sh' => $sh,
                 'manyType' => $manyType,
                 'sendNum' => $sendNum,
-                'kindId' => $kindId,
-                'kindName' => $kindName,
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {

biz-hd/work/classes/WorkClass.php

@@ -130,8 +130,6 @@ class WorkClass extends BaseClass
         $sh = $data['sh'] ?? 0;
         $manyType = $data['manyType'] ?? 0;
         $sendNum = $data['sendNum'] ?? '';
-        $kindId = $data['kindId'] ?? 0;
-        $kindName = $data['kindName'] ?? '';
 
         $ids = array_column($goods, 'productId');
         $info = GoodsClass::getByIds($ids, null, 'id');
@@ -139,6 +137,8 @@ class WorkClass extends BaseClass
             $goodsId = $val['productId'] ?? 0;
             $name = $info[$goodsId]['name'] ?? '';
             $goodsSn = $info[$goodsId]['sn'] ?? '';
+            $kindId = $info[$goodsId]['kindId'] ?? 0;
+            $kindName = $info[$goodsId]['kindName'] ?? '';
             $setItemNum = $info[$goodsId]['setItemNum'] ?? 0;
             $workNum = $val['num'] ?? 0;
             $cover = isset($info[$goodsId]['cover']) && !empty($info[$goodsId]['cover']) ? $info[$goodsId]['cover'] : 'hhb_small.png';

biz-mall/order/classes/OrderGoodsClass.php

@@ -29,8 +29,6 @@ class OrderGoodsClass extends BaseClass
 
                 $goodsId = $goods->goodsId ?? 0;
                 $num = $goods->num ?? 0;
-                $kindId = $goods->kindId ?? 0;
-                $kindName = $goods->kindName ?? '';
                 $orderPrice = $order->orderPrice ?? 0;
                 $fromType = $order->fromType ?? 1;
                 $remark = $order->remark ?? '';
@@ -43,7 +41,7 @@ class OrderGoodsClass extends BaseClass
                 $sendNum = $order->sendNum ?? '';
                 $params = ['orderId' => $orderId, 'orderSn' => $orderSn, 'shopId' => $shopId, 'sendType' => $sendType, 'thirdSn' => $thirdSn, 'cardInfo' => $cardInfo, 'anonymity' => $anonymity,
                     'fromType' => $fromType, 'orderPrice' => $orderPrice, 'remark' => $remark, 'orderDebtPrice' => $orderDebtPrice, 'manyType' => $manyType, 'sendNum' => $sendNum,
-                    'kindId' => $kindId, 'kindName' => $kindName];
+                ];
                 $flower = $goods->flower ?? 0;
                 //鲜花类不需要验证库存，库存可以负数，并相应生成制作单
                 $checkStock = $flower == 0 ? true : false;