Merge remote-tracking branch 'origin/redesign‌-260706' into redesign‌-260706

app-ghs/controllers/AuthController.php

@@ -919,7 +919,7 @@ class AuthController extends PublicController
     {
         $version = getenv('GHS_NEW_APK_VERSION') == false ? '100' : getenv('GHS_NEW_APK_VERSION');
         $mustUpdate = getenv('GHS_NEW_APK_VERSION_MUST_UPDATE') == false ? 0 : getenv('GHS_NEW_APK_VERSION_MUST_UPDATE');
-        $updateText = '零售系统上线升级';
+        $updateText = '挂账结清后，支持售后了';
         util::success(['version' => $version, 'mustUpdate' => $mustUpdate, 'updateText' => $updateText]);
     }
 

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/ConsoleController.php

@@ -322,8 +322,8 @@ class ConsoleController extends BaseController
 
         $warning = '';
         $warningUrl = '';
-        //$warning = '本页右上方，暂不显示昨天收入金额';
-        //$warningUrl = '/admin/notice/warning';
+        $warning = '挂账结清，支持售后了（重大更新，必看）';
+        $warningUrl = '/admin/notice/warning';
 
         util::success([
             'asset' => $this->main,

app-ghs/controllers/DeliveryController.php

@@ -754,7 +754,10 @@ class DeliveryController extends BaseController
      */
     public function actionShansongAuthCallback()
     {
-        $code = Yii::$app->request->get('code');
+        $get = Yii::$app->request->get();
+        Yii::info('闪送授权回调：' . json_encode($get, JSON_UNESCAPED_UNICODE), 'shansong');
+        
+        $code = $get['code'];
         $state = Yii::$app->request->get('state');
         $shopId = Yii::$app->request->get('shopId');
         $isAllStoreAuth = Yii::$app->request->get('isAllStoreAuth');

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'],

app-pt/views/main/app.php

@@ -235,7 +235,7 @@
             }
             // 这里可以根据appType跳转到对应的下载链接
             const downloadUrls = {
-                'xiaohuabao': 'https://api.shop.hzghd.com/1320.apk', // 销花宝APP下载链接
+                'xiaohuabao': 'https://api.shop.hzghd.com/1326.apk', // 销花宝APP下载链接
                 'huazhanggui': 'https://api.shop.hzghd.com/246.apk', // 花掌柜APP下载链接
                 'huazhanggui_cashier': 'https://api.shop.hzghd.com/220.apk', // 花掌柜收银下载链接
                 'xiaohuabao_cashier': 'https://api.shop.hzghd.com/178.apk' // 销花宝收银下载链接

biz-ghs/stat/classes/StatSaleClass.php

@@ -463,7 +463,7 @@ class StatSaleClass extends BaseClass
             ['name' => '零售', 'id' => 'ls', 'amount' => floatval($lsIncome)],
             ['name' => '调拨出库', 'id' => 'allot', 'amount' => floatval($stockOut)],
             // 采购隔天售后冲回（含退货并退款、仅退款）；后续若细分再拆行
-            ['name' => '采购隔天退款', 'id' => 'cgNextDay', 'amount' => floatval($cgNextDayRefund)],
+            ['name' => '采购退款', 'id' => 'cgNextDay', 'amount' => floatval($cgNextDayRefund)],
         ];
         $expend = [
             ['name' => '批发运费', 'id' => 'pfSendCost', 'amount' => floatval($pfSendCost)],

common/components/dada/dada.php

@@ -206,7 +206,7 @@ class dada
         } else {
             //测试 :商户id: 73753    门店id: 11047059
             $config->setSourceId(73753);
-            $config->setHost("http://newopen.qa.imdada.cn");
+            $config->setHost("http://newopen.ndev.imdada.cn");
         }
         $config->setAppKey($appKey);
         $config->setAppSecret($appSecret);

common/components/delivery/platform/dada/Auth.php

@@ -23,7 +23,7 @@ class Auth
     const AUTHORIZE_URL_PROD = 'https://newopen.imdada.cn/';
     const TOKEN_URL_PROD = '';
     
-    const AUTHORIZE_URL_TEST = 'https://newopen.qa.imdada.cn/';
+    const AUTHORIZE_URL_TEST = 'https://newopen.ndev.imdada.cn/';
     const TOKEN_URL_TEST = '';
     
     protected $appKey;

common/components/delivery/platform/dada/Dada.php

@@ -9,7 +9,7 @@ class Dada
     const FORMAT = 'json';
 
     // 测试环境和生产环境基础 URL
-    const TEST_BASE_URL = 'https://newopen.qa.imdada.cn';
+    const TEST_BASE_URL = 'https://newopen.ndev.imdada.cn';
     const PROD_BASE_URL = 'https://newopen.imdada.cn';
 
     protected $baseUrl;
@@ -33,8 +33,8 @@ class Dada
             $this->appSecret = '828a03677a1c00a3a5b3c59209c4433d';
         } else {
             // 测试环境配置
-            $this->baseUrl = self::PROD_BASE_URL; // TODO
-            //$this->baseUrl = self::TEST_BASE_URL;
+            // $this->baseUrl = self::PROD_BASE_URL; // TODO
+            $this->baseUrl = self::TEST_BASE_URL;
             $this->appKey = 'dadaf2279d901a5ba40';
             $this->appSecret = '828a03677a1c00a3a5b3c59209c4433d';
         }