|
@@ -660,7 +660,10 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
|
|
|
List<Goods> goodies = goodsDao.getGoodies(goodsIds);
|
|
|
BigDecimal goodsTotalPrice = goodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
- AccountType accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(order.getPaymentChannel()), order.getMerNos(), order.getTenantId());
|
|
|
+ AccountType accountType = AccountType.INTERNAL;
|
|
|
+ if(StringUtils.isNotEmpty(order.getPaymentChannel())){
|
|
|
+ accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(order.getPaymentChannel()), order.getMerNos(), order.getTenantId());
|
|
|
+ }
|
|
|
PmsProductQueryParamDto paramDto = new PmsProductQueryParamDto();
|
|
|
String skuIds = goodsSubService.lambdaQuery().in(GoodsSub::getGoodsId, goodies.stream().map(Goods::getId).collect(Collectors.toList())).list()
|
|
|
.stream().map(e->e.getSku().toString()).collect(Collectors.joining(","));
|