|
|
@@ -1993,18 +1993,23 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
|
|
|
|
|
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode()); |
|
|
OrderAdapterService orderAdapterService = orderFactory.getOrderAdapterService(composeOrderType.getCode()); |
|
|
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(user, orderSave, payWay); |
|
|
WxComposeOrder composeOrder = orderAdapterService.createDBMainOrder(user, orderSave, payWay); |
|
|
|
|
|
WxOrder lastOrder = null; |
|
|
for (int i = 0 ; i < orderSave.size(); i ++) { |
|
|
for (int i = 0 ; i < orderSave.size(); i ++) { |
|
|
OrderComposeSaveDto orderdto = orderSave.get(i); |
|
|
OrderComposeSaveDto orderdto = orderSave.get(i); |
|
|
//券一个数量创建一个订单 |
|
|
//券一个数量创建一个订单 |
|
|
boolean isOneNumberOneOrder = orderAdapterService.isOneNumberOneOrder(); |
|
|
boolean isOneNumberOneOrder = orderAdapterService.isOneNumberOneOrder(); |
|
|
if (isOneNumberOneOrder) { |
|
|
if (isOneNumberOneOrder) { |
|
|
for (int j = 0; j < orderdto.getCount(); j++) { |
|
|
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 { |
|
|
}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; |
|
|
return composeOrder; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@@ -2418,7 +2423,6 @@ public class WxOrderServiceImpl implements WxOrderService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public ResultData composeSaveOrder(EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { |
|
|
public ResultData composeSaveOrder(EnumComposeOrder composeOrderType,List<OrderComposeSaveDto> composeOrderSaveDto,Long cUserId,EnumPayWay payWay,TenantEntity tenantEntity) { |
|
|
logger.info("composeSaveOrder: " + composeOrderSaveDto); |
|
|
|
|
|
try { |
|
|
try { |
|
|
if (null == composeOrderSaveDto || composeOrderSaveDto.size() <= 0 ) { |
|
|
if (null == composeOrderSaveDto || composeOrderSaveDto.size() <= 0 ) { |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息"); |
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"无商品信息"); |
|
|
|