门店控件增加接口

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/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));
                 }
             }