Merge branch 'dev' of git.huaml.com:zhh/huahuibao into dev

app-hd/controllers/GoodsController.php

@@ -86,7 +86,6 @@ class GoodsController extends BaseController
     public function actionGetBySn()
     {
         $sn = Yii::$app->request->get('sn');
-        $sn = str_replace('#', '', $sn);
         $mainId = $this->mainId;
         $goods = GoodsClass::getByCondition(['mainId' => $mainId, 'sn' => $sn], true);
         GoodsClass::valid($goods, $this->mainId);

app-hd/controllers/OrderController.php

@@ -636,6 +636,7 @@ class OrderController extends BaseController
             $productList = json_decode($productJson, true);
         }
         if (empty($productList) && empty($groupId)) {
+            util::fail('此功能停用，如还需要请联系官方');
             //商家手机上开单并生成制作单
             if (!empty($post['unitGoodsPrice'])) {
                 $unitGoodsPrice = $post['unitGoodsPrice'];

biz-hd/order/services/OrderService.php

@@ -105,6 +105,7 @@ class OrderService extends BaseService
                 $flower = $currentGoodsInfo['flower'] ?? 0;
                 $kindId = $currentGoodsInfo['kindId'] ?? 0;
                 $kindName = $currentGoodsInfo['kindName'] ?? 0;
+                $sn = $currentGoodsInfo['sn'] ?? '';
                 if (empty($orderCover)) {
                     $orderCover = $cover;
                 }
@@ -116,6 +117,7 @@ class OrderService extends BaseService
                 $currentWeight = bcmul($weight, $num, 2);
                 $totalWeight = bcadd($totalWeight, $currentWeight, 2);
                 $currentGoodsData = [
+                    'sn' => $sn,
                     'orderSn' => $orderSn,
                     'goodsId' => $currentId,
                     'flower' => $flower,