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

@@ -208,7 +208,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param configSid
      * @return
      */
-    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid,@Param("name")String name);
+    List<AppVinsDetailsVo> getVins(@Param("modelSid") String modelSid, @Param("configSid") String configSid, @Param("state") String state, @Param("orgSid") String orgSid, @Param("name") String name);
 
     /**
      * 现车分页列表（新）
@@ -325,7 +325,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      */
     IPage<BaseVehicleActualVo> vehicleActualPageList(IPage<BaseVehicleActualVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    IPage<PcBaseVehicleOrderVo> selectVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw,@Param("list") List<String> list);
+    IPage<PcBaseVehicleOrderVo> selectVo(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("list") List<String> list);
 
     /**
      * 手机端-配置列表获取现车列表
@@ -343,7 +343,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
      * @param qw 查询条件
      * @return
      */
-    Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw,@Param("list")List<String> list);
+    Integer selectVehicleCount(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw, @Param("list") List<String> list);
 
     /**
      * 根据车型sid配置sid分公司sid查询车型名称等
@@ -381,7 +381,8 @@ 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);
+
+    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);
 
@@ -448,7 +449,7 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<BaseVehicleRebateVo> vehicleRebatePageList(IPage<BaseVehicleRebateVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     @Update("update base_vehicle set vehicleState = #{vehicleState},vehicleStateValue = #{vehicleStateValue},salePrice = #{salePrice},salesDate = NOW() where vinNo = #{vinNo} and createOrgSid = #{callOutOrgSid} and vehicleState != '0004'")
-    void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid);
+    void updateCallOutVehicleState(@Param("vehicleState") String vehicleState, @Param("vehicleStateValue") String vehicleStateValue, @Param("salePrice") Integer salePrice, @Param("vinNo") String vinNo, @Param("callOutOrgSid") String callOutOrgSid);
 
     @Update("update base_vehicle set vinNo = #{vinNo} where sid = #{vehicleSid}")
     void updateVinNoByVehSid(@Param("vinNo") String vinNo, @Param("vehicleSid") String vehicleSid);
@@ -470,18 +471,18 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     IPage<PayBaseVehicleVo> selectPayVehicleList(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     @Update("update base_vehicle set salePrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callOutOrgSid}")
-    void updateSalePrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callOutOrgSid") String callOutOrgSid);
+    void updateSalePrice(@Param("witPinMoney") String witPinMoney, @Param("vinNo") String vinNo, @Param("callOutOrgSid") String callOutOrgSid);
 
     @Update("update base_vehicle set contractPrice = #{witPinMoney},costPrice = #{witPinMoney} where vinNo = #{vinNo} and useOrgSid = #{callInOrgSid}")
-    void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid);
+    void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney, @Param("vinNo") String vinNo, @Param("callInOrgSid") String callInOrgSid);
 
-    IPage<BaseVehicleCrmVo> vehicleCrmPageList(IPage<BaseVehicleCrmVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    IPage<BaseVehicleCrmVo> vehicleCrmPageList(IPage<BaseVehicleCrmVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    IPage<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    IPage<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(IPage<BaseVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(IPage<BaseChoiceVehicleVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    IPage<BaseChoiceVehicleVo> vehicleCollectionPageList(IPage<BaseChoiceVehicleVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
-    IPage<VehicleModelPriceVo> getStockModelList(IPage<VehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<VehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey,@Param("lable") String lable);
+    IPage<VehicleModelPriceVo> getStockModelList(IPage<VehicleModelPriceQuery> page, @Param(Constants.WRAPPER) QueryWrapper<VehicleModelPriceVo> qw, @Param("useOrgSid") String useOrgSid, @Param("lockedStateKey") String lockedStateKey, @Param("lable") String lable);
 
     List<AppBaseVinNowCarVo> getStockModelNowCarList(@Param(Constants.WRAPPER) QueryWrapper<AppBaseVinNowCarVo> qw);
 
@@ -495,16 +496,18 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     void updateVehicleStateAndSaleDate(String sid);
 
     @Update("update base_vehicle set lockedState = #{code},lockedStateValue = #{remarks} where sid = #{vehSid}")
-    ResultBean updateLockedState(@Param("vehSid") String vehSid,@Param("code") String code,@Param("remarks") String remarks);
+    ResultBean updateLockedState(@Param("vehSid") String vehSid, @Param("code") String code, @Param("remarks") String remarks);
 
     //导出车辆台账信息
     List<BaseVehicleExportVo> selByExcel(@Param(Constants.WRAPPER) QueryWrapper<BaseVehicleExportVo> qw);
 
-    IPage<BaseVehicleQKKPVo> vehicleQKKPPageList(IPage<BaseVehicleQKKPVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+    IPage<BaseVehicleQKKPVo> vehicleQKKPPageList(IPage<BaseVehicleQKKPVo> page, @Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 
     void updateStateForReturnVeh(String vehSid);
 
     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

@@ -644,7 +644,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             return rb.setMsg("已存在该车架号的车辆信息");
         }*/
         BeanUtil.copyProperties(dto, baseVehicle);
