Merge remote-tracking branch 'origin/developer' into developer

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

@@ -87,7 +87,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         return ServiceResponse.success();
     }
 
-    private Map<String, String> getApiFieldMap(Integer enterpriseId, Integer regionId) {
+    public Map<String, String> getApiFieldMap(Integer enterpriseId, Integer regionId) {
         ServiceResponse<List<ApiFieldDTO>> result = apiFieldApiService.listApiField(2, enterpriseId, Long.parseLong(regionId.toString()));
         if (result.isSuccess()) {
             List<ApiFieldDTO> list = result.getResult();
@@ -239,6 +239,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
                 List<StoreBusinessTimeDTO> businessTimeResultList = new ArrayList<>();
                 for (BusinessTimeOpenDTO businessTimeOpenDTO : businessTimeList) {
                     StoreBusinessTimeDTO businessTimeDTO = new StoreBusinessTimeDTO();
+                    businessTimeDTO.setWeekday(businessTimeOpenDTO.getWeekday());
                     businessTimeDTO.setOpenTime(DateUtil.strToDate(businessTimeOpenDTO.getOpenTime(), DateUtil.FORMAT_MINUTE_TIME));
                     businessTimeDTO.setCloseTime(DateUtil.strToDate(businessTimeOpenDTO.getCloseTime(), DateUtil.FORMAT_MINUTE_TIME));
                     businessTimeResultList.add(businessTimeDTO);
@@ -256,6 +257,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
             for (String imageUrl : photoList) {
                 StorePhotoDTO storePhotoDTO = new StorePhotoDTO();
                 storePhotoDTO.setImageUrl(imageUrl);
+                photoResultList.add(storePhotoDTO);
             }
             storeDTO.setPhotoList(photoResultList);
         }
@@ -307,7 +309,11 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
 
         storeDTO.setReason(StoreLogReasonEnum.EXTERNAL.getCode());
         storeDTO.setCreateType(CreateTypeEnum.API.getCode());
+        if (storeDTO.getStoreExtendList() == null) {
+            storeDTO.setStoreExtendList(Collections.emptyList());
+        }
         // 保存门店
+//        return null;
         ServiceResponse<Integer> serviceResponse = storeApiService.saveOrUpdate(storeDTO);
         if (!serviceResponse.isSuccess()) {
             return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -329,7 +335,7 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         if (storeOpenDTO.getRegionId() == null) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "门店域不能为空");
         }
-        TabStore oldStore = this.storeService.getByStoreCodeAndRegionId(storeOpenDTO.getEnterpriseId(), storeOpenDTO.getRegionId(), storeOpenDTO.getStoreCode());
+        TabStore oldStore = this.storeService.getByStoreCodeAndRegionId(enterpriseId, storeOpenDTO.getRegionId(), storeOpenDTO.getStoreCode());
         if (oldStore != null) {
             storeOpenDTO.setStoreId(oldStore.getStoreId());
         } else {

gic-store-service/src/main/java/com/gic/store/utils/field/FieldBase.java

@@ -49,7 +49,7 @@ public class FieldBase {
     }
 
     public String validate(String value){
-        if (getIsMust() && (StringUtils.isNotBlank(value))) {
+        if (getIsMust() && (StringUtils.isBlank(value))) {
             return "不能为空";
         }else {
             return null;