fix conflicts

app-ghs/controllers/ConsoleController.php

@@ -174,6 +174,7 @@ class ConsoleController extends BaseController
             }
         }
 
+
         //$notice[] = ['title' => '客户多个订单开始支持一键分享', 'action' => '查看', 'page' => '/admin/book/detail?id=calc'];
         //$notice[] = ['title' => '如果你发现一个问题很重要，一直没给你处理，在小群多反应几次，用反应次数强调重要性，目前批发店多反应问题多，都在排队。', 'action' => '', 'page' => ''];
         //$notice[] = ['title' => '新功能：客户端和后台使用跑腿的流程', 'action' => '', 'page' => '/admin/book/detail?id=use_pt'];

app-ghs/controllers/ShopYeChangeController.php

@@ -27,6 +27,14 @@ class ShopYeChangeController extends BaseController
         if (!empty($tx)) {
             $where['tx'] = $tx;
         }
+        // 事件类型
+        if (isset($get['capitalType']) && $get['capitalType'] !== '') {
+            $where['capitalType'] = (int)$get['capitalType'];
+        }
+        // 收支类型筛选：1 收入，0 支出；未传参时不筛选
+        if (isset($get['io']) && $get['io'] !== '') {
+            $where['io'] = (int)$get['io'];
+        }
         $searchTime = isset($get['searchTime']) && !empty($get['searchTime']) ? $get['searchTime'] : '';
         $startTime = $get['startTime'] ?? '';
         $endTime = $get['endTime'] ?? '';
@@ -38,7 +46,6 @@ class ShopYeChangeController extends BaseController
         }
         $list = ShopYeChangeClass::getChangeList($where);
         if ($export == 1) {
-
             ini_set('memory_limit', '2045M');
             set_time_limit(0);
             if (isset($where['addTime']) == false) {
@@ -58,5 +65,4 @@ class ShopYeChangeController extends BaseController
         }
         util::success($list);
     }
-
-}
+}

app-ghs/controllers/TestController.php

@@ -62,6 +62,7 @@ class TestController extends BaseController
 //        stockConsumer::clearOrderItemLimitBuy($data);
     }
 
+
     public function actionFx()
     {
         $ghsShopId = 7855;
@@ -505,7 +506,8 @@ class TestController extends BaseController
             //['name' => '广州福隆花卉', 'merchantNo' => '8225810599201T8', 'wx' => [900532403, 900531348], 'zfb' => '2088780172288658'],
             //['name' => '张家口万花汇', 'merchantNo' => '82213805992008D', 'wx' => [901551070, 901551037], 'zfb' => '2088780253600870'],
             //['name' => '深圳每日鲜花批发', 'merchantNo' => '82258405992020E', 'wx' => [902309136, 902307468], 'zfb' => '2088780298610704'],
-            ['name' => '滨州花镜鲜花', 'merchantNo' => '82246605992005U', 'wx' => [904373612, 904373338], 'zfb' => '2088780426621723'],
+            //['name' => '滨州花镜鲜花', 'merchantNo' => '82246605992005U', 'wx' => [904373612, 904373338], 'zfb' => '2088780426621723'],
+            ['name' => '广州情意鲜花', 'merchantNo' => '8225810599201U2', 'wx' => [904871059, 904872401], 'zfb' => '2088780455410378'],
             //['name' => '厦门纯彩花艺', 'merchantNo' => '8223930599200LD', 'wx' => [894984230, 894983290], 'zfb' => '2088680439152343'],
             //['name' => '东莞我要花鲜花', 'merchantNo' => '8226020599200R8', 'wx' => [894794554, 894794917], 'zfb' => '2088680405463378'],
             //['name' => '镇江花珩鲜花批发', 'merchantNo' => '82231405992003N', 'wx' => [894925711, 894925626], 'zfb' => '2088680426877183'],

app-hd/controllers/ShopYeChangeController.php

@@ -25,6 +25,14 @@ class ShopYeChangeController extends BaseController
         if (!empty($tx)) {
             $where['tx'] = $tx;
         }
+        // 事件类型
+        if (isset($get['capitalType']) && $get['capitalType'] !== '') {
+            $where['capitalType'] = (int)$get['capitalType'];
+        }
+        // 收支类型筛选：1 收入，0 支出；未传参时不筛选
+        if (isset($get['io']) && $get['io'] !== '') {
+            $where['io'] = (int)$get['io'];
+        }
         $list = ShopYeChangeClass::getChangeList($where);
         util::success($list);
     }

biz-hd/birthday/classes/BirthdayGiftClass.php

@@ -568,7 +568,7 @@ class BirthdayGiftClass extends BaseClass
                         }
                     }
                 }
-     
+
                 if ($statusFilter < 0 && intval($gift->status) == self::STATUS_NO_BIRTHDAY) {
                     // 全部 Tab 也展示未填写
                 }
@@ -816,7 +816,7 @@ class BirthdayGiftClass extends BaseClass
             'content' => $msg,
             'type' => 1, // 0通知类型, 1营销类型
         ]);
-        
+
         return [true, ''];
     }