Merge branch 'developer' into 'master'

Developer

See merge request !6

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

@@ -35,6 +35,8 @@ public interface ClerkApiService {
     */
     ServiceResponse<Integer> saveClerkForOrder(String clerkName, String clerkCode, Integer storeId, Integer enterpriseId, String orderNum);
 
+    ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String orderNum);
+
     
     /** @Description: 通过导购code查询导购
      * @author taogs
@@ -43,10 +45,22 @@ public interface ClerkApiService {
      * @return 
     */
     ServiceResponse<ClerkDTO> getClerkByCode(Integer enterpriseId, String clerkCode, Integer storeId);
+
+    /**
+     * @Title: getClerkByCodeAndStoreInfoId
+     * @Description:
+     * @author zhiwj
+     * @param enterpriseId
+     * @param clerkCode
+     * @param storeInfoId
+     * @return com.gic.api.base.commons.ServiceResponse<com.gic.store.dto.ClerkDTO>
+     * @throws
+     */
+    ServiceResponse<ClerkDTO> getClerkByCodeAndStoreInfoId(Integer enterpriseId, String clerkCode, Integer storeInfoId);
     /**
      * @Title: listClerk
      * @Description: 导购列表
-     * @author zhiwj 
+     * @author zhiwj
      * @param enterpriseId 企业id
      * @param clerkSearchDTO
      * @param pageNum

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

@@ -22,7 +22,7 @@ public interface StoreApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
      * @throws
      */
