导购交互优化

gic-store-api/src/main/java/com/gic/store/dto/ClerkSearchDTO.java

@@ -27,7 +27,7 @@ public class ClerkSearchDTO implements Serializable {
     private List<String> fieldCodeList;
     private Integer dataType;
     private Integer status;
-
+    private Integer searchType = 1;
 
     public String getSearch() {
         return search;
@@ -149,6 +149,14 @@ public class ClerkSearchDTO implements Serializable {
         return status;
     }
 
+    public Integer getSearchType() {
+        return searchType;
+    }
+
+    public void setSearchType(Integer searchType) {
+        this.searchType = searchType;
+    }
+
     @Override
     public String toString() {
         return "ClerkSearchDTO{" +

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkController.java

@@ -252,6 +252,12 @@ public class ClerkController extends DownloadUtils {
     public RestResponse listClerk(@RequestBody ClerkSearchDTO clerkSearchDTO) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         clerkSearchDTO.setEnterpriseId(enterpriseId);
+        if (clerkSearchDTO.getSearchType() == 2) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkSearchDTO.getSearch();
+            clerkSearchDTO.setStoreSearch(search);
+            clerkSearchDTO.setSearch(null);
+        }
         ServiceResponse serviceResponse = clerkApiService.listClerk(enterpriseId, clerkSearchDTO, clerkSearchDTO.getCurrentPage(), clerkSearchDTO.getPageSize());
         if (serviceResponse.isSuccess()) {
             return RestResponse.success(serviceResponse.getResult());
@@ -275,6 +281,12 @@ public class ClerkController extends DownloadUtils {
     public RestResponse countClerk(@RequestBody ClerkSearchDTO clerkSearchDTO) {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         clerkSearchDTO.setEnterpriseId(enterpriseId);
+        if (clerkSearchDTO.getSearchType() == 2) {
+            // 如果是查询门店 查询参数其实是storeSearch
+            String search = clerkSearchDTO.getSearch();
+            clerkSearchDTO.setStoreSearch(search);
+            clerkSearchDTO.setSearch(null);
+        }
         clerkSearchDTO.setStatus(1);
         ServiceResponse serviceResponse = clerkApiService.getTotalClerk(enterpriseId, clerkSearchDTO);
         if (serviceResponse.isSuccess()) {