Bläddra i källkod

Merge branch 'release_toaliyun_real_2022_init' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_init

release_toaliyun_real
xhxu 4 år sedan
förälder
incheckning
fd9f68c529
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Visa fil

@@ -2535,8 +2535,8 @@ public class WxOrderServiceImpl implements WxOrderService {
}
}
//如果没有orderId,则用lastOrder的信息
if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId() <= 0) {
return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType(),lastOrder.getPayment());
if (EnumComposeOrder.isSingle(composeOrderType.getCode())) {
composeOrder.setSingleOrder(lastOrder);
}
return composeOrder;
}


Laddar…
Avbryt
Spara