优化

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -409,7 +409,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                             initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
                         }
                         if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) {
-                            vinList.set(i, vinList.get(i) + "促销(" + initBigDecimalTwo.toString() + "元)");
+                            vinList.set(i, vinList.get(i) + "，促销(" + initBigDecimalTwo.toString() + "元)");
                         }
                     }
                 }
@@ -458,21 +458,27 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 List<VinListsVo> vinLists = busSalesOrderVehicleService.selectLists(sid);
                 //包含采购系统的车架号
                 List<String> vinList = vinLists.stream().map(v -> v.getVinNo()).collect(Collectors.toList());
+                if (!vinList.isEmpty()) {
+                    for (int i = 0; i < vinLists.size(); i++) {
+                        VinListsVo vinListsVo = vinLists.get(i);
+                        BigDecimal initBigDecimalTwo = BigDecimal.ZERO;
+                        //根据sid去查询销售政策的sid，根据销售政策查询销售政策的金额
+                        ResultBean<List<String>> listResultBean = baseDiscountpackageFeign.getMoney(vinListsVo.getVinSid(), entity.getUseOrgSid());
+                        if (listResultBean.getSuccess() && !listResultBean.getData().isEmpty()) {
+                            List<String> stringList = listResultBean.getData();
+                            initBigDecimalTwo = initBigDecimalTwo.add(stringList.stream().map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add));
+                        }
+                        if (initBigDecimalTwo.compareTo(BigDecimal.ZERO) != 0) {
+                            vinList.set(i, vinList.get(i) + "，促销(" + initBigDecimalTwo.toString() + "元)");
+                        }
+                    }
+                }
                 busSalesOrderModelDetailsVo.setVinNo(vinList);
-           /* List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid());
-            if (busSalesOrderVehicleListVoList.size() != 0) {
-                vo.setBusSalesOrderVehicleList(busSalesOrderVehicleListVoList);
-            }*/
             } else if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(entity.getType())) {
                 List<BusSalesVehicleOrder> stringLists = busSalesVehicleOrderService.selectLists(sid);
                 //包含采购系统的采购订单编号
                 List<String> stringList = stringLists.stream().map(v -> v.getLinkNo()).collect(Collectors.toList());
                 busSalesOrderModelDetailsVo.setLinkNo(stringList);
-                //查询采购订单
-//            List<BusSalesVehicleOrderDetailsVo> busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid());
-//            if (busSalesVehicleOrderDetailsVoList.size() != 0) {
-//                vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList);
-//            }
             }
             vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo);
         }