Merge remote-tracking branch 'origin/master'

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

@@ -160,7 +160,9 @@ import com.yxt.anrui.portal.api.sysuser.app.AppUserOrgInfoVo;
 import com.yxt.anrui.portal.config.DictCommonType;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionListVo;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionssVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetailFeign;
 import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy;
@@ -3781,7 +3783,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     }
 
     private AppOrderDetailsVo selectSolutions(AppOrderDetailsVo appOrderDetailsVo, String sid) {
-        ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
+       /* ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
         List<OrderSolutionVo> list = new ArrayList<>();
         if (solutionsDetailsVoResultBean.getData() != null) {
             SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
@@ -4304,7 +4306,16 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 list.add(getValueSpanSize(nominalPriceValue.toString(), 2, 0, false));
             }
         }
-        appOrderDetailsVo.setFinanceForms(list);
+        appOrderDetailsVo.setFinanceForms(list);*/
+
+        ResultBean<SolutionssVo> resultBean = loanSolutionsFeign.selectDetails2(sid);
+        if (resultBean.getData() != null) {
+            List<SolutionListVo> financeForms = resultBean.getData().getFinanceForms();
+            if(!financeForms.isEmpty()){
+                List<OrderSolutionVo> voList = Optional.ofNullable(financeForms).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), OrderSolutionVo.class)).collect(Collectors.toList());
+                appOrderDetailsVo.setFinanceForms(voList);
+            }
+        }
         return appOrderDetailsVo;
     }
 

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

@@ -837,16 +837,22 @@ public class LoanSolutionsService extends MybatisBaseService<LoanSolutionsMapper
             loanSolutions.setOtherPolicyState(1);
             String loanDownPay = dto.getLoanDownPay();
             loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
-            loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
+
-            loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
         } else {
-            /*BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
+            BeanUtil.copyProperties(dto, loanSolutionsOtherpolicy, "sid");
             String loanDownPay = dto.getLoanDownPay();
-            loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);*/
+            loanSolutionsOtherpolicy.setLoanDownPay(StringUtils.isNotBlank(loanDownPay) ? new BigDecimal(loanDownPay) : BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyAmount(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyInterest(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyMonthlyRepay(BigDecimal.ZERO);
+            loanSolutionsOtherpolicy.setOtherPolicyPeriod("");
+            loanSolutionsOtherpolicy.setOtherPolicyYearRatio("");
+            loanSolutionsOtherpolicy.setOtherPolicyName("");
             loanSolutions.setOtherPolicyState(0);
         }
         baseMapper.insert(loanSolutions);
-
+        loanSolutionsOtherpolicy.setSolutionsSid(loanSolutions.getSid());
+        loanSolutionsOtherpolicyService.insert(loanSolutionsOtherpolicy);
         /***********************应收明细************************************/
         LoanSolutionsDetail loanSolutionsDetail = new LoanSolutionsDetail();
         BeanUtil.copyProperties(dto, loanSolutionsDetail, "sid");