Merge branch 'master' into dev

app-ghs/controllers/RenewController.php

@@ -151,7 +151,13 @@ class RenewController extends BaseController
         $totalFee = $price;
 
         $admin = $this->admin;
-        $openId = $admin->ghsMiniOpenId;
+        $openId = $get['currentMiniOpenId'] ?? '';
+        if (empty($openId)) {
+            $openId = $admin->ghsMiniOpenId;
+        }
+        if (empty($openId)) {
+            util::fail('账号有问题，无法支付');
+        }
         $capitalType = dict::getDict('capitalType', 'xhRenew', 'id');
         $attach = 'capitalType=' . $capitalType;
         $wx = Yii::getAlias("@vendor/weixin");

app-ghs/controllers/TestController.php

@@ -455,7 +455,8 @@ class TestController extends BaseController
             //['name' => '宝鸡美婷鲜花批发', 'merchantNo' => '82279305992004N', 'wx' => [847681058, 847680856], 'zfb' => '2088180872582801'],
             //['name' => '广州翰林花卉', 'merchantNo' => '8225810599201LR', 'wx' => [850644821, 850644094], 'zfb' => '2088280085826650'],
             //['name' => '昆明宅小鲜', 'merchantNo' => '8223910599200PL', 'wx' => [852957278, 852958031], 'zfb' => '2088280271476229'],
-            ['name' => '昆明小向花卉批发', 'merchantNo' => '8227310599200Z2', 'wx' => [857900016, 857899180], 'zfb' => '2088280559651366'],
+            //['name' => '昆明小向花卉批发', 'merchantNo' => '8227310599200Z2', 'wx' => [857900016, 857899180], 'zfb' => '2088280559651366'],
+            ['name' => '昆明小玖花卉批发', 'merchantNo' => '8227310599200Z3', 'wx' => [858815386, 858815193], 'zfb' => '2088280613495934'],
             //['name' => '厦门都市鲜花批发', 'merchantNo' => '8223930599200HZ', 'wx' => [854245016, 854244735], 'zfb' => '2088280333454097'],
             //['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],

common/components/book.php

@@ -61,7 +61,7 @@ class book
         ]],
         ['class' => '更多', 'icon' => '/book/more.png', 'list' => [
             ['title' => '微信和支付宝开户认证', 'id' => 'upgrade'],
-            ['title' => '换卡和新开户收费标准', 'id' => 'changeCard'],
+            ['title' => '换卡和新开收款账户收费标准', 'id' => 'changeCard'],
             ['title' => '公司地址', 'id' => 'aboutUs'],
         ]],
     ];
@@ -87,10 +87,10 @@ class book
             ['style' => 'video', 'value' => 'jc/1what.mp4'],
         ],
         'changeCard' => [
-            ['style' => 'info', 'value' => '目前更换银行卡和新开户，还没有开发功能出来，所以需要人工提交资料，工作量大，所以需要收费提供服务。',],
+            ['style' => 'info', 'value' => '目前更换银行卡和新开户，还没有开发功能出来，所以需要人工提交资料，工作量大，所以需要收取服务费。',],
             ['style' => 'miniTitle', 'value' => '更换收款银行卡，每次2元。',],
-            ['style' => 'miniTitle', 'value' => '新开收款账户，每次30元。',],
-            ['style' => 'miniTitle', 'value' => '门店转让，需新开收款账户，并更换管理人员的，每次50元。',],
+            ['style' => 'miniTitle', 'value' => '新开收款账户，每次25元。',],
+            ['style' => 'miniTitle', 'value' => '门店转让，需新开收款账户，并更换管理人员的，每次35元。',],
         ],
         'chargeStandard2' => [
             ['style' => 'info', 'value' => '软件年费1580元，年费需每年付一次，客户通过小程序下单，会扣0.33手续费，即100元扣3毛3，付款后不支持退货。',],