优化欠款提车

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/SolutionsDetailsssVo.java

@@ -151,4 +151,11 @@ public class SolutionsDetailsssVo {
     @ApiModelProperty("名义留购价")
     private String nominalPrice;
 
+    @ApiModelProperty("单台成交价")
+    private String finalPrice;
+    @ApiModelProperty("挂车价格")
+    private String gcPrice;
+    @ApiModelProperty("上装成交价")
+    private String szPrice;
+
 }

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

@@ -306,6 +306,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
 
     @Autowired
     private LoanSolutionsOtherpolicyFeign loanSolutionsOtherpolicyFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
 
     /**
      * 构造查询条件
@@ -6384,6 +6386,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 qw.notIn("bv.sid", stringList);
             }
         }
+        //查询是否存在应收未收款项
+        ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByCreateBySidOne(userSid);
+        if(!listResultBean.getData().isEmpty()){
+            listResultBean.getData().removeAll(Collections.singleton(null));
+            qw.notIn("bv.sid",listResultBean.getData());
+        }
         List<String> stringList = baseMapper.selectBusinessSid(userSid, useOrgSid, qw);
         stringList.removeAll(Collections.singleton(null));
         return rb.success().setData(stringList);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -49,6 +49,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
 import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
 import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailedFeign;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -93,6 +94,8 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     private BaseVehicleTempstateFeign baseVehicleTempstateFeign;
     @Autowired
     private FinBillVehicleFeign finBillVehicleFeign;
+    @Autowired
+    private FinUncollectedReceivablesDetailedFeign finUncollectedReceivablesDetailedFeign;
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         if (list.size() > 0) {
@@ -331,6 +334,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 qw.notIn("bv.linkSid", vinSidList);
             }
         }
+        //查询是否存在应收未收款项
+        ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(query.getContractNo());
+        if(!listResultBean.getData().isEmpty()){
+            listResultBean.getData().removeAll(Collections.singleton(null));
+            qw.notIn("bv.sid",listResultBean.getData());
+        }
         List<QCarVo> list = baseMapper.getCanUseCars(qw);
         list.removeAll(Collections.singleton(null));
         if (!list.isEmpty()) {
@@ -390,6 +399,12 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
                 qw.notIn("bv.linkSid", vinSidList);
             }
         }
+        //查询是否存在应收未收款项
+        ResultBean<List<String>> listResultBean = finUncollectedReceivablesDetailedFeign.selectByContractNoOne(params.getContractNo());
+        if(!listResultBean.getData().isEmpty()){
+            listResultBean.getData().removeAll(Collections.singleton(null));
+            qw.notIn("bv.sid",listResultBean.getData());
+        }
         IPage<QCarVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<QCarVo> p = PagerUtil.pageToVo(pagging, null);
         List<QCarVo> list = pagging.getRecords();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeign.java

@@ -108,4 +108,11 @@ public interface FinUncollectedReceivablesDetailedFeign {
     @GetMapping("/receivedSelect")
     ResultBean<ReceiveInvoiceVo> receivedSelect(@RequestParam("busVinSid") String busVinSid, @RequestParam("vinSid") String vinSid);
 
+    @ApiOperation("查询车辆的应收未收款项")
+    @GetMapping("/selectByContractNoOne")
+    ResultBean<List<String>> selectByContractNoOne(@RequestParam("contractNo") String contractNo);
+
+    @ApiOperation("查询车辆的应收未收款项")
+    @GetMapping("/selectByCreateBySidOne")
+    ResultBean<List<String>> selectByCreateBySidOne(@RequestParam("userSid") String userSid);
 }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedFeignFallback.java

@@ -116,4 +116,14 @@ public class FinUncollectedReceivablesDetailedFeignFallback implements FinUncoll
 		return null;
 	}
 
+	@Override
+	public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
+		return null;
+	}
+
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.java

@@ -95,4 +95,8 @@ public interface FinUncollectedReceivablesDetailedMapper extends BaseMapper<FinU
 
     @Select("SELECT sid FROM fin_uncollected_receivables_detailed WHERE busVinSid = #{sid}")
     List<String> fetchYsSidByOrderVehSid(String sid);
+
+    List<String> selectByContractNoOne(String contractNo);
+
+    List<String> selectByCreateBySidOne(String userSid);
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedMapper.xml

@@ -148,4 +148,14 @@
         WHERE
             furd.busVinSid = #{busVinSid}
     </select>
+
+    <select id="selectByContractNoOne" resultType="java.lang.String">
+        select distinct fun.busVinSid from fin_uncollected_receivables_detailed fun
+        where fun.contractNo = #{contractNo} and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney=0)
+    </select>
+
+    <select id="selectByCreateBySidOne" resultType="java.lang.String">
+        select distinct fun.busVinSid from fin_uncollected_receivables_detailed fun
+        where fun.createBySid = #{userSid} and (fun.currentReceivableMoney &lt; 0 or fun.currentReceivableMoney=0)
+    </select>
 </mapper>

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedRest.java

@@ -137,6 +137,16 @@ public class FinUncollectedReceivablesDetailedRest implements FinUncollectedRece
         return finUncollectedReceivablesDetailedService.receivedSelect(busVinSid, vinSid);
     }
 
+    @Override
+    public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
+        return finUncollectedReceivablesDetailedService.selectByContractNoOne(contractNo);
+    }
+
+    @Override
+    public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
+        return finUncollectedReceivablesDetailedService.selectByCreateBySidOne(userSid);
+    }
+
 
     @Override
     public ResultBean<List<FinUncollectedReceivablesDetailed>> selectByContractNo(String contractNo) {

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailed/FinUncollectedReceivablesDetailedService.java

@@ -210,7 +210,7 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
                     } else {
                         if ("2".equals(v.getPayTypeKey())) {
                             v.setVIN(temporaryNo.substring(temporaryNo.length() - 2));
-                        }else{
+                        } else {
                             v.setVIN(temporaryNo);
                         }
                     }
@@ -779,4 +779,16 @@ public class FinUncollectedReceivablesDetailedService extends MybatisBaseService
     public List<String> fetchYsSidByOrderVehSid(String sid) {
         return baseMapper.fetchYsSidByOrderVehSid(sid);
     }
+
+    public ResultBean<List<String>> selectByContractNoOne(String contractNo) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.selectByContractNoOne(contractNo);
+        return rb.success().setData(stringList);
+    }
+
+    public ResultBean<List<String>> selectByCreateBySidOne(String userSid) {
+        ResultBean<List<String>> rb = ResultBean.fireFail();
+        List<String> stringList = baseMapper.selectByCreateBySidOne(userSid);
+        return rb.success().setData(stringList);
+    }
 }