Просмотр исходного кода

fix order

release_toaliyun_real
xiaohanzi 4 лет назад
Родитель
Сommit
a0ee553bd0
3 измененных файлов: 22 добавлений и 4 удалений
  1. +0
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java
  3. +11
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 0
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxBatchOrder.java Просмотреть файл

@@ -24,8 +24,6 @@ public class WxBatchOrder extends TenantEntity {
private Long cUserId; private Long cUserId;
@io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment") @io.swagger.annotations.ApiModelProperty(value="支付金额(分):允许有负数,退款时为负值。",name="payment")
private Integer payment; private Integer payment;
// @io.swagger.annotations.ApiModelProperty(value="订单状态 已支付/未支付。已取消",name="orderStatus")
// private Integer orderStatus;
@io.swagger.annotations.ApiModelProperty(value="创建时间/砍价开始时间",name="createDate") @io.swagger.annotations.ApiModelProperty(value="创建时间/砍价开始时间",name="createDate")
private Date createDate; private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")


+ 11
- 0
mallinkService/src/main/java/com/iformall/enums/EnumComposeOrder.java Просмотреть файл

@@ -46,6 +46,7 @@ public enum EnumComposeOrder {
} }
} }
//是单个支付还是组合支付
public static boolean isSingle(Integer type) { public static boolean isSingle(Integer type) {
if (type.intValue() == SINGLE.getCode().intValue()) { if (type.intValue() == SINGLE.getCode().intValue()) {
return true; return true;
@@ -53,4 +54,14 @@ public enum EnumComposeOrder {
return false; 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;
}
}
} }

+ 11
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -2080,7 +2080,11 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setFormId(formId); record.setFormId(formId);
record.setOrderGroupId(0L); record.setOrderGroupId(0L);
record.setComposeOrderId(composeOrder.getMainOrderId()); record.setComposeOrderId(composeOrder.getMainOrderId());
record.setComposeOrderType(composeOrder.getComposeOrderType());
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) {
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
}else {
record.setComposeOrderType(composeOrder.getComposeOrderType());
}
record.setCouponNumber(couponNumber); record.setCouponNumber(couponNumber);
try { try {
proxy.saveFreeOrder(record, user, coupon); proxy.saveFreeOrder(record, user, coupon);
@@ -2132,7 +2136,12 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setPayment(price.getRealPayMent()); record.setPayment(price.getRealPayMent());
record.setOrderStatus(orderStatus); record.setOrderStatus(orderStatus);
record.setComposeOrderId(composeOrder.getMainOrderId()); record.setComposeOrderId(composeOrder.getMainOrderId());
record.setComposeOrderType(composeOrder.getComposeOrderType());
if (EnumComposeOrder.childOrderIsSingle(composeOrder.getComposeOrderType())) {
record.setComposeOrderType(EnumComposeOrder.SINGLE.getCode());
}else {
record.setComposeOrderType(composeOrder.getComposeOrderType());
}
record.setCouponNumber(couponNumber); record.setCouponNumber(couponNumber);
try { try {
orderNumber = proxy.saveNoFreeOrder(record, user, coupon, isPress); orderNumber = proxy.saveNoFreeOrder(record, user, coupon, isPress);


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