suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改订货金bug

Browse Source
This commit is contained in:
shuo.wang
2024-05-07 18:56:41 +08:00
parent 7dec4b8c47
commit 8b110068b7
13 changed files with 104 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webb/PCOpenPreparationController.java
View File

@@ -47,7 +47,7 @@ public class PCOpenPreparationController {
private OpeningOperationPlanService openingOperationPlanService;
@Resource
private AuditOpeningOperationPlanService auditOpeningOperationPlanService;
@ApiOperation("刷新")
@ApiOperation("刷新订货金状态")
@GetMapping("/flush")
public ResponseResult<Boolean> flush(@RequestParam("shopId") Long shopId) {
return ResponseResult.success(openingOperationPlanService.flush(shopId));
@@ -67,6 +67,7 @@ public class PCOpenPreparationController {
@PostMapping("/openingOperationPlan/planList")
@ApiOperation("查询运营方案列表")
public ResponseResult<PageInfo<OpeningOperationPlanListVO>> planList(@RequestBody PlanListRequest request) {
return ResponseResult.success(openingOperationPlanService.getPlanListPage(request));
}
@PostMapping("/openingOperationPlan/audit")

3
coolstore-partner-web/src/main/java/com/cool/store/controller/webc/MiniDecorationController.java
View File

@@ -64,8 +64,9 @@ public class MiniDecorationController {
@ApiOperation("获取装修款信息,和二维码")
@GetMapping("/getDecorationModel")
public ResponseResult<DecorationModelDTO> getDecorationModel(@RequestParam Long shopId){
return ResponseResult.success(decorationService.DecorationModel(shopId)) ;
return ResponseResult.success(decorationService.decorationModel(shopId)) ;
}
// TOdo 是否删除
@ApiOperation("获取装修款阶段信息")
@GetMapping("/getDecorationModeStage")
public ResponseResult<DecorationStageVO> getDecorationModeStage(@RequestParam Long shopId){

6
coolstore-partner-web/src/main/java/com/cool/store/job/XxlJobHandler.java
View File

@@ -124,6 +124,7 @@ public class XxlJobHandler {
while (hasNext) {
log.info("----查询更新订货金----");
//sql 判定传入
Page<Long> shopIdListByStageStatus = shopStageInfoDAO.getShopIdListByStageStatus(PageNum, PageSize);
if (CollectionUtils.isEmpty(shopIdListByStageStatus)) {
log.info("------今日没有待更新数据------");
@@ -135,12 +136,13 @@ public class XxlJobHandler {
for (Long shopId : map.keySet()) {
String shopCode = map.get(shopId);
try {
// TOdo 能不能一次调用
Boolean firstOrder = coolStoreStartFlowService.getFirstOrder(shopCode);
if (firstOrder == null) {
throw new ServiceException(ErrorCodeEnum.GET_FIRST_ORDER);
}
if (firstOrder.equals(Boolean.TRUE)) {
if (firstOrder) {
shopStageInfoDAO.updateShopStageAndAuditInfo(shopId, ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_151, null);
preparationService.whetherToOpenForAcceptance(shopId);
}
@@ -177,6 +179,7 @@ public class XxlJobHandler {
}
List<AcceptanceInfoDO> acceptanceInfoDOS = new ArrayList<>();
for (Long shopId : shops) {
//TODO ids查
acceptanceInfoDOS.add(acceptanceInfoDAO.selectByShopId(shopId));
}
for (AcceptanceInfoDO acceptanceInfoDO : acceptanceInfoDOS) {
@@ -214,6 +217,7 @@ public class XxlJobHandler {
LocalDate localDate = instant.atZone(zone).toLocalDate();
LocalDate datePlusFiveDays = localDate.plusDays(CommonConstants.FOUR); // 添加5天
LocalDate now = LocalDate.now();
//TODO 时间问题
if (datePlusFiveDays.equals(now)) {
shopStageInfoDAO.updateShopStageInfo(shopId,ShopSubStageStatusEnum.SHOP_SUB_STAGE_STATUS_120);
}