|
|
@@ -275,12 +275,12 @@ public class PurchaseServiceImpl extends ServiceImpl<OrderMapper, Order> impleme
|
|
|
//获取平台销售政策 需将平台编码转成代理商编码
|
|
|
List<SalesPolicyItemVO> salesPolicy = salesPolicyClient.getSalesPolicy(tenant.getCorpCode(), tenant.getTerrace());
|
|
|
if (CollectionUtils.isNotEmpty(salesPolicy)){
|
|
|
- salesPolicy.stream().forEach(item ->{
|
|
|
- //获取代理商商品信息
|
|
|
+ for (SalesPolicyItemVO item : salesPolicy) {
|
|
|
+ //获取代理商商品信息 找到转换为代理商商品名称编码,未找到跳过机选下一个
|
|
|
OrderItemsVO orderItemsVO = new OrderItemsVO();
|
|
|
GoodsDesc terraceCode = goodsDescClient.getTerraceCode(item.getCode(), SecureUtil.getTenantId());
|
|
|
if (terraceCode == null){
|
|
|
- throw new SecurityException("未找到商品"+item.getCode());
|
|
|
+ continue;
|
|
|
}
|
|
|
orderItemsVO.setCode(terraceCode.getCode());
|
|
|
orderItemsVO.setCname(terraceCode.getCname());
|
|
|
@@ -318,7 +318,7 @@ public class PurchaseServiceImpl extends ServiceImpl<OrderMapper, Order> impleme
|
|
|
}
|
|
|
|
|
|
list.add(orderItemsVO);
|
|
|
- });
|
|
|
+ }
|
|
|
}
|
|
|
//政策不为空,按销量倒叙排序
|
|
|
if (CollectionUtils.isNotEmpty(list)){
|