xhxu 5 лет назад
Родитель
Сommit
5777f1cbdc
2 измененных файлов: 14 добавлений и 3 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java
  2. +12
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 2
- 2
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) ;


+ 12
- 1
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<Integer> 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) {


Загрузка…
Отмена
Сохранить