| @@ -103,7 +103,7 @@ public class OrderExpiringSchedule { | |||||
| // 拼团取消 | // 拼团取消 | ||||
| WxOrder order = new WxOrder(); | WxOrder order = new WxOrder(); | ||||
| order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); | order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode()); | ||||
| wxOrderMapper.select(order).parallelStream().forEach(o -> { | |||||
| wxOrderMapper.select(order).stream().forEach(o -> { | |||||
| try { | try { | ||||
| orderGroupExpired(o); | orderGroupExpired(o); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -114,7 +114,7 @@ public class OrderExpiringSchedule { | |||||
| //拼团过期 | //拼团过期 | ||||
| order = new WxOrder(); | order = new WxOrder(); | ||||
| order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()); | order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()); | ||||
| wxOrderMapper.select(order).parallelStream().forEach(o -> { | |||||
| wxOrderMapper.select(order).stream().forEach(o -> { | |||||
| try { | try { | ||||
| returnMoney(o); | returnMoney(o); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -125,7 +125,7 @@ public class OrderExpiringSchedule { | |||||
| //拼团券下架 | //拼团券下架 | ||||
| order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); | order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); | ||||
| wxOrderMapper.select(order).parallelStream().forEach(o -> { | |||||
| wxOrderMapper.select(order).stream().forEach(o -> { | |||||
| try { | try { | ||||
| returnMoney(o); | returnMoney(o); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -135,7 +135,7 @@ public class OrderExpiringSchedule { | |||||
| //参团失败 | //参团失败 | ||||
| order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); | order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()); | ||||
| wxOrderMapper.select(order).parallelStream().forEach(o -> { | |||||
| wxOrderMapper.select(order).stream().forEach(o -> { | |||||
| try { | try { | ||||
| returnMoney(o); | returnMoney(o); | ||||
| } catch (Exception e) { | } catch (Exception e) { | ||||
| @@ -7,18 +7,18 @@ public enum EnumCouponOrderStatus { | |||||
| // 券状态 0-已领取/已购买/未核销/未使用/待使用,1:已核销/已使用,2:已过期,3:已作废 | // 券状态 0-已领取/已购买/未核销/未使用/待使用,1:已核销/已使用,2:已过期,3:已作废 | ||||
| // 卡状态 4-使用中 5-已过期 6-已用完 7-已线下退款 | // 卡状态 4-使用中 5-已过期 6-已用完 7-已线下退款 | ||||
| COUPON_ORDER_USE_WAIT(0, "待使用"), | |||||
| COUPON_ORDER_USED(1, "已核销"), | |||||
| COUPON_ORDER_OVER_TIME(2, "已过期"), | |||||
| COUPON_ORDER_USE_WAIT(0, "待使用"),//占库存 | |||||
| COUPON_ORDER_USED(1, "已核销"),//占库存 | |||||
| COUPON_ORDER_OVER_TIME(2, "已过期"),//占库存 | |||||
| COUPON_ORDER_INVALID(3, "已作废"), | COUPON_ORDER_INVALID(3, "已作废"), | ||||
| CARD_USING(4, "使用中"), | |||||
| CARD_OVER_TIME(5, "已过期"), | |||||
| CARD_COMPLETE(6, "已用完"), | |||||
| CARD_USING(4, "使用中"),//占库存 | |||||
| CARD_OVER_TIME(5, "已过期"),//占库存 | |||||
| CARD_COMPLETE(6, "已用完"),//占库存 | |||||
| CARD_RETURNED(7, "已线下退款"), | CARD_RETURNED(7, "已线下退款"), | ||||
| CARD_TRANSFER(8, "已转赠"), /// 此状态不在wx_coupon_order中使用,已移到transfer表 | |||||
| CARD_TRANSFER(8, "已转赠"), //占库存 /// 此状态不在wx_coupon_order中使用,已移到transfer表 | |||||
| POS_PRE_VERIFY(100, "POS预核销"), // POS设置状态 | |||||
| POS_PRE_VERIFY(100, "POS预核销"), //占库存 // POS设置状态 | |||||
| ; | ; | ||||
| public static EnumCouponOrderStatus getEnum(Integer code) { | public static EnumCouponOrderStatus getEnum(Integer code) { | ||||
| @@ -7,22 +7,22 @@ public enum EnumOrderStatus { | |||||
| // 0-待付款;1-已支付;2-已取消(限定时间内未付款);3-待退款;4-已退款;5-退款失败 | // 0-待付款;1-已支付;2-已取消(限定时间内未付款);3-待退款;4-已退款;5-退款失败 | ||||
| ORDER_STATUS_PENDING_PAYMENT(0, "待付款"), | |||||
| ORDER_STATUS_PAYMENT_SUCCESS(1, "已支付"), | |||||
| ORDER_STATUS_PENDING_PAYMENT(0, "待付款"),//占库存 | |||||
| ORDER_STATUS_PAYMENT_SUCCESS(1, "已支付"),//占库存 | |||||
| ORDER_STATUS_OVERTIME_CANCEL(2, "已取消"), | ORDER_STATUS_OVERTIME_CANCEL(2, "已取消"), | ||||
| ORDER_STATUS_PENDING_REFUND(3, "待退款"), | |||||
| ORDER_STATUS_PENDING_REFUND(3, "待退款"),//占库存 | |||||
| ORDER_STATUS_REFUND_SUCCESS(4,"已退款"), | ORDER_STATUS_REFUND_SUCCESS(4,"已退款"), | ||||
| ORDER_STATUS_REFUND_FAILD(5, "退款失败"), | |||||
| ORDER_STATUS_PRESSING(6, "砍价中"), | |||||
| ORDER_STATUS_PRESS_COMPLETE(7, "砍价完成"), | |||||
| ORDER_STATUS_REFUND_FAILD(5, "退款失败"),//占库存 | |||||
| ORDER_STATUS_PRESSING(6, "砍价中"),//占库存 | |||||
| ORDER_STATUS_PRESS_COMPLETE(7, "砍价完成"),//占库存 | |||||
| ORDER_STATUS_PRESS_OVERTIME(8, "砍价已过期"), | ORDER_STATUS_PRESS_OVERTIME(8, "砍价已过期"), | ||||
| ORDER_STATUS_PRESS_CANCEL(9, "砍价已取消"), | ORDER_STATUS_PRESS_CANCEL(9, "砍价已取消"), | ||||
| ORDER_STATUS_COOPERATING(10, "拼团中"), | |||||
| ORDER_STATUS_COOPERATING_COMPLETE(11, "拼团完成"), | |||||
| ORDER_STATUS_COOPERATING(10, "拼团中"),//占库存 | |||||
| ORDER_STATUS_COOPERATING_COMPLETE(11, "拼团完成"),//占库存 | |||||
| ORDER_STATUS_COOPERATING_OVERTIME(12, "拼团已过期"), | ORDER_STATUS_COOPERATING_OVERTIME(12, "拼团已过期"), | ||||
| ORDER_STATUS_COOPERATING_CANCEL(13, "拼团失败"), | ORDER_STATUS_COOPERATING_CANCEL(13, "拼团失败"), | ||||
| ORDER_STATUS_COOPERATING_FAILD(14, "参团失败"), | ORDER_STATUS_COOPERATING_FAILD(14, "参团失败"), | ||||
| ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款"), | |||||
| ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款"),//占库存 | |||||
| ORDER_STATUS_COOPERATING_BREAK(16, "拼团取消") | ORDER_STATUS_COOPERATING_BREAK(16, "拼团取消") | ||||
| ; | ; | ||||