Merge branch 'after-sale' into redesign‌-260706

app-ghs/controllers/ConsoleController.php

@@ -237,10 +237,10 @@ class ConsoleController extends BaseController
             ["name" => "盘点", "img" => "ghs/home/pandian.png", "url" => "/pagesStorehouse/inventory/list"],
             ["name" => "报损", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
             ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
-            ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
+            ["name" => "退款记录", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/billing/freeRefundList"],
             // 无原单退款：选客户→选花材→生成 sameDay=0 退款单（不关联销售单）
             ["name" => "退款", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/custom/selectCustom?style=1&refund=1"],
-            ["name" => "退款记录", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/billing/freeRefundList"],
+            ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
             ["name" => "公告", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/ghsNotice/list"],
         ];
         $menuV3 = [
@@ -262,10 +262,10 @@ class ConsoleController extends BaseController
             ["name" => "盘点", "img" => "ghs/home/pandian.png", "url" => "/pagesStorehouse/inventory/list"],
             ["name" => "报损", "img" => "ghs/home/kcyjs.png", "url" => "/admin/breakage/list"],
             ["name" => "拆散", "img" => "ghs/home/kcyjs.png", "url" => "/admin/part/list"],
-            ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
+            ["name" => "退款记录", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/billing/freeRefundList"],
             // 无原单退款：选客户→选花材→生成 sameDay=0 退款单（不关联销售单）
             ["name" => "退款", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/custom/selectCustom?style=1&refund=1"],
-            ["name" => "退款记录", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/billing/freeRefundList"],
+            ["name" => "收款流水", "img" => "ghs/home/kcyjs.png", "url" => "/admin/order/scanPay"],
             ["name" => "公告", "img" => "ghs/home/icon_caigou.png", "url" => "/admin/ghsNotice/list"],
         ];
         $menuIconMap = [

app-ghs/controllers/TestController.php

@@ -489,7 +489,8 @@ class TestController extends BaseController
             //['name' => '福建清流美朵花业', 'merchantNo' => '82239505992002F', 'wx' => [909185571, 2000017120], 'zfb' => '2088780716665741'],
             //['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' => '8226020599200S3', 'wx' => [913207533, 913206368], 'zfb' => '2088880020992882'],
+            ['name' => '深圳福田天天鲜花', 'merchantNo' => '82258405992022M', 'wx' => [915397806, 915397601], 'zfb' => '2088880200936882'],
             //['name' => '中山淘花里小榄店', 'merchantNo' => '8226030599200D5', 'wx' => [911061554, 911061963], 'zfb' => '2088780851935068'],
             //['name' => '重庆大金地', 'merchantNo' => '8226900599201GA', 'wx' => [910648990, 910644127], 'zfb' => '2088780830897617'],
             //['name' => '云南珑松珠海店', 'merchantNo' => '82258505992009Q', 'wx' => [910384498, 910385532], 'zfb' => '2088780804010303'],

biz/ghs/classes/GhsClass.php

@@ -461,7 +461,7 @@ class GhsClass extends BaseClass
         }
 
         //要排除的批发店,填门店id
-        $exclude = [95258, 23667, 78556, 64112, 795, 1405, 28051, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167, 15007, 88085, 91064, 413, 62421];
+        $exclude = [95258, 23667, 64112, 795, 1405, 28051, 62304, 42385, 56611, 38143, 15373, 42946, 15375, 15734, 15736, 15738, 15740, 24132, 29044, 29161, 30902, 44724, 48608, 48642, 82971, 38231, 1105, 3, 154, 208, 23580, 24713, 8249, 16070, 83690, 86726, 1596, 2167, 15007, 88085, 91064, 413, 62421];
         foreach ($nearbyShops as $key => $nearbyShop) {
             if (in_array($nearbyShop['id'], $exclude)) {
                 unset($nearbyShops[$key]);