From cb0cc65b1700e448b30a784f254a30415714881f Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Sun, 26 Sep 2021 17:35:33 +0800 Subject: [PATCH] fix bug --- .../com/iformall/enums/EnumComposeOrder.java | 16 ++++++++-------- .../service/impl/WxOrderServiceImpl.java | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java b/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java index b0c4e32ee..0e0c0b12f 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java @@ -56,12 +56,12 @@ public enum EnumComposeOrder { } //子订单是单个还是一起,购物车的子订单是单个,可以单个支付,券包的子订单不能单个支付 - public static boolean childOrderIsSingle(Integer type) { - if (type.intValue() == SINGLE.getCode().intValue() || type.intValue() == ONE_NUMBER_ORDER_BATCH.getCode().intValue() - || type.intValue() == MULITY_NUMBER_ORDER_BATCH.getCode().intValue()) { - return true; - }else { - return false; - } - } +// public static boolean childOrderIsSingle(Integer type) { +// if (type.intValue() == SINGLE.getCode().intValue() || type.intValue() == ONE_NUMBER_ORDER_BATCH.getCode().intValue() +// || type.intValue() == MULITY_NUMBER_ORDER_BATCH.getCode().intValue()) { +// return true; +// }else { +// return false; +// } +// } } 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 44da50f11..e446cfe25 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2021,7 +2021,7 @@ public class WxOrderServiceImpl implements WxOrderService { } } //如果没有orderId,则用lastOrder的信息 - if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId().intValue() <= 0) { + if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId() <= 0) { return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType(),lastOrder.getPayment()); } return composeOrder; @@ -2106,11 +2106,11 @@ public class WxOrderServiceImpl implements WxOrderService { } if (null != composeOrder) { record.setComposeOrderId(composeOrder.getMainOrderId()); - if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { - record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); - }else { + //if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { + // record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); + //}else { record.setComposeOrderType(composeOrder.getComposeOrderType()); - } + //} }else { record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); record.setComposeOrderId(0L); @@ -2174,11 +2174,11 @@ public class WxOrderServiceImpl implements WxOrderService { record.setOrderStatus(orderStatus); record.setComposeOrderId(composeOrder.getMainOrderId()); - if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { - record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); - }else { + //if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) { + // record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); + //}else { record.setComposeOrderType(composeOrder.getComposeOrderType()); - } + //} record.setCouponNumber(couponNumber); try {