From 5777f1cbdc9f211d2cff3863811bc4ddf31b2bd7 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 22 Dec 2020 09:53:13 +0800 Subject: [PATCH] bug --- .../controller/mem/WxCreditHistoryController.java | 4 ++-- .../iformall/service/impl/WxOrderServiceImpl.java | 13 ++++++++++++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index 2d3bf8cab..86539149b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -139,9 +139,9 @@ public class WxCreditHistoryController extends BaseController { @TenantIgnore @ApiOperation("积分清零计划") - @PostMapping("clearCreditByYear") + @GetMapping("clearCreditByYear") @SystemControllerLog(description = "积分清零计划") - public ResultData clearCreditByYear(@RequestBody WxCreditHistory wxCreditHistory) { + public ResultData clearCreditByYear(@ModelAttribute WxCreditHistory wxCreditHistory) { logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::clearCreditByYear"); if(wxCreditHistory == null){ return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL) ; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index d8f3d3a75..a9b7c601d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -460,18 +460,29 @@ public class WxOrderServiceImpl implements WxOrderService { try { WxOrder orderQ = new WxOrder(); orderQ.setTenantId(subTenantId); - orderQ.setType(EnumOrderType.COUPON.getCode()); +// orderQ.setType(EnumOrderType.COUPON.getCode()); orderQ.setCUserId(cuserId); List statusS = new ArrayList<>(); statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_REFUND.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_REFUND_FAILD.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_PRESSING.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_CANCEL.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode()); + + statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_SCHEDU_REFUND.getCode()); + statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE_REFUND.getCode()); + orderQ.setStatusS(statusS); return wxOrderMapper.countCouponConditionType1(orderQ); } catch (Exception e) {