Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java

@@ -543,4 +543,9 @@ public interface BaseVehicleFeign {
     @PostMapping("/selectVinNo")
     @ResponseBody
     ResultBean<Integer> selectVinNo(String vinNo);
+
+    @ApiOperation("根据车辆sid修改买断状态为预买断")
+    @PostMapping("/updateVehicleYmd")
+    @ResponseBody
+    ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java

@@ -442,6 +442,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue) {
+        return null;
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid,List<String> list) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -381,6 +381,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @return
      */
     List<AppBaseVehicleOrderVo> selectAppList(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid, @Param("state") String state);
+
     List<AppBaseVehicleOrderVo> selectAppListOne(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("orgSid") String orgSid, @Param("state") String state, @Param("list") List<String> list);
 
     String selectImage(String vehicleSid);
@@ -507,4 +508,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     int selectVinNo(String vinNo);
 
     BaseVehicle selOneByVinNo(@Param("substringVinNo") String substringVinNo);
+
+    void updateVehicleYmd(@Param("vehiSid") String vehiSid, @Param("settlementStatus") String settlementStatus, @Param("settlementStatusValue") String settlementStatusValue);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1826,4 +1826,12 @@
         WHERE bv.isDelete = '0'
           AND bv.vinNo LIKE CONCAT('%', #{substringVinNo}, '%')
     </select>
+
+    <update id="updateVehicleYmd">
+        UPDATE
+            base_vehicle
+        SET settlementStatus      = #{settlementStatus},
+            settlementStatusValue = #{settlementStatusValue}
+        WHERE sid = #{vehiSid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -1517,6 +1517,11 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return baseVehicleService.selectVinNo(vinNo);
     }
 
+    @Override
+    public ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue) {
+        return baseVehicleService.updateVehicleYmd(vehiSid, settlementStatus, settlementStatusValue);
+    }
+
     @Override
     public ResultBean<List<AppBaseVehicleOrderVo>> selectAppListOne(String modelSid, String configSid, String orgSid, List<String> list) {
         return baseVehicleService.selectAppListOne(modelSid, configSid, orgSid, list);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -4431,4 +4431,10 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         BaseVehicle baseVehicle = baseMapper.selOneByVinNo(substringVinNo);
         return rb.success().setData(baseVehicle);
     }
+
+    public ResultBean updateVehicleYmd(String vehiSid, String settlementStatus, String settlementStatusValue) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.updateVehicleYmd(vehiSid, settlementStatus, settlementStatusValue);
+        return rb.success();
+    }
 }

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -154,6 +154,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
     private FinCompanyInvoicingService finCompanyInvoicingService;
     @Autowired
     private MessageFeign messageFeign;
+    @Autowired
+    private BaseVehicleFeign baseVehicleFeign;
 
     public PagerVo<FinPaymentapplyVo> listPageVo(PagerQuery<FinPaymentapplyQuery> pq) {
         FinPaymentapplyQuery query = pq.getParams();
@@ -725,6 +727,14 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         }
                     }
                 }
+                List<FinPaymentapplyVehicleVo> vehicleList = vo.getVehicleList();
+                if (vehicleList.size() > 0) {
+                    for (FinPaymentapplyVehicleVo finPaymentapplyVehicleVo : vehicleList) {
+                        if ("1".equals(finPaymentapplyVehicleVo.getIsSettle())) {
+                            baseVehicleFeign.updateVehicleYmd(finPaymentapplyVehicleVo.getVehiSid(), "1", "预买断");
+                        }
+                    }
+                }
             } else {
                 //极光推送
                 UpdateFlowFieldVo ufVo = resultBean.getData();