名称搜索与字典

app-ghs/controllers/OrderController.php

@@ -50,7 +50,14 @@ class OrderController extends BaseController
             $period = dateUtil::formatTime($searchTime, $startTime, $endTime);
             $where['addTime'] = ['between', [$period['startTime'], $period['endTime']]];
         }
-
+        $name = $get['name'] ?? '';
+        if (!empty($name)) {
+            if (preg_match("/^[a-zA-Z\s]+$/", $name)) {
+                $where['customNamePy'] = ['like', $name];
+            } else {
+                $where['customName'] = ['like', $name];
+            }
+        }
         $data = OrderClass::getOrderList($where);
         util::success($data);
     }

biz-ghs/order/classes/OrderClass.php

@@ -240,20 +240,13 @@ class OrderClass extends BaseClass
             return $list;
         }
 
-        $customIds = array_unique(array_filter(array_column($list, 'customId')));
-        $customInfo = CustomClass::getCustomByIds($customIds);
-
         $adminIds = array_unique(array_filter(array_column($list, 'adminId')));
         $adminInfo = AdminClass::getAdminByIds($adminIds, null, 'id');
 
         foreach ($list as $key => $val) {
             $adminId = $val['adminId'] ?? 0;
             $list[$key]['adminName'] = $adminInfo[$adminId]['adminName'] ?? '';
-            $customId = $val['customId'] ?? 0;
-            $list[$key]['customName'] = $customInfo[$customId]['name'] ?? '';
-            $list[$key]['customAvatar'] = $customInfo[$customId]['smallAvatar'] ?? '';
-            $list[$key]['customMobile'] = $customInfo[$customId]['mobile'] ?? '';
-            $list[$key]['customAddress'] = $customInfo[$customId]['address'] ?? '';
+            $list[$key]['customAddress'] = $val['receiveFullAddress'] ?? '';
             //显示列表页的操作按钮
             $list[$key]['buttonList'] = self::getShowButton($showButton, $isList, $val);
             //显示进度条

common/components/dict.php

@@ -15,9 +15,8 @@ class dict
 			['name' => '本月', 'value' => 'thisMonth',],
 			['name' => '上月', 'value' => 'lastMonth',],
 			['name' => '今年', 'value' => 'thisYear',],
-			['name' => '自定义', 'value' => 'custom',],
 		],
-		
+
 		'merchantStatus' => ['checking' => 0, 'pass' => 1, 'noPass' => 2, 'freeze' => 3, 'unfreeze' => 4, 'shut' => 5],
 		'merchantStatusName' => [0 => '审核中', 1 => '审核通过', 2 => '审核未通过', 3 => '冻结', 4 => '解除冻结', 5 => '自主关闭'],
 		

sql.sql

@@ -1644,3 +1644,8 @@ ALTER TABLE xhOrder MODIFY `payWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '支
 ALTER TABLE xhGhsOrder MODIFY `payWay` TINYINT(4) NOT NULL DEFAULT '0' COMMENT '支付方式';
 
 线上的bucket需要提醒琦海设置
+
+ALTER TABLE xhGhsOrder ADD customName VARCHAR(50) NOT NULL DEFAULT '' COMMENT '客户名称' AFTER `customId`;
+ALTER TABLE xhGhsOrder ADD customNamePy VARCHAR(20) NOT NULL DEFAULT '' COMMENT '客户名称拼音首字母' AFTER `customName`;
+ALTER TABLE xhGhsOrder ADD customAvatar VARCHAR(800) NOT NULL DEFAULT '' COMMENT '客户头像' AFTER `customNamePy`;
+ALTER TABLE xhGhsOrder ADD customMobile CHAR(15) NOT NULL DEFAULT '' COMMENT '客户手机号' AFTER `customAvatar`;