Commit 771f9571 authored by zhengyi's avatar zhengyi

订单修改审批业绩修正bug修复

Signed-off-by: default avatarzhengyi <landuo321@aliyun.com>
parent ba43f75a
...@@ -2512,7 +2512,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2512,7 +2512,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} }
} else if (vo.getDrawee() == 2) {//收货人付款 层级5 第一个 } else if (vo.getDrawee() == 2) {//收货人付款 层级5 第一个
if (consigneeDO != null) { if (consigneeDO != null) {
vo.setCustomerId(orderConsignorBackVO.getCustomerId()); vo.setCustomerId(orderConsigneeBackVO.getCustomerId());
} else { } else {
//没有收货人 //没有收货人
vo.setCustomerId(0L); vo.setCustomerId(0L);
...@@ -2523,7 +2523,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2523,7 +2523,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} else if (vo.getDrawee() == 3) { //自定义付款 } else if (vo.getDrawee() == 3) { //自定义付款
List<CustomDraweeVO> list = JSONObject.parseArray(vo.getCustomDrawee(), CustomDraweeVO.class); List<CustomDraweeVO> list = JSONObject.parseArray(vo.getCustomDrawee(), CustomDraweeVO.class);
if (CollectionUtil.isNotEmpty(list)) { if (CollectionUtil.isNotEmpty(list)) {
List<CustomDraweeVO> freightList = list.stream().filter(s -> s.getName().equals("freight")).collect(Collectors.toList()); List<CustomDraweeVO> freightList = list.stream().filter(s -> s.getName().equals("freight")).collect(Collectors.toList());
List<CustomDraweeVO> clearanceFeeList = list.stream().filter(s -> s.getName().equals("clearanceFee")).collect(Collectors.toList()); List<CustomDraweeVO> clearanceFeeList = list.stream().filter(s -> s.getName().equals("clearanceFee")).collect(Collectors.toList());
int freight = freightList.get(0).getValue();//运费 int freight = freightList.get(0).getValue();//运费
...@@ -2545,7 +2544,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl ...@@ -2545,7 +2544,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
} else { } else {
//业绩归收货人 //业绩归收货人
vo.setCustomerId(orderConsigneeBackVO.getCustomerId() != null ? orderConsigneeBackVO.getCustomerId() : 0); vo.setCustomerId(orderConsigneeBackVO.getCustomerId() != null ? orderConsigneeBackVO.getCustomerId() : 0);
customerType = 2; customerType = 2;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment