优化

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

@@ -218,4 +218,6 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
     BusSalesOrderDetailsVo selNewComSaleByVehSid(String vehSid);
 
     BusSalesOrder selectByContractNos(String contractNo);
+
+    String selectBySid(String sid);
 }

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

@@ -552,4 +552,8 @@
         from bus_sales_order
         where contractNo = #{contractNo}
     </select>
+
+    <select id="selectBySid" resultType="java.lang.String">
+        select cc.sid from bus_sales_order bo left join anrui_base.common_contract cc on cc.contractNo = bo.contractNo
+    </select>
 </mapper>

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

@@ -5263,6 +5263,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
+        String contractSid = baseMapper.selectBySid(busSalesOrder.getSid());
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).subtract(new BigDecimal(solutionsDetailsVo.getFactoryDiscount())).add(new BigDecimal(solutionsDetailsVo.getServiceAmount())).toString();
@@ -5270,6 +5271,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
                 unCollectionDto.setContractNo(busSalesOrder.getContractNo());
+                unCollectionDto.setContractSid(contractSid);
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());
                 //客户sid
@@ -5310,6 +5312,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
+        String contractSid = baseMapper.selectBySid(busSalesOrder.getSid());
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(solutionsDetailsVo.getRealTotal()).subtract(new BigDecimal(deposit)).toString();
@@ -5317,6 +5320,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
                 //合同编号
+                unCollectionDto.setContractSid(contractSid);
                 unCollectionDto.setContractNo(busSalesOrder.getContractNo());
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());
@@ -5358,6 +5362,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         String num = priceInfo.getNumber();
         //单台成交价
         String transactionPrice = priceInfo.getSingleFinalPrice();
+        String contractSid = baseMapper.selectBySid(busSalesOrder.getSid());
         //单台成交价与单台订金相等
         if (new BigDecimal(singleFinalPrice).compareTo(new BigDecimal(deposit)) != 0) {//推送车款
             String money = new BigDecimal(singleFinalPrice).subtract(new BigDecimal(deposit)).toString();
@@ -5365,6 +5370,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             for (int i = 0; i < vinList.size(); i++) {
                 UnCollectionDto unCollectionDto = new UnCollectionDto();
                 //合同编号
+                unCollectionDto.setContractSid(contractSid);
                 unCollectionDto.setContractNo(busSalesOrder.getContractNo());
                 //客户名称
                 unCollectionDto.setCustomerName(vo.getName());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java

@@ -467,6 +467,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
                     finSelectedReceivablesDetailed.setCollSid(finalSid);
                     finSelectedReceivablesDetailed.setUseOrgSid(finalUseOrgSid);
+                    finSelectedReceivablesDetailed.setPurchaseSystemSid(finCollectionConfirmation.getPurchaseSystemSid());
+                    finSelectedReceivablesDetailed.setPurchaseSystemName(finCollectionConfirmation.getPurchaseSystemName());
                     //设置审核状态为待审核(1待审核/2已驳回/3已审核)
                     finSelectedReceivablesDetailed.setAuditState(1);
                     finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
@@ -513,6 +515,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     BeanUtil.copyProperties(v, finSelectedReceivablesDetailed, "sid");
                     finSelectedReceivablesDetailed.setCollSid(finalSid);
                     finSelectedReceivablesDetailed.setUseOrgSid(finCollectionConfirmation.getUseOrgSid());
+                    finSelectedReceivablesDetailed.setPurchaseSystemSid(finCollectionConfirmation.getPurchaseSystemSid());
+                    finSelectedReceivablesDetailed.setPurchaseSystemName(finCollectionConfirmation.getPurchaseSystemName());
                     //设置审核状态为待审核(1待审核/2已驳回/3已审核)
                     finSelectedReceivablesDetailed.setAuditState(1);
                     finSelectedReceivablesDetailed.setCreateBySid(dto.getUserSid());
@@ -970,6 +974,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
         for (AppFinSelectedReceivablesDetailedDto paymentDetail : finSelectedReceivablesDetailedDtos) {
             FinSelectedReceivablesDetailed finSelectedReceivablesDetailed = new FinSelectedReceivablesDetailed();
             finSelectedReceivablesDetailed.setCurrentReceivableMoney(paymentDetail.getReceivable());
+            finSelectedReceivablesDetailed.setPurchaseSystemSid(finCollectionConfirmation.getPurchaseSystemSid());
+            finSelectedReceivablesDetailed.setPurchaseSystemName(finCollectionConfirmation.getPurchaseSystemName());
             finSelectedReceivablesDetailed.setVIN(paymentDetail.getVin());
             finSelectedReceivablesDetailed.setSubscriptionMoney(paymentDetail.getConfirmMoney());
             finSelectedReceivablesDetailed.setContractNo(paymentDetail.getContractId());