| @@ -460,18 +460,29 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| try { | try { | ||||
| WxOrder orderQ = new WxOrder(); | WxOrder orderQ = new WxOrder(); | ||||
| orderQ.setTenantId(subTenantId); | orderQ.setTenantId(subTenantId); | ||||
| orderQ.setType(EnumOrderType.COUPON.getCode()); | |||||
| // orderQ.setType(EnumOrderType.COUPON.getCode()); | |||||
| orderQ.setCUserId(cuserId); | orderQ.setCUserId(cuserId); | ||||
| List<Integer> statusS = new ArrayList<>(); | List<Integer> statusS = new ArrayList<>(); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | statusS.add(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.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_PRESSING.getCode()); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_PRESS_COMPLETE.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.getCode()); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); | statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()); | ||||
| statusS.add(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.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); | orderQ.setStatusS(statusS); | ||||
| return wxOrderMapper.countCouponConditionType1(orderQ); | return wxOrderMapper.countCouponConditionType1(orderQ); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||