Selaa lähdekoodia

fix order

release_toaliyun_real
xiaohanzi 4 vuotta sitten
vanhempi
commit
11c66b0ee5
2 muutettua tiedostoa jossa 7 lisäystä ja 4 poistoa
  1. +7
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  2. +0
    -1
      mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java

+ 7
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Näytä tiedosto

@@ -1993,18 +1993,23 @@ public class WxOrderServiceImpl implements WxOrderService {
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode());
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(user, orderSave, payWay);
WxOrder lastOrder = null;
for (int i = 0 ; i < orderSave.size(); i ++) {
OrderComposeSaveDto orderdto = orderSave.get(i);
//券一个数量创建一个订单
boolean isOneNumberOneOrder = orderAdapterService.isOneNumberOneOrder();
if (isOneNumberOneOrder) {
for (int j = 0; j < orderdto.getCount(); j++) {
proxy.handleSaveOrderForCouponSingle(composeOrder, user, orderdto.getWxCoupon(), 1, orderdto, payWay);
lastOrder = proxy.handleSaveOrderForCouponSingle(composeOrder, user, orderdto.getWxCoupon(), 1, orderdto, payWay);
}
}else {
proxy.handleSaveOrderForCouponSingle(composeOrder, user, orderdto.getWxCoupon(), orderdto.getCount(), orderdto, payWay);
lastOrder = proxy.handleSaveOrderForCouponSingle(composeOrder, user, orderdto.getWxCoupon(), orderdto.getCount(), orderdto, payWay);
}
}
//如果没有orderId,则用lastOrder的信息
if (null == composeOrder.getMainOrderId() || composeOrder.getMainOrderId().intValue() <= 0) {
return new WxComposeOrder(lastOrder.getId(), composeOrder.getComposeOrderType());
}
return composeOrder;
}
@@ -2418,7 +2423,6 @@ public class WxOrderServiceImpl implements WxOrderService {

@Override
public ResultData composeSaveOrder(EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) {
logger.info("composeSaveOrder: " + composeOrderSaveDto);
try {
if (null == composeOrderSaveDto || composeOrderSaveDto.size() <= 0 ) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息");


+ 0
- 1
mallinkService/src/main/java/com/iformall/service/order/impl/SingleOrderAdapterService.java Näytä tiedosto

@@ -34,7 +34,6 @@ public class SingleOrderAdapterService implements OrderAdapterService {
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class})
@Override
public WxComposeOrder createDBMainOrder(WxCUserBasicInfo user,List<OrderComposeSaveDto> orderSave,EnumPayWay payWay) {
//do nothing,
return new WxComposeOrder(0L, EnumComposeOrder.SINGLE.getCode());
}


Ladataan…
Peruuta
Tallenna