提交门店

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -30,11 +31,12 @@ public class StoreBusinessTimeServiceImpl implements StoreBusinessTimeService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void editStoreBusinessTime(Integer enterpriseId, Integer storeInfoId, List<StoreBusinessTimeDTO> businessTimeList, List<Integer> delBusinessTimes) {
-        if (CollectionUtils.isNotEmpty(delBusinessTimes)) {
-            for (Integer delId : delBusinessTimes) {
-                tabStoreBusinessTimeMapper.deleteByPrimaryKey(delId);
-            }
-        }
+//        if (CollectionUtils.isNotEmpty(delBusinessTimes)) {
+//            for (Integer delId : delBusinessTimes) {
+//                tabStoreBusinessTimeMapper.deleteByPrimaryKey(delId);
+//            }
+//        }
+        tabStoreBusinessTimeMapper.deleteBystoreInfoIds(enterpriseId, Collections.singletonList(storeInfoId));
         if (CollectionUtils.isNotEmpty(businessTimeList)) {
             for (StoreBusinessTimeDTO storeBusinessTimeDTO : businessTimeList) {
                 if (StringUtils.isNotBlank(storeBusinessTimeDTO.getWeekday())) {

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

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -26,14 +27,17 @@ public class StorePhotoServiceImpl implements StorePhotoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void editStoreImage(Integer enterpriseId, Integer storeId, List<StorePhotoDTO> photoList, List<Integer> delPhotos) {
-        if (CollectionUtils.isNotEmpty(delPhotos)) {
-            for (Integer delId : delPhotos) {
-                TabStorePhoto storePhoto = new TabStorePhoto();
-                storePhoto.setStorePhotoId(delId);
-                storePhoto.setStatus(GlobalInfo.DATA_STATUS_DELETE);
-                tabStorePhotoMapper.updateByPrimaryKeySelective(storePhoto);
-            }
-        }
+//        if (CollectionUtils.isNotEmpty(delPhotos)) {
+//            for (Integer delId : delPhotos) {
+//                TabStorePhoto storePhoto = new TabStorePhoto();
+//                storePhoto.setStorePhotoId(delId);
+//                storePhoto.setStatus(GlobalInfo.DATA_STATUS_DELETE);
+//                tabStorePhotoMapper.updateByPrimaryKeySelective(storePhoto);
+//            }
+//        }
+        // 删除老的
+        tabStorePhotoMapper.deleteBystoreInfoIds(enterpriseId, Collections.singletonList(storeId));
+
         if (CollectionUtils.isNotEmpty(photoList)) {
             for (int i = 0; i < photoList.size(); i++) {
                 StorePhotoDTO storePhotoDTO = photoList.get(i);

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

@@ -374,11 +374,11 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
         if (!hasAuth(appId, enterpriseId, null, regionId)) {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "没有门店权限");
         }
-
-        ServiceResponse<Page<StoreDTO>> serviceResponse = this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
-        if (!serviceResponse.isSuccess()) {
-            return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        String storeIds = getStoreIds(appId, enterpriseId, regionId).toString();
+        if (StringUtils.isBlank(storeIds)) {
+            return ServiceResponse.success(JSON.toJSONString(new Page()));
         }
+        storeSearchDTO.setStoreIds(storeIds);
 
         if (pageNum == null) {
             pageNum = 1;
@@ -387,6 +387,10 @@ public class StoreOpenApiServiceImpl implements StoreOpenApiService {
             pageSize = 20;
         }
 
+        ServiceResponse<Page<StoreDTO>> serviceResponse = this.storeApiService.listStore(storeSearchDTO, pageNum, pageSize);
+        if (!serviceResponse.isSuccess()) {
+            return EnterpriseServiceResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+        }
         Page<StoreDTO> page = serviceResponse.getResult();
         return ServiceResponse.success(JSON.toJSONString(page));
     }