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

完成部分TODO修改bug

Browse Source
This commit is contained in:
shuo.wang
2024-05-09 14:18:44 +08:00
parent 8d3908be58
commit 64119c59ee
13 changed files with 102 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ import com.cool.store.response.FitmentResponse;
import com.cool.store.response.ResponseResult;
import com.cool.store.response.ThreeSignResponse;
import com.cool.store.service.DecorationService;
import com.cool.store.service.PreparationService;
import com.cool.store.vo.Fitment.DecorationModelVO;
import com.cool.store.vo.Fitment.DesignInfoVo;
import com.cool.store.vo.LinePayVO;
@@ -39,10 +40,12 @@ import java.util.List;
public class PCDecorationController {
@Resource
private DecorationService decorationService;
@ApiOperation("获取新店装修子阶段信息")
@GetMapping("/getFitmentSub")
public ResponseResult<FitmentResponse> getFitmentSub(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getFitmentSub(shopId));
@Resource
private PreparationService preparationService;
@ApiOperation("获取新店装修flush")
@GetMapping("/flush")
public ResponseResult<Boolean> getFitmentSub(@RequestParam Long shopId) {
return ResponseResult.success(preparationService.decorationFlush(shopId));
}
@ApiOperation("获取设计子阶段信息")
@GetMapping("/designSub")

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

@@ -42,11 +42,6 @@ public class MiniDecorationController {
private DecorationService decorationService;
@Resource
private AssessmentTemplateService assessmentTemplateService;
@ApiOperation("获取新店装修下阶段的数据/flush")
@GetMapping("/getFitmentSub")
public ResponseResult<FitmentResponse> getFitmentSub(@RequestParam Long shopId) {
return ResponseResult.success(decorationService.getFitmentSub(shopId));
}
@ApiOperation("获取设计阶段子阶段信息")
@GetMapping("/designSub")
public ResponseResult<DesignInfoVo> getDesign(@RequestParam Long shopId){

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

@@ -212,7 +212,6 @@ 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);
}