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/constant/ClerkLogReasonEnum.java

@@ -11,6 +11,8 @@ public enum ClerkLogReasonEnum {
     EXTERNAL(2, "外部触发"),
     ORDER(3, "订单同步"),
     MEMBER  (4, "会员同步"),
+    BULKORDER(7, "批量同步订单"),
+    BULKMEMBER(8, "批量同步会员")
     ;
     private int code;
     private String message;

gic-store-api/src/main/java/com/gic/store/constant/StoreESFieldsEnum.java

 package com.gic.store.constant;
 
 public enum StoreESFieldsEnum {
-    STOREID("storeId", "门店"),
+    STOREID("storeId", "门店ID"),
     STOREINFOID("storeInfoId", "门店资料"),
     STORENAME("storeName", "门店名称"),
     STORECODE("storeCode", "门店代码"),

gic-store-api/src/main/java/com/gic/store/constant/StoreLogReasonEnum.java

@@ -12,7 +12,9 @@ public enum StoreLogReasonEnum {
     ORDER(3, "订单同步"),
     MEMBER(4, "会员同步"),
     SYSTEM(5, "系统配置触发"),
-    ETL(6, "ETL同步")
+    ETL(6, "ETL同步"),
+    BULKORDER(7, "批量同步订单"),
+    BULKMEMBER(8, "批量同步会员")
     ;
     private int code;
     private String message;

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

+package com.gic.store.dto;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class StoreBulkOrderDTO implements Serializable {
+    private Integer type = 1; //1门店  2导购
+    private List<StoreOrderDTO> data;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public List<StoreOrderDTO> getData() {
+        return data;
+    }
+
+    public void setData(List<StoreOrderDTO> data) {
+        this.data = data;
+    }
+}

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

+package com.gic.store.dto;
+
+import java.io.Serializable;
+
+public class StoreOrderDTO implements Serializable {
+    private Integer regionId;
+    private Integer enterpriseId;
+    private String storeCode;
+    private String storeName;
+    private String clerkCode;
+    private String clerkName;
+
+    /********订单号或者会员卡号********/
+    private String remark;
+    /****7批量同步订单  8批量同步会员*****/
+    private Integer reason;
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+
+    public Integer getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(Integer enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Integer getReason() {
+        return reason;
+    }
+
+    public void setReason(Integer reason) {
+        this.reason = reason;
+    }
+}

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

@@ -331,4 +331,13 @@ public interface StoreApiService {
      * @throws
      */
     ServiceResponse<Boolean> checkExistStore(Integer enterpriseId);
+
+    
+    /** @Description: 从队列中读取门店和导购数据写入数据库
+     * @author taogs
+     * @Date 17:03 2020/3/19
+     * @Param 
+     * @return 
+    */
+    ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params);
 }

gic-store-service/src/main/java/com/gic/store/service/impl/StoreServiceImpl.java

@@ -108,7 +108,7 @@ public class StoreServiceImpl implements StoreService {
         tabStoreInfo.setIndexId(copy.getIndexId());
         TabStore store = new TabStore();
         store.setEnterpriseId(copy.getEnterpriseId());
-        store.setOwnType(com.gic.enterprise.constants.Constants.NORMAL_STATUS);
+        store.setOwnType(StoreOwnTypeEnum.OWNER.getCode());
         store.setStatus(com.gic.enterprise.constants.Constants.NORMAL_STATUS);
         store.setStoreGroupId(copy.getStoreGroupId());
         store.setStoreInfoId(tabStoreInfo.getStoreInfoId());

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

@@ -34,6 +34,7 @@ import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.geo.GeoUtils;
 import org.redisson.api.RKeys;
 import org.redisson.api.RedissonClient;
+import org.reflections.Store;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -96,6 +97,8 @@ public class StoreApiServiceImpl implements StoreApiService {
     private StoreFieldService storeFieldService;
     @Autowired
     private StoreIndexLogService storeIndexLogService;
+    @Autowired
+    private ClerkApiService clerkApiService;
 
     private Map<String, BulkUpdateStoreStrtegy> storeStrtegyMap = new ConcurrentHashMap<>();
 
@@ -152,6 +155,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         } else {
             ServiceResponse<StoreDTO> existStore = this.getStoreById(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
             storeDTO.setStoreInfoId(existStore.getResult().getStoreInfoId());
+            storeDTO.setStatus(existStore.getResult().getStatus());
             Integer update = storeService.update(storeDTO);
             if (update == 0) {
                 return ServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), ErrorCode.NOTEXISTS.getMsg());
@@ -807,6 +811,48 @@ public class StoreApiServiceImpl implements StoreApiService {
     }
 
     @Override
+    public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
+        StoreBulkOrderDTO dto = JSON.parseObject(params, StoreBulkOrderDTO.class);
+        List<StoreOrderDTO> data = dto.getData();
+        if(CollectionUtils.isNotEmpty(data)){
+            if(dto.getType() == 1){ //门店
+                for(StoreOrderDTO storeOrderDTO : data){
+                    StoreDTO storeDTO = new StoreDTO();
+                    storeDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
+                    storeDTO.setStoreCode(storeOrderDTO.getStoreCode());
+                    storeDTO.setStoreName(storeOrderDTO.getStoreName());
+                    storeDTO.setRegionId(storeOrderDTO.getRegionId());
+                    storeDTO.setReason(storeOrderDTO.getReason());
+                    storeDTO.setRemark(storeOrderDTO.getRemark());
+                    storeDTO.setCreateType(storeOrderDTO.getReason());
+                    ServiceResponse<Integer> response = this.saveOrUpdate(storeDTO);
+                    logger.info("批量处理门店结果：{}", JSON.toJSONString(response));
+                }
+            }
+            if(dto.getType() == 2){ //导购
+                for(StoreOrderDTO storeOrderDTO : data){
+                    ServiceResponse<StoreDTO> storeResponse = this.getStoreByStoreCode(storeOrderDTO.getEnterpriseId(),
+                            storeOrderDTO.getRegionId(), storeOrderDTO.getStoreCode());
+                    if(storeResponse.isSuccess() && storeResponse.getResult() != null){
+                        StoreDTO store = storeResponse.getResult();
+                        ClerkDTO clerkDTO = new ClerkDTO();
+                        clerkDTO.setClerkName(storeOrderDTO.getClerkName());
+                        clerkDTO.setClerkCode(storeOrderDTO.getClerkCode());
+                        clerkDTO.setEnterpriseId(storeOrderDTO.getEnterpriseId());
+                        clerkDTO.setStoreInfoId(store.getStoreInfoId());
+                        clerkDTO.setReason(storeOrderDTO.getReason());
+                        clerkDTO.setRemark("订单号:" + storeOrderDTO.getRemark());
+                        clerkDTO.setStoreName(store.getStoreName());
+                        ServiceResponse serviceResponse = this.clerkApiService.saveOrUpdate(clerkDTO);
+                        logger.info("批量处理导购结果：{}", JSON.toJSONString(serviceResponse));
+                    }
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
     public ServiceResponse<StoreDTO> getStoreById(Integer enterpriseId, Integer storeId) {
         String key = Constants.STORE_KEY + enterpriseId + ":" + storeId;
 

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

@@ -462,8 +462,6 @@ public class StoreController extends DownloadUtils {
         list.add(new StoreListSourceVO(StoreESFieldsEnum.REGIONNAME.getField(), StoreESFieldsEnum.REGIONNAME.getDesc()));
         list.add(new StoreListSourceVO(StoreESFieldsEnum.ERPSTATUS.getField(), StoreESFieldsEnum.ERPSTATUS.getDesc()));
         list.add(new StoreListSourceVO(StoreESFieldsEnum.STORETYPE.getField(), StoreESFieldsEnum.STORETYPE.getDesc()));
-        list.add(new StoreListSourceVO(StoreESFieldsEnum.SCORE.getField(), StoreESFieldsEnum.SCORE.getDesc()));
-        list.add(new StoreListSourceVO(StoreESFieldsEnum.EVALUATECOUNT.getField(), StoreESFieldsEnum.EVALUATECOUNT.getDesc()));
         list.add(new StoreListSourceVO(StoreESFieldsEnum.STOREID.getField(), StoreESFieldsEnum.STOREID.getDesc(),1));
         return list;
     }