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

@@ -2,11 +2,22 @@ package com.gic.store.dto;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Set;
 
 public class StoreBulkOrderDTO implements Serializable {
     private List<StoreOrderDTO> store;
     private List<StoreOrderDTO> clerk;
 
+    private Long batchId;
+    /**
+     * 状态（1：成功，2：处理中，3：失败）
+     */
+    private Integer status;
+    /**
+     * 通知类型（5：门店导购创建结果）
+     */
+    private Integer type;
+
     public List<StoreOrderDTO> getStore() {
         return store;
     }
@@ -22,4 +33,29 @@ public class StoreBulkOrderDTO implements Serializable {
     public void setClerk(List<StoreOrderDTO> clerk) {
         this.clerk = clerk;
     }
+
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Long getBatchId() {
+        return batchId;
+    }
+
+    public void setBatchId(Long batchId) {
+        this.batchId = batchId;
+    }
+
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
 }

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

@@ -1000,39 +1000,55 @@ public class StoreApiServiceImpl implements StoreApiService {
     @Override
     public ServiceResponse<Void> saveStoreAndClerkForBulkOrder(String params) {
         logger.info("saveStoreAndClerkForBulkOrder:{}", params);
-        StoreBulkOrderDTO storeBulkOrderDTO = JSON.parseObject(params, StoreBulkOrderDTO.class);
-        if(CollectionUtils.isNotEmpty(storeBulkOrderDTO.getStore())){
-            for(StoreOrderDTO storeOrderDTO : storeBulkOrderDTO.getStore()){
-                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<StoreDTO> response = this.saveOrUpdate(storeDTO);
-                logger.info("批量处理门店结果：{}", JSON.toJSONString(response));
+        Map<String, Object> message = new HashMap<>();
+        message.put("type", 5);
+        try{
+            StoreBulkOrderDTO storeBulkOrderDTO = JSON.parseObject(params, StoreBulkOrderDTO.class);
+            message.put("jobId", storeBulkOrderDTO.getBatchId());
+            if(CollectionUtils.isNotEmpty(storeBulkOrderDTO.getStore())){
+                for(StoreOrderDTO storeOrderDTO : storeBulkOrderDTO.getStore()){
+                    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<StoreDTO> response = this.saveOrUpdate(storeDTO);
+                    logger.info("批量处理门店结果：{}", JSON.toJSONString(response));
+                }
             }
-        }
-        if(CollectionUtils.isNotEmpty(storeBulkOrderDTO.getClerk())){
-            for(StoreOrderDTO storeOrderDTO : storeBulkOrderDTO.getClerk()){
-                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));
+            if(CollectionUtils.isNotEmpty(storeBulkOrderDTO.getClerk())){
+                for(StoreOrderDTO storeOrderDTO : storeBulkOrderDTO.getClerk()){
+                    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));
+                    }
                 }
             }
+            message.put("status", 1);
+        }catch (Exception e){
+            message.put("status", 3);
+            message.put("message", e.getMessage());
+            logger.warn("exception:", e);
+        }
+        GicMQClient client = GICMQClientUtil.getClientInstance();
+        try {
+            client.sendMessage("batchJobNotify", JSON.toJSONString(message));
+        } catch (Exception e) {
+            logger.warn("发送消息路由失败", e);
         }
         return ServiceResponse.success();
     }