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/StoreInfoDTO.java

@@ -51,6 +51,8 @@ public class StoreInfoDTO implements Serializable {
 
     private String storeBrandNames;
 
+    private String storeBrands;
+
     /**
      * 地区id
      */
@@ -104,6 +106,16 @@ public class StoreInfoDTO implements Serializable {
     private Integer createType;
     private List<StoreExtendDTO> storeExtendList;
     private Long indexId;
+    private String c1;
+    private String c2;
+    private String c3;
+    private String c4;
+    private String c5;
+    private String c6;
+    private String c7;
+    private String c8;
+    private String c9;
+    private String c10;
 
     public Integer getStoreInfoId() {
         return storeInfoId;
@@ -360,4 +372,93 @@ public class StoreInfoDTO implements Serializable {
     public void setDistance(Double distance) {
         this.distance = distance;
     }
+
+    public String getStoreBrands() {
+        return storeBrands;
+    }
+
+    public void setStoreBrands(String storeBrands) {
+        this.storeBrands = storeBrands;
+        this.storeBrandNames = storeBrands;
+    }
+
+    public String getC1() {
+        return c1;
+    }
+
+    public void setC1(String c1) {
+        this.c1 = c1;
+    }
+
+    public String getC2() {
+        return c2;
+    }
+
+    public void setC2(String c2) {
+        this.c2 = c2;
+    }
+
+    public String getC3() {
+        return c3;
+    }
+
+    public void setC3(String c3) {
+        this.c3 = c3;
+    }
+
+    public String getC4() {
+        return c4;
+    }
+
+    public void setC4(String c4) {
+        this.c4 = c4;
+    }
+
+    public String getC5() {
+        return c5;
+    }
+
+    public void setC5(String c5) {
+        this.c5 = c5;
+    }
+
+    public String getC6() {
+        return c6;
+    }
+
+    public void setC6(String c6) {
+        this.c6 = c6;
+    }
+
+    public String getC7() {
+        return c7;
+    }
+
+    public void setC7(String c7) {
+        this.c7 = c7;
+    }
+
+    public String getC8() {
+        return c8;
+    }
+
+    public void setC8(String c8) {
+        this.c8 = c8;
+    }
+
+    public String getC9() {
+        return c9;
+    }
+
+    public void setC9(String c9) {
+        this.c9 = c9;
+    }
+
+    public String getC10() {
+        return c10;
+    }
+
+    public void setC10(String c10) {
+        this.c10 = c10;
+    }
 }

gic-store-api/src/main/java/com/gic/store/service/ClerkApiService.java

@@ -76,4 +76,8 @@ public interface ClerkApiService {
      */
     ServiceResponse<List<ClerkDTO>> listClerkByIds(Integer enterpriseId, String clerkIds);
 
+    ServiceResponse<List<ClerkDTO>> listClerkByStoreId(Integer enterpriseId, Integer storeId, String search);
+
+    ServiceResponse<ClerkDTO> getClerkById(Integer enterpriseId, Integer clerkId);
+
 }

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

@@ -214,4 +214,22 @@ public class ClerkApiServiceImpl implements ClerkApiService {
         return EnterpriseServiceResponse.success(clerkDTOList);
     }
 
+    @Override
+    public ServiceResponse<List<ClerkDTO>> listClerkByStoreId(Integer enterpriseId, Integer storeId, String search) {
+        ServiceResponse<StoreDTO> response = this.storeApiService.getStoreById(enterpriseId, storeId);
+        if(response.isSuccess() && response.getResult() != null){
+            List<Integer> storeInfoIds = new ArrayList<>();
+            storeInfoIds.add(response.getResult().getStoreInfoId());
+            List<TabClerk> clerkList = this.clerkService.listClerkByStoreInfoId(enterpriseId, storeInfoIds, search);
+            return ServiceResponse.success(EntityUtil.changeEntityListByJSON(ClerkDTO.class, clerkList));
+        }
+        return ServiceResponse.success();
+    }
+
+    @Override
+    public ServiceResponse<ClerkDTO> getClerkById(Integer enterpriseId, Integer clerkId) {
+        TabClerk tabClerk = this.clerkService.getById(clerkId);
+        return ServiceResponse.success(EntityUtil.changeEntityByJSON(ClerkDTO.class, tabClerk));
+    }
+
 }
\ No newline at end of file

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

@@ -195,7 +195,7 @@ public class StoreDictApiServiceImpl implements StoreDictApiService {
                 for(int i=1; i<=10; i++){
                     Object obj = RedisUtil.getCache(keyc+"c"+i);
                     if(obj == null){
-                        RedisUtil.setCache(keyc+i, value);
+                        RedisUtil.setCache(keyc+"c"+i, value);
                         RedisUtil.setCache(key, "c"+i);
                         break;
                     }

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

@@ -75,7 +75,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             if (StringUtils.isBlank(region)) {
                 continue;
             }
-            if (!NumberUtils.isNumber(region)) {
+            if (!StringUtils.isNumeric(region)) {
                 return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域有误");
             }
             if (storeRegionService.getById(storeFieldDTO.getEnterpriseId(), Integer.parseInt(region)) == null) {

gic-store-service/src/main/resources/mapper/TabStoreFieldMapper.xml

@@ -352,7 +352,7 @@
   <select id="countStoreField" resultType="int">
     select
     count(DISTINCT a.store_field_id)
-    from tab_store_field_region_rel a
+    from tab_store_field a
     LEFT JOIN tab_store_field_rel b
     on a.store_field_id = b.store_field_id
     and b.status = 1

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

@@ -158,7 +158,7 @@ public class StoreDictController {
     public RestResponse listStoreFieldRelevance(){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         List<StoreDictVO> systemField = new ArrayList<>();
-        systemField.add(new StoreDictVO(StoreESFieldsEnum.STORENAME.getDesc(), StoreESFieldsEnum.STORENAME.getField()));
+        /*systemField.add(new StoreDictVO(StoreESFieldsEnum.STORENAME.getDesc(), StoreESFieldsEnum.STORENAME.getField()));
         systemField.add(new StoreDictVO(StoreESFieldsEnum.STORECODE.getDesc(), StoreESFieldsEnum.STORECODE.getField()));
         systemField.add(new StoreDictVO(StoreESFieldsEnum.REGIONID.getDesc(), StoreESFieldsEnum.REGIONID.getField()));
         systemField.add(new StoreDictVO(StoreESFieldsEnum.STOREGROUPID.getDesc(), StoreESFieldsEnum.STOREGROUPID.getField()));
@@ -168,7 +168,7 @@ public class StoreDictController {
         systemField.add(new StoreDictVO(StoreESFieldsEnum.COMPLETESTATUS.getDesc(), StoreESFieldsEnum.COMPLETESTATUS.getField()));
         systemField.add(new StoreDictVO(StoreESFieldsEnum.CREATETYPE.getDesc(), StoreESFieldsEnum.CREATETYPE.getField()));
         systemField.add(new StoreDictVO(StoreESFieldsEnum.STORETYPE.getDesc(), StoreESFieldsEnum.STORETYPE.getField()));
-        systemField.add(new StoreDictVO(StoreESFieldsEnum.ERPSTATUS.getDesc(), StoreESFieldsEnum.ERPSTATUS.getField()));
+        systemField.add(new StoreDictVO(StoreESFieldsEnum.ERPSTATUS.getDesc(), StoreESFieldsEnum.ERPSTATUS.getField()));*/
         ServiceResponse serviceResponse = this.storeDictApiService.listStoreField(enterpriseId);
         if(serviceResponse.isSuccess()){
             List<StoreDictVO> customFields = EntityUtil.changeEntityListByJSON(StoreDictVO.class, serviceResponse.getResult());

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

@@ -107,6 +107,12 @@ public class StoreFieldController {
         String[] regionArr = regions.split(",");
         StringBuilder region = new StringBuilder("_");
         for (String str : regionArr) {
+            if (StringUtils.isBlank(str)) {
+                continue;
+            }
+            if (!StringUtils.isNumeric(str)) {
+                return RestResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域有误");
+            }
             region.append(Integer.parseInt(str));
             region.append("_");
         }

gic-store-web/src/main/java/com/gic/store/web/qo/store/StoreExportQO.java

+package com.gic.store.web.qo.store;
+
+import com.gic.store.dto.StoreSearchDTO;
+
+import java.util.List;
+
+public class StoreExportQO extends StoreSearchDTO {
+    private String fileName;
+    private Integer excelExtension;
+    private List<String> fieldCodeList;
+    private Integer dataType;
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public Integer getExcelExtension() {
+        return excelExtension;
+    }
+
+    public void setExcelExtension(Integer excelExtension) {
+        this.excelExtension = excelExtension;
+    }
+
+    public List<String> getFieldCodeList() {
+        return fieldCodeList;
+    }
+
+    public void setFieldCodeList(List<String> fieldCodeList) {
+        this.fieldCodeList = fieldCodeList;
+    }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+}

gic-store-web/src/main/java/com/gic/store/web/vo/StoreExportFieldVO.java

+package com.gic.store.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * tab_store_dict
+ */
+public class StoreExportFieldVO implements Serializable {
+    private String value;
+
+    private String key;
+
+    public StoreExportFieldVO(){
+
+    }
+    public StoreExportFieldVO(String value, String key){
+        this.value = value;
+        this.key = key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+}
\ No newline at end of file