Browse Source

fix bug

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
cb0cc65b17
2 changed files with 17 additions and 17 deletions
  1. +8
    -8
      mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
  2. +9
    -9
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 8
- 8
mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java View File

@@ -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;
// }
// }
} }

+ 9
- 9
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -2021,7 +2021,7 @@ public class WxOrderServiceImpl implements WxOrderService {
} }
} }
//如果没有orderId,则用lastOrder的信息 //如果没有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 new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType(),lastOrder.getPayment());
} }
return composeOrder; return composeOrder;
@@ -2106,11 +2106,11 @@ public class WxOrderServiceImpl implements WxOrderService {
} }
if (null != composeOrder) { if (null != composeOrder) {
record.setComposeOrderId(composeOrder.getMainOrderId()); 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.setComposeOrderType(composeOrder.getComposeOrderType());
}
//}
}else { }else {
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode()); record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
record.setComposeOrderId(0L); record.setComposeOrderId(0L);
@@ -2174,11 +2174,11 @@ public class WxOrderServiceImpl implements WxOrderService {


record.setOrderStatus(orderStatus); record.setOrderStatus(orderStatus);
record.setComposeOrderId(composeOrder.getMainOrderId()); 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.setComposeOrderType(composeOrder.getComposeOrderType());
}
//}
record.setCouponNumber(couponNumber); record.setCouponNumber(couponNumber);
try { try {


Loading…
Cancel
Save