优化

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

@@ -4970,41 +4970,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
-        //单台成交价与单台订金相等
-       /* if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
-            String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
-            List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
-            for (int i = 0; i < vinList.size(); i++) {
-                UnCollectionDto unCollectionDto = new UnCollectionDto();
-                //合同sid
-                unCollectionDto.setContractSid(commonContract.getSid());
-                //合同编号
-                unCollectionDto.setContractNo(commonContract.getContractNo());
-                //客户名称
-                unCollectionDto.setCustomerName(appOrderDetailsVo.getName());
-                //客户sid
-                unCollectionDto.setCustomerSid(appOrderDetailsVo.getCustomerSid());
-                //客户类型
-                unCollectionDto.setCustomerClass(appOrderDetailsVo.getCustomerKey());
-                //客户类型
-                unCollectionDto.setCustomerClassKey(appOrderDetailsVo.getCustomerType());
-                //客户头像
-                unCollectionDto.setCustomerImage(appOrderDetailsVo.getCustomerImage());
-                unCollectionDto.setReceivablesName("车款");
-                unCollectionDto.setCustomerPhone(appOrderDetailsVo.getPhone());
-                unCollectionDto.setUseOrgSid(appOrderDetailsVo.getUseOrgSid());
-                unCollectionDto.setVinNo(vinList.get(i).getVinNo());
-                unCollectionDto.setCurrentReceivableMoney(money);
-                unCollectionDto.setUserSid(userSid);
-                unCollectionDto.setReveivableMoney(money);
-                unCollectionDto.setBusVinSid(vinList.get(i).getSid());
-                unCollectionDto.setPayType(appOrderDetailsVo.getPayType());
-                unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
-                unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName());
-                unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
-                finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
-            }
-        }*/
         //添加推送至款项确认的应收未收明细中
         List<VinListsVo> vinList = appOrderModelInfoVo.getVinListsVos();
         //更新销售订单的临时号
@@ -5021,7 +4986,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 } else {
                     temporaryName = appOrderDetailsVo.getName() + temporaryNo;
                 }
-
                 //更新临时号
                 ResultBean busSalesOrderResultBean = busSalesOrderVehicleService.updateTemporaryNo(salesOrderVinSid, temporaryNo, temporaryName);
             }
@@ -5075,6 +5039,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 unCollectionDto.setPayTypeKey(appOrderDetailsVo.getPayTypeKey());
                 unCollectionDto.setPurchaseSystemName(appOrderDetailsVo.getPurchaseSystemName());
                 unCollectionDto.setPurchaseSystemSid(appOrderDetailsVo.getPurchaseSystemSid());
+                BusSalesOrder busSalesOrder = fetchBySid(appOrderDetailsVo.getBusSalesOrderSid());
+                unCollectionDto.setOrgSidPath(busSalesOrder.getOrgSidPath());
                 finUncollectedDetailedFeign.saveUnCollection(unCollectionDto);
             }
         }