|
@@ -1,21 +1,21 @@
|
|
package shop.alien.store.controller;
|
|
package shop.alien.store.controller;
|
|
|
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
-import org.springframework.util.CollectionUtils;
|
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import shop.alien.entity.result.R;
|
|
import shop.alien.entity.result.R;
|
|
import shop.alien.entity.store.StoreBusinessInfo;
|
|
import shop.alien.entity.store.StoreBusinessInfo;
|
|
-import shop.alien.entity.store.vo.StoreBusinessInfoVo;
|
|
|
|
import shop.alien.mapper.StoreBusinessInfoMapper;
|
|
import shop.alien.mapper.StoreBusinessInfoMapper;
|
|
import shop.alien.store.service.StoreBusinessInfoService;
|
|
import shop.alien.store.service.StoreBusinessInfoService;
|
|
-
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Optional;
|
|
import java.util.Optional;
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -79,11 +79,13 @@ public class StoreBusinessInfoController {
|
|
}
|
|
}
|
|
|
|
|
|
if (!toSave.isEmpty()) {
|
|
if (!toSave.isEmpty()) {
|
|
- businessInfoList.stream().forEach(str -> {
|
|
|
|
- LambdaQueryWrapper<StoreBusinessInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
- lambdaQueryWrapper.eq(StoreBusinessInfo::getStoreId,str.getStoreId());
|
|
|
|
- storeBusinessInfoService.remove(lambdaQueryWrapper);
|
|
|
|
- });
|
|
|
|
|
|
+ //清除该店铺原始营业数据
|
|
|
|
+ Optional<Integer> storeId = businessInfoList.stream().map(StoreBusinessInfo::getStoreId).findFirst();
|
|
|
|
+ int value = storeId.orElse(0);
|
|
|
|
+ LambdaUpdateWrapper<StoreBusinessInfo> lambdaQueryWrapper = new LambdaUpdateWrapper<>();
|
|
|
|
+ lambdaQueryWrapper.eq(StoreBusinessInfo::getStoreId,value);
|
|
|
|
+ lambdaQueryWrapper.set(StoreBusinessInfo::getDeleteFlag,1);
|
|
|
|
+ storeBusinessInfoMapper.update(null,lambdaQueryWrapper);
|
|
flag = storeBusinessInfoService.saveBatch(toSave); // 批量保存
|
|
flag = storeBusinessInfoService.saveBatch(toSave); // 批量保存
|
|
}
|
|
}
|
|
if(!toUpdate.isEmpty()){
|
|
if(!toUpdate.isEmpty()){
|