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

app-ghs/controllers/TestController.php

@@ -427,7 +427,8 @@ class TestController extends BaseController
             //['name' => '颍上鲜花岛', 'merchantNo' => '82237205992004L', 'wx' => [825458625, 825457898], 'zfb' => '2088080675832722'],
             //['name' => '晋江花多多鲜花', 'merchantNo' => '8223970599200EW', 'wx' => [825459643, 825460214], 'zfb' => '2088080677754761'],
             //['name' => '昆明源花汇鲜花', 'merchantNo' => '8227310599200VZ', 'wx' => [826321533, 826321247], 'zfb' => '2088080751421086'],
-            ['name' => '厦门厦茗绿植批发', 'merchantNo' => '8223930599200GK', 'wx' => [826594015, 826593264], 'zfb' => '2088080774924483'],
+            //['name' => '厦门厦茗绿植批发', 'merchantNo' => '8223930599200GK', 'wx' => [826594015, 826593264], 'zfb' => '2088080774924483'],
+            ['name' => '惠州美天鲜花水口店', 'merchantNo' => '8225950599200CY', 'wx' => [827536311, 827535872], 'zfb' => '2088080848565460'],
             ['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],
             //['name' => '东莞惠雅鲜花（南城店）', 'merchantNo' => '8226020599200JK', 'wx' => [802315656, 802315755], 'zfb' => '2088870583889365'],

app-hd/controllers/GoodsController.php

@@ -33,7 +33,10 @@ class GoodsController extends BaseController
         if (empty($info)) {
             util::fail('没有找到商品');
         }
-
+        $shop = $this->shop;
+        if (empty($info->sn)) {
+            $info = GoodsClass::generateSn($info, $shop);
+        }
         $shopId = $this->shopId;
 
         $ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);

app-hd/controllers/OrderController.php

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

app-pt/views/main/app.php

@@ -234,15 +234,13 @@
                 showWeChatTip();
                 return;
             }
-            
             // 这里可以根据appType跳转到对应的下载链接
             const downloadUrls = {
-                'xiaohuabao': 'https://api.shop.hzghd.com/1257.apk', // 销花宝APP下载链接
-                'huazhanggui': 'https://api.shop.hzghd.com/206.apk', // 花掌柜APP下载链接
-                'huazhanggui_cashier': 'https://api.shop.hzghd.com/184.apk', // 花掌柜收银下载链接
+                'xiaohuabao': 'https://api.shop.hzghd.com/1259.apk', // 销花宝APP下载链接
+                'huazhanggui': 'https://api.shop.hzghd.com/208.apk', // 花掌柜APP下载链接
+                'huazhanggui_cashier': 'https://api.shop.hzghd.com/185.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/147.apk' // 销花宝收银下载链接
             };
-            
             const url = downloadUrls[appType];
             if (url && url !== '#') {
                 window.open(url, '_blank');

biz-hd/goods/classes/GoodsClass.php

@@ -870,7 +870,7 @@ class GoodsClass extends BaseClass
     public static function generateSn($goods, $shop)
     {
         if (!empty($goods->sn)) {
-            return true;
+            return $goods;
         }
         $shopId = $shop->id;
         $mainId = $shop->mainId;
@@ -878,7 +878,7 @@ class GoodsClass extends BaseClass
         $sn = orderSn::getGoodsSn($data);
         $goods->sn = $sn;
         $goods->save();
-        return true;
+        return $goods;
     }
 
 }