退车审批通过删除推送的单车返利条件：分公司、车架号、返利类型为金融贴息（编码 029）

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java

@@ -746,7 +746,7 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService<BusSa
                         //修改出库申请车辆状态
                         busDeliveredApplyDetailsService.updateIsDel(vehSid);
                         //删除推送的单车返利管理
-                        scmVehRebateFeign.delByVehSid(vehSid);
+                        scmVehRebateFeign.delByVehSid(vehSid,busSalesOrderReturnVehApply.getUseOrgSid(),"029");
                     }
                     //------------------------修改车辆持久状态--------------------------
                     BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleService.fetchBySid(busSalesOrderReturnVehDetailsVo.getBusVinSid());

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java

@@ -149,4 +149,9 @@ public interface ScmVehRebateFeign {
     @DeleteMapping("/delByVehSid")
     @ResponseBody
     ResultBean delByVehSid(@RequestParam("vehSid") String vehSid);
+
+    @ApiOperation("根据车辆sid、分公司sid、返利类型key删除单车返利记录")
+    @DeleteMapping("/delByVehSid2")
+    @ResponseBody
+    ResultBean delByVehSid2(@RequestParam("vehSid") String vehSid,@RequestParam("useOrgSid") String useOrgSid,@RequestParam("key") String key);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeignFallback.java

@@ -143,4 +143,9 @@ public class ScmVehRebateFeignFallback implements ScmVehRebateFeign {
 	public ResultBean delByVehSid(String vehSid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean delByVehSid2(String vehSid, String useOrgSid, String key) {
+		return null;
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java

@@ -87,4 +87,6 @@ public interface ScmVehRebateMapper extends BaseMapper<ScmVehRebate> {
     List<ScmVehRebateVo> checkApplyGetVehRebateAll(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
 
     List<ScmVehRebateVo> listAll(@Param(Constants.WRAPPER) QueryWrapper<ScmVehRebate> qw);
+
+    int delByVehSid2(@Param("vehSid") String vehSid, @Param("useOrgSid") String useOrgSid, @Param("key") String key);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.xml

@@ -87,7 +87,7 @@
 
     <update id="updateOneExcelInfo">
         UPDATE
-                scm_veh_rebate
+            scm_veh_rebate
         SET uploadDate            = #{uploadDate},
             uploadMoney           = #{uploadMoney},
             onceTreatCost         = #{onceTreatCost},
@@ -104,7 +104,7 @@
 
     <update id="updateTwoExcelInfo">
         UPDATE
-                scm_veh_rebate
+            scm_veh_rebate
         SET secondaryUploadDate  = #{secondaryUploadDate},
             secondaryUploadMoney = #{secondaryUploadMoney},
             secondTreatCost      = #{secondTreatCost},
@@ -159,4 +159,12 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <delete id="delByVehSid2">
+        delete
+        from scm_veh_rebate
+        where vehSid = #{vehSid}
+          and useOrgSid = #{useOrgSid}
+          and rebateTypeKey = #{key}
+    </delete>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateRest.java

@@ -228,4 +228,9 @@ public class ScmVehRebateRest implements ScmVehRebateFeign {
     public ResultBean delByVehSid(String vehSid) {
         return scmVehRebateService.delByVehSid(vehSid);
     }
+
+    @Override
+    public ResultBean delByVehSid2(String vehSid, String useOrgSid, String key) {
+        return scmVehRebateService.delByVehSid2(vehSid,useOrgSid,key);
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -2095,6 +2095,12 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
         return rb.success();
     }
 
+    public ResultBean delByVehSid2(String vehSid,String useOrgSid,String key) {
+        ResultBean rb = ResultBean.fireFail();
+        baseMapper.delByVehSid2(vehSid,useOrgSid,key);
+        return rb.success();
+    }
+
     public List<ScmVehRebateExcelVo> excelList(ScmVehRebateQuery query) {
         QueryWrapper<ScmVehRebate> qw = new QueryWrapper<>();
         //========================================数据授权开始