Merge branch 'master' into redesign‌-260706

app-ghs/controllers/CgRefundController.php

@@ -111,6 +111,11 @@ class CgRefundController extends BaseController
         if ($status > -1) {
             $where['status'] = $status;
         }
+        // sameDay：-1全部 1当天售后 0隔天售后（与销售售后列表对齐）
+        $sameDay = isset($get['sameDay']) ? intval($get['sameDay']) : -1;
+        if ($sameDay === 0 || $sameDay === 1) {
+            $where['sameDay'] = $sameDay;
+        }
 
         $export = $get['export'] ?? 0;
         if ($export == 1) {

app-ghs/controllers/PurchaseClearController.php

@@ -37,7 +37,7 @@ class PurchaseClearController extends BaseController
         if (getenv('YII_ENV') == 'production') {
             //小向花卉采购的结账确认，有多处，关键词ghs_cg_clear_confirm
             if (in_array($this->mainId, [23390, 24516])) {
-                if (!in_array($this->adminId, [24655,77951])) {
+                if (!in_array($this->adminId, [24655, 77951])) {
                     util::fail('不能操作哈');
                 }
             }
@@ -55,7 +55,7 @@ class PurchaseClearController extends BaseController
             }
             //淘花里小榄店 thl_xl_clear
             if (in_array($this->shopId, [72366])) {
-                if (!in_array($this->adminId, [69792,55445,55707,69792])) {
+                if (!in_array($this->adminId, [69792, 55445, 55707, 69792])) {
                     util::fail('你不能销单那。。。');
                 }
             }
@@ -67,12 +67,12 @@ class PurchaseClearController extends BaseController
             }
             //小齐鲜花总店和出车，多处请搜索关键词 xq_clear_control
             if (in_array($this->shopId, [41467, 42946])) {
-                if (!in_array($this->adminId, [40144,42912,42023])) {
+                if (!in_array($this->adminId, [40144, 42912, 42023])) {
                     util::fail('不能操作哈。。');
                 }
             }
             //恋善好多花控制销账权限
-            if (in_array($this->shopId, [55238,56609,56611])) {
+            if (in_array($this->shopId, [55238, 56609, 56611])) {
                 if (!in_array($this->adminId, [43856, 54620])) {
                     util::fail('暂无权限，请联系老板或财务');
                 }
@@ -94,6 +94,11 @@ class PurchaseClearController extends BaseController
         $shopAdminName = $shopAdmin['name'] ?? '';
         $post['customShopAdminName'] = $shopAdminName;
 
+        $apiVersion = $post['apiVersion'] ?? 0;
+        if ($apiVersion < 1) {
+            util::fail('请先升级app或小程序');
+        }
+
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
@@ -107,4 +112,4 @@ class PurchaseClearController extends BaseController
         }
     }
 
-}
+}

app-ghs/controllers/TestController.php

@@ -490,7 +490,8 @@ class TestController extends BaseController
             //['name' => '东莞丰行', 'merchantNo' => '8226020599200RW', 'wx' => [909917474, 909917851], 'zfb' => '2088780774491467'],
             //['name' => '商丘花鲜谷鲜花', 'merchantNo' => '82250605992009Q', 'wx' => [911392567, 911392641], 'zfb' => '2088780883539375'],
             //['name' => '东莞我要花', 'merchantNo' => '8226020599200S3', 'wx' => [913207533, 913206368], 'zfb' => '2088880020992882'],
-            ['name' => '深圳福田天天鲜花', 'merchantNo' => '82258405992022M', 'wx' => [915397806, 915397601], 'zfb' => '2088880200936882'],
+            //['name' => '深圳福田天天鲜花', 'merchantNo' => '82258405992022M', 'wx' => [915397806, 915397601], 'zfb' => '2088880200936882'],
+            ['name' => '昆明藏花林', 'merchantNo' => '82252105992011Z', 'wx' => [917884924, 917883992], 'zfb' => '2088880449061387'],
             //['name' => '中山淘花里小榄店', 'merchantNo' => '8226030599200D5', 'wx' => [911061554, 911061963], 'zfb' => '2088780851935068'],
             //['name' => '重庆大金地', 'merchantNo' => '8226900599201GA', 'wx' => [910648990, 910644127], 'zfb' => '2088780830897617'],
             //['name' => '云南珑松珠海店', 'merchantNo' => '82258505992009Q', 'wx' => [910384498, 910385532], 'zfb' => '2088780804010303'],