-    ServiceResponse<Integer> saveOrUpdate(StoreDTO storeDTO);
+    ServiceResponse<StoreDTO> saveOrUpdate(StoreDTO storeDTO);
 
     /** @Description: 通过订单创建门店
      * @author taogs

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

@@ -125,23 +125,46 @@ public class ClerkApiServiceImpl implements ClerkApiService {
     }
 
     @Override
+    public ServiceResponse<Integer> saveClerkByStoreInfoIdForOrder(String clerkName, String clerkCode, Integer storeInfoId, Integer enterpriseId, String orderNum) {
+        Integer storeId = this.storeService.getStoreIdByStoreInfoId(enterpriseId, storeInfoId);
+        if (storeId != null) {
+            ClerkDTO clerkDTO = new ClerkDTO();
+            clerkDTO.setClerkName(clerkName);
+            clerkDTO.setClerkCode(clerkCode);
+            clerkDTO.setEnterpriseId(enterpriseId);
+            clerkDTO.setStoreInfoId(storeInfoId);
+            clerkDTO.setReason(ClerkLogReasonEnum.ORDER.getCode());
+            clerkDTO.setRemark("订单号:" + orderNum);
+            ServiceResponse serviceResponse = this.saveOrUpdate(clerkDTO);
+            return serviceResponse;
+        } else {
+            logger.warn("门店不存在 enterpriseId:{}, storeInfoId:{}", enterpriseId, storeInfoId);
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
+        }
+    }
+
+    @Override
     public ServiceResponse<ClerkDTO> getClerkByCode(Integer enterpriseId, String clerkCode, Integer storeId) {
         ServiceResponse<StoreDTO> storeResponse = storeApiService.getStoreById(enterpriseId, storeId);
         if (storeResponse.getResult() != null) {
             StoreDTO store = storeResponse.getResult();
-
-            TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, store.getStoreInfoId());
-            if (clerk != null) {
-                return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(ClerkDTO.class, clerk));
-            } else {
-                return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
-            }
+            return getClerkByCodeAndStoreInfoId(enterpriseId, clerkCode, storeId);
         } else {
             logger.warn("门店不存在 enterpriseId:{}, storeId:{}", enterpriseId, storeId);
             return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS.getCode(), "门店不存在");
         }
     }
 
+    @Override
+    public ServiceResponse<ClerkDTO> getClerkByCodeAndStoreInfoId(Integer enterpriseId, String clerkCode, Integer storeInfoId) {
+        TabClerk clerk = this.clerkService.getClerkByCode(enterpriseId, clerkCode, storeInfoId);
+        if (clerk != null) {
+            return EnterpriseServiceResponse.success(EntityUtil.changeEntityByJSON(ClerkDTO.class, clerk));
+        } else {
+            return EnterpriseServiceResponse.failure(ErrorCode.NOTEXISTS);
+        }
+    }
+
     private void storeLogByAddClerk(ClerkDTO clerkDTO) {
         StoreLogDTO storeLogDTO = new StoreLogDTO();
         storeLogDTO.setEnterpriseId(clerkDTO.getEnterpriseId());

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

 package com.gic.store.service.outer.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.error.ErrorCode;
@@ -15,6 +16,8 @@ import com.gic.store.service.ProvincesService;
 import com.gic.store.service.StoreService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,6 +30,7 @@ import java.util.stream.Collectors;
 
 @Service("provincesApiService")
 public class ProvincesApiServiceImpl implements ProvincesApiService {
+    private static final Logger log = LogManager.getLogger(ProvincesApiServiceImpl.class);
     @Autowired
     private ProvincesService provincesService;
     @Autowired
@@ -61,6 +65,7 @@ public class ProvincesApiServiceImpl implements ProvincesApiService {
             List<CityDTO> list = response.getResult();
             for(CityDTO dto : list){
                 if(dto.getCityId().equals(cityId)){
+                    log.info("城市信息：{}", JSON.toJSONString(dto));
                     return ServiceResponse.success(dto);
                 }
             }

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

@@ -110,7 +110,7 @@ public class StoreApiServiceImpl implements StoreApiService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public ServiceResponse<Integer> saveOrUpdate(StoreDTO storeDTO) {
+    public ServiceResponse<StoreDTO> saveOrUpdate(StoreDTO storeDTO) {
         logger.info("storeDTO:{}", JSON.toJSONString(storeDTO));
         boolean codeValid = storeService.validateStoreCodeIsExist(storeDTO.getEnterpriseId(), storeDTO.getRegionId(), storeDTO.getStoreCode(), storeDTO.getStoreId());
         if (codeValid) {
@@ -195,7 +195,7 @@ public class StoreApiServiceImpl implements StoreApiService {
 
         // 更新缓存
         refreshCache(storeDTO.getEnterpriseId(), storeDTO.getStoreId());
-        return ServiceResponse.success(storeDTO.getStoreId());
+        return ServiceResponse.success(storeDTO);
     }
 
     @Override
@@ -206,7 +206,11 @@ public class StoreApiServiceImpl implements StoreApiService {
         storeDTO.setStoreName(storeName);
         storeDTO.setRegionId(regionId);
         storeDTO.setCreateType(CreateTypeEnum.ORDER.getCode());
-        return this.saveOrUpdate(storeDTO);
+        ServiceResponse<StoreDTO> response = this.saveOrUpdate(storeDTO);
+        if(response.isSuccess()){
+            return ServiceResponse.success(response.getResult().getStoreInfoId());
+        }
+        return EnterpriseServiceResponse.failure(response.getCode(), response.getMessage());
     }
 
     @Override
@@ -824,7 +828,7 @@ public class StoreApiServiceImpl implements StoreApiService {
         storeDTO.setCreateType(CreateTypeEnum.ERP.getCode());
         // 保存门店
 //        this.storeService.save(storeDTO);
-        ServiceResponse<Integer> serviceResponse = this.saveOrUpdate(storeDTO);
+        ServiceResponse<StoreDTO> serviceResponse = this.saveOrUpdate(storeDTO);
 
         if (!serviceResponse.isSuccess()) {
             return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -878,7 +882,7 @@ public class StoreApiServiceImpl implements StoreApiService {
                     storeDTO.setReason(storeOrderDTO.getReason());
                     storeDTO.setRemark(storeOrderDTO.getRemark());
                     storeDTO.setCreateType(storeOrderDTO.getReason());
-                    ServiceResponse<Integer> response = this.saveOrUpdate(storeDTO);
+                    ServiceResponse<StoreDTO> response = this.saveOrUpdate(storeDTO);
                     logger.info("批量处理门店结果：{}", JSON.toJSONString(response));
                 }
             }

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

@@ -321,7 +321,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         }
         // 保存门店
 //        return null;
-        ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
+        ServiceResponse<StoreDTO> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         if (!serviceResponse.isSuccess()) {
             return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
         } else {

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

@@ -289,7 +289,7 @@ public class StoreTaskServiceImpl extends AbstractTaskAllocationOperation implem
         storeDTO.setRemark("批量导入");
         storeDTO.setOperatorId(t.getOperatorId());
         storeDTO.setOperatorName(t.getOperatorName());
-        ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
+        ServiceResponse<StoreDTO> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         String msg;
         if (serviceResponse.isSuccess()) {
             msg = StoreImportEnum.SUCCESS.getCode();