Merge branch 'master' into dev

app-ghs/controllers/TestController.php

@@ -472,7 +472,7 @@ class TestController extends BaseController
             //['name' => '济南万花田', 'merchantNo' => '8224510599200NN', 'wx' => [881205017, 881205264], 'zfb' => '2088480339301423'],
             //['name' => '济南万花田鲜花', 'merchantNo' => '8224510599200NP', 'wx' => [881375592, 881375991], 'zfb' => '2088480345092520'],
             //['name' => '温州易批花', 'merchantNo' => '8223330599200E0', 'wx' => [882196314, 882196905], 'zfb' => '2088480379232415'],
-            ['name' => '莆田我要花辉皇店', 'merchantNo' => '82239405992007T', 'wx' => [884613202, 884611698], 'zfb' => '2088480542516472'],
+            //['name' => '莆田我要花辉皇店', 'merchantNo' => '82239405992007T', 'wx' => [884613202, 884611698], 'zfb' => '2088480542516472'],
             //['name' => '藏花林', 'merchantNo' => '8227310599200ZC', 'wx' => [868558224, 868558410], 'zfb' => '2088380587657250'],
             //['name' => '昆明藏花林花卉', 'merchantNo' => '8227310599200ZN', 'wx' => [869670880, 869668881], 'zfb' => '2088380691198135'],
             //['name' => '昆明藏花林鲜花', 'merchantNo' => '8227310599200ZJ', 'wx' => [869361939, 869362520], 'zfb' => '2088380669365761'],
@@ -481,6 +481,7 @@ class TestController extends BaseController
             //['name' => '三明易批花', 'merchantNo' => '82239505992001X', 'wx' => [868630425, 868628086], 'zfb' => '2088380594855142'],
             //['name' => '厦门都市鲜花批发', 'merchantNo' => '8223930599200HZ', 'wx' => [854245016, 854244735], 'zfb' => '2088280333454097'],
             //['name' => '深圳鼎盛皇室花卉', 'merchantNo' => '8225840599201MF', 'wx' => [807078304, 807076486], 'zfb' => '2088970117746334'],
+            ['name' => '昆明花满仓', 'merchantNo' => '82273105992011D', 'wx' => [886442011, 886441824], 'zfb' => '2088480829650284'],
             //['name' => '东莞惠雅鲜花（莞城店）', 'merchantNo' => '8226020599200GJ', 'wx' => [796953190, 796976959], 'zfb' => '2088770940104912'],
             //['name' => '东莞惠雅鲜花（南城店）', 'merchantNo' => '8226020599200JK', 'wx' => [802315656, 802315755], 'zfb' => '2088870583889365'],
             //['name' => '沈阳市云花鲜花批发-专业化扫码', 'merchantNo' => '8222210599200BT', 'wx' => [796180053], 'zfb' => '2088770820458908'],
@@ -993,7 +994,7 @@ class TestController extends BaseController
     //交易查询 ssh 20231021
     public function actionTradeQuery()
     {
-        $shopId = 40212;
+        $shopId = 15289;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店，编号677230');
@@ -1009,7 +1010,7 @@ class TestController extends BaseController
             'lklCertificatePath' => $lklCertificatePath,
         ];
         $laResource = new Lakala($params);
-        $orderSn = 'CG30754216';
+        $orderSn = 'CG30760064';
         $tradeNo = '66223936904050';
         $queryParams = [
             'orderSn' => $orderSn,

biz-hd/merchant/services/SjService.php

@@ -113,8 +113,9 @@ class SjService extends BaseService
         if (isset($applyData['appRegister']) && $applyData['appRegister'] == 1) {
             //$onlyCg = 0;
         }
+        $pt = isset($applyData['introShopId']) && !empty($applyData['introShopId']) ? 1 : 0;
         //给10天时间
-        $deadTime = time()+864000;
+        $deadTime = time() + 864000;
         //创建门店
         $shopData = [
             'shopName' => '首店',
@@ -142,8 +143,9 @@ class SjService extends BaseService
             'ptStyle' => $ptStyle,
             'live' => $live,
             'onlyCg' => $onlyCg,
-            'deadline'=> date("Y-m-d H:i:s", $deadTime),
-            'beforeDeadline'=> date("Y-m-d H:i:s"),
+            'deadline' => date("Y-m-d H:i:s", $deadTime),
+            'beforeDeadline' => date("Y-m-d H:i:s"),
+            'pt' => $pt,
         ];
         $shopInfo = ShopClass::addShop($shopData);
         $shopId = $shopInfo->id;

biz-hd/order/classes/OrderClass.php

@@ -1094,7 +1094,7 @@ class OrderClass extends BaseClass
         $content .= '订单编号：' . $respond['orderSn'] . '<BR>';
         $content .= '门店名称：' . $currentName . '<BR>';
         $content .= "<BR>";
-        noticeUtil::push($content, '15280215347');
+        //noticeUtil::push($content, '15280215347');
         $p = new printUtil($printSn);
 
         $orderSn = $order->orderSn ?? '';

biz/ghs/classes/GhsClass.php

@@ -123,6 +123,7 @@ class GhsClass extends BaseClass
         $mobile = $shop['mobile'] ?? '';
         $uniGhsId = $shop['uniGhsId'] ?? 0;
         $hasManyGhs = $shop['hasManyGhs'] ?? 0;
+        $pt = $shop['pt'] ?? 0;
         if ($uniGhsId == 0 && $hasManyGhs == 0) {
             ShopClass::updateById($hdShopId, ['uniGhsId' => $ghsId]);
         } else {
@@ -164,6 +165,7 @@ class GhsClass extends BaseClass
                 'home' => $home,
                 'homeAmount' => $homeAmount,
                 'homeNum' => $homeNum,
+                'pt' => $pt,
             ];
             $custom = CustomClass::addCustom($customData);
         }