Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-store into developer

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

@@ -72,6 +72,7 @@ public class ClerkDTO implements Serializable {
     private Integer operatorId;
     private String operatorName;
     private String storeName;
+    private String haobanStatusName;
 
 
     public Integer getClerkId() {
@@ -201,4 +202,12 @@ public class ClerkDTO implements Serializable {
     public void setHaobanStatus(Integer haobanStatus) {
         this.haobanStatus = haobanStatus;
     }
+
+    public void setHaobanStatusName(String haobanStatusName) {
+        this.haobanStatusName = haobanStatusName;
+    }
+
+    public String getHaobanStatusName() {
+        return haobanStatusName;
+    }
 }

gic-store-service/src/main/java/com/gic/store/service/outer/impl/ClerkApiServiceImpl.java

@@ -181,12 +181,11 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         //         查询条件对应的storeId
         String storeIdByClerkSearch;
         if (StringUtils.isNotBlank(clerkSearchDTO.getSearch())) {
-            List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId,
-                    clerkSearchDTO.getSearch());
+            List<Integer> storeInfoIdsBySearch = clerkService.getStoreInfoIdsBySearch(enterpriseId, null);
             if (CollectionUtils.isEmpty(groupIds) || CollectionUtils.isEmpty(storeInfoIdsBySearch)) {
                 storeIdByClerkSearch = "";
             } else {
-                storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, clerkSearchDTO.getSearch());
+                storeIdByClerkSearch = getStoreIdByStoreInfoIds(storeInfoIdsBySearch, null);
             }
         } else {
             storeIdByClerkSearch = "";
@@ -291,7 +290,7 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         storeSearchDTO.setStoreGroupId(clerkSearchDTO.getStoreGroupId());
         storeSearchDTO.setSearchJson(clerkSearchDTO.getSelectJson());
         storeSearchDTO.setStoreIds(clerkSearchDTO.getStoreIds());
-        storeSearchDTO.setSearch(clerkSearchDTO.getSearch());
+//        storeSearchDTO.setSearch(clerkSearchDTO.getSearch());
 
         return storeApiService.listStore(storeSearchDTO, pageNum, pageSize,
                 "storeId,storeName,storeCode,storeInfoId,ownType");

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

@@ -133,6 +133,7 @@ public class ClerkController extends DownloadUtils {
                         List<ClerkDTO> clerkList = clerkStoreListDTO.getClerkList();
                         for (ClerkDTO clerkDTO : clerkList) {
                             clerkDTO.setStoreName(clerkStoreListDTO.getStoreName());
+                            clerkDTO.setHaobanStatusName(clerkDTO.getHaobanStatus() == null ? null : (clerkDTO.getHaobanStatus() == 1 ? "已绑定" : "未绑定"));
                         }
                         clerkDTOS.addAll(clerkList);
                     }
@@ -222,7 +223,7 @@ public class ClerkController extends DownloadUtils {
         clerkDTO.setOperatorName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         ServiceResponse serviceResponse = clerkApiService.saveOrUpdate(clerkDTO);
         if (serviceResponse.isSuccess()) {
-            LogUtils.createLog((clerkQO.getClerkId() == null ? "新增" : "修改") + "导购", clerkQO.getClerkName());
+            LogUtils.createLog((clerkQO.getClerkId() == null ? "新增" : "编辑") + "导购", clerkQO.getClerkName());
             return RestResponse.success(serviceResponse.getResult());
         } else {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -302,7 +303,7 @@ public class ClerkController extends DownloadUtils {
         clerkName("clerkName", "店员名称", 0),
         positionName("positionName", "职位", 0),
         phoneNumber("phoneNumber", "手机号", 1),
-        haobanStatus("haobanStatus", "好办状态", 0);
+        haobanStatusName("haobanStatusName", "好办状态", 0);
         ;
 
         private String fieldCode;

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

@@ -125,6 +125,8 @@ public class ClerkImportController {
                         return RestResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "总列数与模板不一致");
                     }
                     clerkImportApiService.delClerkTmp(enterpriseId);
+                    int logCount = 0;
+                    StringBuilder sb = new StringBuilder();
                     for (Map<Integer, String> row : data) {
                         ClerkTmpDTO bean = this.validateData(row, enterpriseId);
                         try {
@@ -136,6 +138,10 @@ public class ClerkImportController {
                         } catch (Exception e) {
                             logger.warn(e);
                         }
+                        if (logCount > 3) {
+                            sb.append(bean.getStoreName()).append(",");
+                        }
+                        logCount++;
                     }
 
                     if (clerkImportApiService.hasImportingClerk(enterpriseId).getResult()) {
@@ -145,6 +151,11 @@ public class ClerkImportController {
                             logger.warn("队列错误, {}", r);
                             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "网络错误");
                         }
+                        if (sb.length() > 0 && logCount > 0) {
+                            sb.deleteCharAt(sb.length() - 1);
+                            sb.append("等").append(logCount).append("名导购");
+                        }
+                        LogUtils.createLog("批量导入", sb.toString());
                     } else {
                         Page page = clerkImportApiService.listClerkTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
                         Map<Object, Object> result = new HashMap<>(8);

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

@@ -122,7 +122,7 @@ public class StoreController extends DownloadUtils {
         storeDTO.setOperatorName(UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         if (serviceResponse.isSuccess()) {
-            LogUtils.createLog((storeQO.getStoreId() == null ? "新增" : "修改") + "门店", storeQO.getStoreName());
+            LogUtils.createLog((storeQO.getStoreId() == null ? "新增" : "编辑") + "门店", storeQO.getStoreName());
             return RestResponse.success(serviceResponse.getResult());
         } else {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -302,6 +302,16 @@ public class StoreController extends DownloadUtils {
         }
         ServiceResponse response = this.storeApiService.bulkUpdateStore(storeIds, value, enterpriseId, type, UserDetailUtils.getUserDetail().getUserId(), UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         if (response.isSuccess()) {
+            StoreSearchDTO storeSearchDTO = new StoreSearchDTO();
+            List<StoreDTO> storeList = this.storeApiService.listStore(storeSearchDTO, 1, 3).getResult().getResult();
+            if (CollectionUtils.isNotEmpty(storeList)) {
+                String storeName = storeList.stream().map(StoreDTO::getStoreName).reduce((x, y) -> x + "," + y).get();
+                String[] storeArr = storeIds.split(",");
+                if (storeArr.length > 3) {
+                    storeName += "等" + storeArr.length + "家门店";
+                }
+                LogUtils.createLog(type == 1 ? "修改启用状态" : "批量编辑", storeName);
+            }
             return RestResponse.success();
         }
         return EnterpriseRestResponse.failure(response);
@@ -445,6 +455,11 @@ public class StoreController extends DownloadUtils {
         logger.info("transfer-store-member:{}", JSON.toJSONString(storeBatchUpdateDTO));
         ServiceResponse<Void> response = this.storeUpdateApiService.storeBatchUpdate(storeBatchUpdateDTO);
         logger.info("transfer-store-member-result:{}", JSON.toJSONString(response));
+
+        StoreDTO storeDTO = storeApiService.getStoreById(UserDetailUtils.getUserDetail().getEnterpriseId(), storeId).getResult();
+        if (storeDTO != null) {
+            LogUtils.createLog("会员处理", storeDTO.getStoreName());
+        }
         return EnterpriseRestResponse.failure(response);
     }
 

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

@@ -147,6 +147,8 @@ public class StoreImportController {
                     //重置临时表数据
                     storeImportApiService.delStoreTmp(enterpriseId);
                     //批量插入数据到门店临时表，用于队列导入到门店表
+                    int logCount = 0;
+                    StringBuilder sb = new StringBuilder();
                     for (Map<Integer, String> row : data) {
                         StoreTmpDTO bean = this.validateData(row, enterpriseId, storeRegion.getRegionId(), isReplace);
                         bean.setRegionId(storeRegion.getRegionId());
@@ -160,6 +162,10 @@ public class StoreImportController {
                         } catch (Exception e) {
                             logger.warn(e);
                         }
+                        if (logCount > 3) {
+                            sb.append(bean.getStoreName()).append(",");
+                        }
+                        logCount++;
                     }
 
                     if (storeImportApiService.hasImportingStore(enterpriseId).getResult()) {
@@ -171,6 +177,11 @@ public class StoreImportController {
                             logger.warn("队列错误, {}", r);
                             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "网络错误");
                         }
+                        if (sb.length() > 0 && logCount > 0) {
+                            sb.deleteCharAt(sb.length() - 1);
+                            sb.append("等").append(logCount).append("家门店");
+                        }
+                        LogUtils.createLog("批量导入", sb.toString());
                     } else {
                         Page page = storeImportApiService.listStoreTmp(enterpriseId, false, pageQO.getCurrentPage(), pageQO.getPageSize()).getResult();
                         Map<Object, Object> result = new HashMap<>(8);
@@ -191,7 +202,6 @@ public class StoreImportController {
         } else {
             return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "选择xlsx格式文件上传");
         }
-        LogUtils.createLog("导入门店", "门店");
         return RestResponse.success();
     }