Merge branch 'master' into debt

app-ghs/controllers/ClearController.php

@@ -51,7 +51,9 @@ class ClearController extends BaseController
         CustomClass::valid($custom, $this->shopId);
         $info = ClearClass::getByCondition(['customId' => $customId, 'status' => 1], true);
         if (isset($info->deadline) && $info->deadline < date("Y-m-d H:i:s")) {
+            $n = date("Y-m-d H:i:s");
             $info->status = 3;
+            $info->remark = "账单过期，已自动取消，参数：{$info->deadline} {$n}";
             $info->save();
             util::success(['info' => []]);
         }
@@ -81,6 +83,7 @@ class ClearController extends BaseController
             util::fail('账单已取消');
         }
         $clear->status = ClearClass::STATUS_EXPIRE;
+        $clear->remark = "商家手动取消 ".date("Y-m-d H:i:s");
         $clear->save();
 
         $ghsShop = $this->shop;

app-ghs/controllers/TestController.php

@@ -727,7 +727,7 @@ class TestController extends BaseController
     //零售订单查询 ssh 20231031
     public function actionLsTradeQuery()
     {
-        $shopId = 726;
+        $shopId = 520;
         $shop = ShopClass::getById($shopId, true);
         if (empty($shop)) {
             util::stop('没有找到门店21');
@@ -744,7 +744,7 @@ class TestController extends BaseController
         ];
         $laResource = new Lakala($params);
         $queryParams = [
-            'orderSn' => 'KD26616655',
+            'orderSn' => 'KD26617943',
             //'tradeNo' => '66222010853306',
         ];
         $response = $laResource->query($queryParams, 0);

app-hd/controllers/AuthController.php

@@ -593,12 +593,12 @@ class AuthController extends PublicController
         if (empty($openid)) {
             Yii::info(json_encode($arr));
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid,'sn'=>1]);
         }
         $admin = AdminService::getByCondition(['miniOpenId' => $openid]);
         if (empty($admin)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid,'sn'=>2]);
         }
         $adminId = $admin['id'];
 
@@ -619,12 +619,12 @@ class AuthController extends PublicController
         $currentShopId = $admin['currentShopId'] ?? 0;
         if (empty($currentShopId)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid,'sn'=>3]);
         }
         $currentShop = ShopClass::getById($currentShopId, true);
         if (empty($currentShop)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid,'sn'=>4]);
         }
         $mainId = $currentShop->mainId ?? 0;
         $pfShopId = $currentShop->pfShopId ?? 0;
@@ -638,11 +638,11 @@ class AuthController extends PublicController
         $shopAdmin = ShopAdminClass::getByCondition(['mainId' => $mainId, 'adminId' => $adminId], true);
         if (empty($shopAdmin)) {
             //没有管理店铺不允许登录
-            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid,'sn'=>5]);
         }
         if (isset($shopAdmin->status) == false || $shopAdmin->status == 0) {
             //账号冻结不再自动登录
-            util::success(['token' => '', 'currentMiniOpenId' => $openid]);
+            util::success(['token' => '', 'currentMiniOpenId' => $openid,'sn'=>6]);
         }
         $shopAdmin->lastLogin = date("Y-m-d H:i:s");
         $shopAdmin->save();

app-hd/controllers/ClearController.php

@@ -42,6 +42,7 @@ class ClearController extends BaseController
             util::fail('账单已取消');
         }
         $clear->status = ClearClass::STATUS_EXPIRE;
+        $clear->remark = "客户手动取消 ".date('Y-m-d H:i:s');
         $clear->save();
         $orderSn = $clear->orderSn ?? '';
 

app-hd/controllers/PurchaseClearController.php

@@ -103,10 +103,10 @@ class PurchaseClearController extends BaseController
             util::fail('账单号无效');
         }
         if ($order->status == PurchaseClearClass::STATUS_HAS_PAY) {
-            util::fail('账单已结清了');
+            util::fail('账单已结清');
         }
         if ($order->status == PurchaseClearClass::STATUS_EXPIRE) {
-            util::fail('账单已取消了');
+            util::fail('账单已取消');
         }
 
         //避免重复提交
@@ -260,10 +260,10 @@ class PurchaseClearController extends BaseController
             util::fail('账单号无效');
         }
         if ($order->status == PurchaseClearClass::STATUS_HAS_PAY) {
-            util::fail('账单已结清了');
+            util::fail('账单已结清！');
         }
         if ($order->status == PurchaseClearClass::STATUS_EXPIRE) {
-            util::fail('账单已取消了');
+            util::fail('账单已取消！');
         }
         $oldOrderSn = $orderSn;
         $current = time();

biz-ghs/order/services/RefundOrderService.php

@@ -80,7 +80,9 @@ class RefundOrderService extends BaseService
                 $saleStr = $clear->saleIds ?? '';
                 $deadline = $clear->deadline ?? '';
                 if ($deadline < date("Y-m-d H:i:s")) {
+                    $n = date("Y-m-d H:i:s");
                     $clear->status = 3;
+                    $clear->remark = "账单过期，已自动取消！！参数：{$deadline} {$n}";
                     $clear->save();
                 } else {
                     if (!empty($saleStr)) {

common/components/book.php

@@ -86,11 +86,12 @@ class book
             ['style' => 'smallTitle', 'value' => '门店转让，需新开收款账户，并更换管理人员的，每次50元。',],
         ],
         'chargeStandard2' => [
-            ['style' => 'info', 'value' => '软件年费2580元/年，客户通过小程序下单，会扣千分之3.3手续费（即1千元扣3.3元）。',],
+            ['style' => 'info', 'value' => '软件年费2580元/每年（注意是每年），客户通过小程序下单，会扣千分之3.3手续费（即1千元扣3.3元）。',],
         ],
         'chargeStandard' => [
-            ['style' => 'info', 'value' => '软件年费1580元/年，客户通过小程序下单，会扣千分之3.3手续费（即1千元扣3.3元）。',],
-            ['style' => 'info', 'value' => '根据你自身门店情况，选择以下套餐。下面列出的套餐，已经过全国100多家鲜花批发店磨合使用，非常成熟好用，请放心购买使用，以下套餐已含首年年费。',],
+            ['style' => 'info', 'value' => '软件年费1580元/每年（注意是每年），客户通过小程序下单，会扣千分之3.3手续费（即1千元扣3.3元）。',],
+            ['style' => 'info', 'value' => '根据你自身门店情况，选择以下套餐。下面列出的套餐，已经过全国100多家鲜花批发店磨合使用，非常成熟好用，请放心购买使用，以下套餐已含第一年年费。',],
+            ['style' => 'smallTitle', 'value' => '注意，不管是年费、费率和套餐，都已经给到大家最低价，没有谈的空间。如果还要再谈，不需要再找我们浪费时间，请理解。',],
             ['style' => 'info', 'value' => '首次开通系统，另外赠送30天有效期，保证有足够时间试运营。',],
             ['style' => 'info', 'value' => '-------------------------------------------',],
             ['style' => 'smallTitle', 'value' => '仓库版',],