Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -494,9 +494,10 @@ class TestController extends BaseController
             //['name' => '亳州花鲜谷', 'merchantNo' => '82238105992004A', 'wx' => [908947821, 908946480], 'zfb' => '2088780700742980'],
             //['name' => '福建清流美朵花业', 'merchantNo' => '82239505992002F', 'wx' => [909185571, 2000017120], 'zfb' => '2088780716665741'],
             //['name' => '东莞丰行', 'merchantNo' => '8226020599200RW', 'wx' => [909917474, 909917851], 'zfb' => '2088780774491467'],
-            ['name' => '中山淘花里小榄店', 'merchantNo' => '8226030599200D5', 'wx' => [911061554, 911061963], 'zfb' => '2088780851935068'],
-            ['name' => '重庆大金地', 'merchantNo' => '8226900599201GA', 'wx' => [910648990, 910644127], 'zfb' => '2088780830897617'],
-            ['name' => '云南珑松珠海店', 'merchantNo' => '82258505992009Q', 'wx' => [910384498, 910385532], 'zfb' => '2088780804010303'],
+            ['name' => '商丘花鲜谷', 'merchantNo' => '82250605992009Q', 'wx' => [911392567, 911392641], 'zfb' => '2088780883539375'],
+            //['name' => '中山淘花里小榄店', 'merchantNo' => '8226030599200D5', 'wx' => [911061554, 911061963], 'zfb' => '2088780851935068'],
+            //['name' => '重庆大金地', 'merchantNo' => '8226900599201GA', 'wx' => [910648990, 910644127], 'zfb' => '2088780830897617'],
+            //['name' => '云南珑松珠海店', 'merchantNo' => '82258505992009Q', 'wx' => [910384498, 910385532], 'zfb' => '2088780804010303'],
             //['name' => '义乌我要花', 'merchantNo' => '82239505992002H', 'wx' => [910330169, 910330807], 'zfb' => '2088780802113602'],
             //['name' => '仁寿花鲜谷', 'merchantNo' => '82266705992003V', 'wx' => [910335651, 910335572], 'zfb' => '2088780803109765'],
             //['name' => '泉州花多多批发', 'merchantNo' => '8223970599200LK', 'wx' => [910038898, 910040329], 'zfb' => '2088780782679844'],

app-hd/controllers/PurchaseController.php

@@ -497,19 +497,6 @@ class PurchaseController extends BaseController
                         }
                     }
                 }
-// 已经有了 -- 在 replaceItem()
-//                foreach ($productList as $itemData) {
-//                    $productId = $itemData['productId'] ?? 0;
-//                    $product = $productInfoList[$productId] ?? [];
-//                    if (empty($product)) {
-//                        util::fail('有商品信息没有找到');
-//                    }
-//                    $bigNum = $itemData['bigNum'] ?? 0;
-//                    if (($product['limitBuy'] ?? 0) > 0) {
-//                        $product['productId'] = $productId;
-//                        ProductClass::handleLimitBuy($product, $customId, floatval($bigNum));
-//                    }
-//                }
 
             } else {
                 util::fail('花材不存在');