-        if (StringUtils.isBlank(dto.getSalesDate())){
+        if (StringUtils.isBlank(dto.getSalesDate())) {
             baseVehicle.setSalesDate(null);
         }
         //修改存放地点编码
@@ -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();
@@ -277,11 +279,11 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             finPaymentapply.setUseOrgName(organizationVo.getName());
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
             if (detailsList != null && detailsList.size() > 0) {
-                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply);
+                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(), finPaymentapply);
                 finPaymentapply.setPaymentTotal(new BigDecimal(i));
             }
 
-            if ("004".equals(dto.getCostTypeKey())){//融资付款
+            if ("004".equals(dto.getCostTypeKey())) {//融资付款
                 List<FinPaymentapplyEveDto> eveList = dto.getEveList();
                 for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) {
                     finPaymentapplyEveDto.setApplySid(finPaymentapply.getSid());
@@ -299,7 +301,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
             }
 
-            if ("002".equals(dto.getCostTypeKey())){//挂车采购
+            if ("002".equals(dto.getCostTypeKey())) {//挂车采购
                 List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
                 for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) {
                     finPaymentapplyTrailerDto.setApplySid(finPaymentapply.getSid());
@@ -307,7 +309,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
             }
 
-            if ("003".equals(dto.getCostTypeKey())){//上装采购
+            if ("003".equals(dto.getCostTypeKey())) {//上装采购
                 List<FinPaymentapplyTopDto> topList = dto.getTopList();
                 for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) {
                     finPaymentapplyTopDto.setApplySid(finPaymentapply.getSid());
@@ -326,7 +328,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
 
             List<FinPaymentapplyDetailDto> detailsList = dto.getDetailsList();
             if (detailsList != null && detailsList.size() > 0) {
-                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(),finPaymentapply);
+                String i = finPaymentapplyDetailsService.saveDetailsList(detailsList, finPaymentapply.getSid(), finPaymentapply);
                 finPaymentapply.setPaymentTotal(new BigDecimal(i));
             }
 
@@ -344,7 +346,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
             finPaymentapplyTopService.delByMainSid(dtoSid);
             finPaymentapplyEveService.delByMainSid(dtoSid);
 
-            if ("004".equals(dto.getCostTypeKey())){//融资付款
+            if ("004".equals(dto.getCostTypeKey())) {//融资付款
                 List<FinPaymentapplyEveDto> eveList = dto.getEveList();
                 for (FinPaymentapplyEveDto finPaymentapplyEveDto : eveList) {
                     finPaymentapplyEveDto.setApplySid(dtoSid);
@@ -352,7 +354,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
             }
 
-            if ("002".equals(dto.getCostTypeKey())){//挂车采购
+            if ("002".equals(dto.getCostTypeKey())) {//挂车采购
                 List<FinPaymentapplyTrailerDto> trailerList = dto.getTrailerList();
                 for (FinPaymentapplyTrailerDto finPaymentapplyTrailerDto : trailerList) {
                     finPaymentapplyTrailerDto.setApplySid(dtoSid);
@@ -360,7 +362,7 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                 }
             }
 
-            if ("003".equals(dto.getCostTypeKey())){//上装采购
+            if ("003".equals(dto.getCostTypeKey())) {//上装采购
                 List<FinPaymentapplyTopDto> topList = dto.getTopList();
                 for (FinPaymentapplyTopDto finPaymentapplyTopDto : topList) {
                     finPaymentapplyTopDto.setApplySid(dtoSid);
@@ -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();