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

fix:十二分接口逻辑完善

Browse Source
This commit is contained in:
wangff
2025-11-20 14:31:12 +08:00
parent 13c44053c2
commit 4e5c228974
12 changed files with 79 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,8 @@ public class TpApplyController {
}
@ApiOperation("加分申请单分页查询")
@GetMapping("/rewardPage")
public ResponseResult<PageInfo<TpRewardApplyListVO> > rewardPage(TpApplyQueryRequest request) {
@PostMapping("/rewardPage")
public ResponseResult<PageInfo<TpRewardApplyListVO> > rewardPage(@RequestBody TpApplyQueryRequest request) {
request.setType(TpFormTypeEnum.REWARD.getType());
return ResponseResult.success(tpApplyService.rewardPage(request));
}
@@ -85,8 +85,8 @@ public class TpApplyController {
}
@ApiOperation("惩处申请单分页查询")
@GetMapping("/penaltyPage")
public ResponseResult<PageInfo<TpPenaltyApplyListVO> > penaltyPage(TpApplyQueryRequest request) {
@PostMapping("/penaltyPage")
public ResponseResult<PageInfo<TpPenaltyApplyListVO> > penaltyPage(@RequestBody TpApplyQueryRequest request) {
request.setIsPenalty(true);
return ResponseResult.success(tpApplyService.penaltyPage(request));
}
@@ -115,8 +115,8 @@ public class TpApplyController {
}
@ApiOperation("复议申请单分页查询")
@GetMapping("/appealPage")
public ResponseResult<PageInfo<TpAppealListVO> > appealPage(TpApplyQueryRequest request) {
@PostMapping("/appealPage")
public ResponseResult<PageInfo<TpAppealListVO> > appealPage(@RequestBody TpApplyQueryRequest request) {
request.setType(TpFormTypeEnum.APPEAL.getType());
return ResponseResult.success(tpApplyService.appealPage(request));
}

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

@@ -56,8 +56,8 @@ public class TpRuleController {
}
@ApiOperation("惩处规则分页查询")
@GetMapping("/penaltyPage")
public ResponseResult<PageInfo<TpPenaltyRuleListVO>> penaltyRulePage(TpRuleQueryRequest request) {
@PostMapping("/penaltyPage")
public ResponseResult<PageInfo<TpPenaltyRuleListVO>> penaltyRulePage(@RequestBody TpRuleQueryRequest request) {
request.setType(0);
return ResponseResult.success(tpRuleService.penaltyRulePage(request));
}
@@ -82,8 +82,8 @@ public class TpRuleController {
}
@ApiOperation("加分规则分页查询")
@GetMapping("/rewardPage")
public ResponseResult<PageInfo<TpRewardRuleDetailVO>> rewardRulePage(TpRuleQueryRequest request) {
@PostMapping("/rewardPage")
public ResponseResult<PageInfo<TpRewardRuleDetailVO>> rewardRulePage(@RequestBody TpRuleQueryRequest request) {
request.setType(1);
return ResponseResult.success(tpRuleService.rewardRulePage(request));
}

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

@@ -8,9 +8,7 @@ import com.github.pagehelper.PageInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -28,8 +26,8 @@ public class TpScoreJournalController {
private final TpScoreJournalService tpScoreJournalService;
@ApiOperation("积分流水分页查询")
@GetMapping("/page")
public ResponseResult<PageInfo<TpScoreJournalVO>> getPage(TpScoreJournalQueryRequest request) {
@PostMapping("/page")
public ResponseResult<PageInfo<TpScoreJournalVO>> getPage(@RequestBody TpScoreJournalQueryRequest request) {
return ResponseResult.success(tpScoreJournalService.getPage(request));
}
}

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

@@ -58,8 +58,8 @@ public class MiniTpApplyController {
}
@ApiOperation("加分申请单分页查询")
@GetMapping("/rewardPage")
public ResponseResult<PageInfo<MiniTpApplyListVO>> rewardPage(TpApplyQueryRequest request) {
@PostMapping("/rewardPage")
public ResponseResult<PageInfo<MiniTpApplyListVO>> rewardPage(@RequestBody TpApplyQueryRequest request) {
request.setType(TpFormTypeEnum.REWARD.getType());
return ResponseResult.success(tpApplyService.getMiniApplyList(request));
}
@@ -72,8 +72,8 @@ public class MiniTpApplyController {
}
@ApiOperation("惩处申请单分页查询")
@GetMapping("/penaltyPage")
public ResponseResult<PageInfo<MiniTpApplyListVO>> penaltyPage(TpApplyQueryRequest request) {
@PostMapping("/penaltyPage")
public ResponseResult<PageInfo<MiniTpApplyListVO>> penaltyPage(@RequestBody TpApplyQueryRequest request) {
request.setIsPenalty(true);
request.setIsDraft(0);
return ResponseResult.success(tpApplyService.getMiniApplyList(request));

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

@@ -458,9 +458,10 @@ public class XxlJobHandler {
int pageNum = 1;
int pageSize = CommonConstants.BATCH_SIZE;
TpApplyQueryRequest request = new TpApplyQueryRequest();
request.setStatus(TpFormStatusEnum.PASS.getStatus());
request.setStatusList(Collections.singletonList(TpFormStatusEnum.PASS.getStatus()));
request.setIsPenalty(true);
request.setIsDraft(0);
request.setOverdue(true);
while (hasNext) {
PageHelper.startPage(pageNum, pageSize);
List<TpApplyFormDO> list = tpApplyFormDAO.getEffectiveList(request);
@@ -471,6 +472,14 @@ public class XxlJobHandler {
List<Long> applyIds = CollStreamUtil.toList(list, TpApplyFormDO::getId);
try {
tpApplyFormDAO.updateStatusBatch(applyIds, TpFormStatusEnum.EFFECTIVE);
list.forEach(form -> {
try {
tpApplyService.scoreChange(form);
} catch (Exception e) {
log.info("积分变动失败，formId:{}, storeId:{}", form.getId(), form.getStoreId());
log.info("积分变动失败", e);
}
});
} catch (Exception e) {
log.error("超过申诉期，更新申请单状态失败", e);
}