修改

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

@@ -1946,6 +1946,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 if ("0".equals(affiliatedType)) {
                     baseMapper.updateCompanySidBySid(dto.getSid());
                 }
+                //如果选择的为自有资金的，需要删除金融方案
+                if ("1".equals(busSalesOrder.getFinancePlan())) {
+                    //删除和该销售订单相关的金融方案
+                    ResultBean deleteResultBean = loanSolutionsFeign.deleteByOrderSid(busSalesOrder.getSid());
+                }
                 sid = busSalesOrder.getSid();
             }
         }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeign.java

@@ -6,10 +6,7 @@ import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * Project: anrui-riskcenter(风控中心) <br/>
@@ -44,6 +41,10 @@ public interface LoanSolutionsFeign {
     @GetMapping("/selectDetailss")
     ResultBean<SolutionsDetailsVo> selectDetailss(String businessSid);
 
+    @ApiOperation("删除该销售订单的金融方案")
+    @DeleteMapping("/deleteByOrderSid")
+    ResultBean deleteByOrderSid(@RequestParam("sid")String sid);
+
   /*  @ApiOperation("根据条件分页查询数据的列表")
     @PostMapping("/listPage")
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(@RequestBody PagerQuery<LoanSolutionsQuery> pq);

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansolutions/LoanSolutionsFeignFallback.java

@@ -35,6 +35,11 @@ public class LoanSolutionsFeignFallback implements LoanSolutionsFeign {
         return null;
     }
 
+    @Override
+    public ResultBean deleteByOrderSid(String sid) {
+        return null;
+    }
+
   /*  @Override
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(PagerQuery<LoanSolutionsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsRest.java

@@ -45,6 +45,11 @@ public class LoanSolutionsRest implements LoanSolutionsFeign {
         return loanSolutionsService.selectDetailss(businessSid);
     }
 
+    @Override
+    public ResultBean deleteByOrderSid(String sid) {
+        return loanSolutionsService.deleteByOrderSid(sid);
+    }
+
   /*  @Override
     public ResultBean<PagerVo<LoanSolutionsVo>> listPage(@RequestBody PagerQuery<LoanSolutionsQuery> pq) {
         ResultBean rb = ResultBean.fireFail();

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansolutions/LoanSolutionsService.java

@@ -241,7 +241,7 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutions.setPolicyYearRatio(policyYearRatio);
             //月还金额
             String loanPayMoney = dto.getLoanPayMoney();
-             BigDecimal monthlyRepay1 = new BigDecimal(BigInteger.ZERO);
+            BigDecimal monthlyRepay1 = new BigDecimal(BigInteger.ZERO);
             if (StringUtils.isNotBlank(loanPayMoney)) {
                 loanSolutions.setLoanPayMoney(new BigDecimal(loanPayMoney));
                 monthlyRepay1 = monthlyRepay1.add(new BigDecimal(loanPayMoney));
@@ -524,6 +524,18 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
         }
         return rb.success().setData(solutionsDetailsVo);
     }
+
+    public ResultBean deleteByOrderSid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        //查询金融方案
+        LoanSolutions loanSolutions = baseMapper.selectBySaleOrderSid(sid);
+        if (loanSolutions != null) {
+            baseMapper.deleteByOrderSid(sid);
+            loanSolutionsOtherpolicyService.deleteByLoanSid(loanSolutions.getSid());
+            loanSolutionsDetailService.deleteByLoanSid(loanSolutions.getSid());
+        }
+        return rb.success();
+    }
   /*  @Autowired
     private LoanSolutionsTopService loanSolutionsTopService;
     @Autowired

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java

@@ -55,7 +55,7 @@ public class AppSolutionsDto implements Dto {
     @ApiModelProperty("贷款金额")
     private String loanAmount;
     @ApiModelProperty("贷款期数")
-    private int loanPeriod;
+    private String loanPeriod;
     @ApiModelProperty("贷款保证金比例")
     private String bondRatio;
     @ApiModelProperty("贷款保证金金额")
@@ -76,7 +76,7 @@ public class AppSolutionsDto implements Dto {
     @ApiModelProperty("其它融贷款金额")
     private String otherPolicyAmount;
     @ApiModelProperty("其它融期数")
-    private Integer otherPolicyPeriod;
+    private String otherPolicyPeriod;
     @ApiModelProperty("其它融月还")
     private String otherPolicyMonthlyRepay;
     @ApiModelProperty("其它融利息总额")
@@ -87,7 +87,7 @@ public class AppSolutionsDto implements Dto {
     @ApiModelProperty("总贷款金额")
     private String loanAmountTotal;
     @ApiModelProperty("期数")
-    private Integer period;
+    private String period;
     @ApiModelProperty("月还金额")
     private String monthlyRepay;
     @ApiModelProperty("利息总额")