Merge branch 'master-performance' into dev

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderServiceImpl.java

@@ -2544,7 +2544,7 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                         }
                     } else if (vo.getDrawee() == 2) {//收货人付款   层级5 第一个
                         if (consigneeDO != null) {
-                            vo.setCustomerId(orderConsignorBackVO.getCustomerId());
+                            vo.setCustomerId(orderConsigneeBackVO.getCustomerId());
                         } else {
                             //没有收货人
                             vo.setCustomerId(0L);
@@ -2555,7 +2555,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     } else if (vo.getDrawee() == 3) { //自定义付款
                         List<CustomDraweeVO> list = JSONObject.parseArray(vo.getCustomDrawee(), CustomDraweeVO.class);
                         if (CollectionUtil.isNotEmpty(list)) {
-
                             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());
                             int freight = freightList.get(0).getValue();//运费
@@ -2577,7 +2576,6 @@ public class OrderServiceImpl extends AbstractService<OrderMapper, OrderDO> impl
                     } else {
                         //业绩归收货人
                         vo.setCustomerId(orderConsigneeBackVO.getCustomerId() != null ? orderConsigneeBackVO.getCustomerId() : 0);
-
                         customerType = 2;
                     }
                 }