完善金融方案变更初始化接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussolutionschange/BusSolutionsChangeFeign.java

@@ -123,7 +123,7 @@ public interface BusSolutionsChangeFeign {
     @ApiOperation("变更初始化")
     @GetMapping("/solutionsInit")
     @ResponseBody
-    public ResultBean<AppSolutionChangeVo> solutionsInit(@RequestParam("orderSid") String orderSid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+    public ResultBean<AppSolutionChangeVo> solutionsInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
 
     @ApiOperation("保存修改")
     @PostMapping("/saveAppSolutions")
@@ -131,9 +131,9 @@ public interface BusSolutionsChangeFeign {
     public ResultBean<String> saveAppSolutions(@RequestBody AppSolutionssChangeDto dto);
 
     @ApiOperation("详情、编辑回显")
-    @GetMapping("/appDetails/{sid}")
+    @GetMapping("/appDetails")
     @ResponseBody
-    public ResultBean<AppSolutionChangeVo> appDetails(@PathVariable("sid") String sid);
+    public ResultBean<AppSolutionChangeVo> appDetails(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
 
     @ApiOperation("移动端-删除")
     @DeleteMapping("/deleteSolution/{sid}")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussolutionschange/BusSolutionsChangeFeignFallback.java

@@ -100,7 +100,7 @@ public class BusSolutionsChangeFeignFallback implements BusSolutionsChangeFeign
     }
 
     @Override
-    public ResultBean<AppSolutionChangeVo> appDetails(String sid) {
+    public ResultBean<AppSolutionChangeVo> appDetails(String sid, String userSid, String orgPath) {
         return null;
     }
 

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

@@ -110,6 +110,7 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.api.bussolutionschange.BusSolutionsChange;
 import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyService;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
@@ -126,6 +127,7 @@ import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.buscenter.biz.bussalesordersubmit.BusSalesOrderSubmitService;
 import com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleService;
 import com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderService;
+import com.yxt.anrui.buscenter.biz.bussolutionschange.BusSolutionsChangeService;
 import com.yxt.anrui.crm.api.crmcustomertemp.AppCrmCustomerTempInfoVo;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
 import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
@@ -346,6 +348,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     private BusSalesOrderBorrowerService busSalesOrderBorrowerService;
     @Autowired
     private LoanHomevisitPrepFeign loanHomevisitPrepFeign;
+    @Autowired
+    private BusSolutionsChangeService busSolutionsChangeService;
 
     /**
      * 构造查询条件
@@ -1994,6 +1998,26 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             if (StringUtils.isBlank(record.getClosingDate())) {
                 record.setClosingDate("-");
             }
+            record.setShowFinancialBtn(false);
+            if (StringUtils.isNotBlank(record.getSaleOrderState())) {
+                if (record.getSaleOrderState().equals("已办结")) {
+                    //查询金融方案
+                    LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(record.getSaleOrderSid()).getData();
+                    if (solutions != null) {
+                        String solutionsSid = solutions.getSid();
+                        BusSolutionsChange busSolutionsChange = busSolutionsChangeService.selectBySolutionSid(solutionsSid);
+                        if (null != busSolutionsChange) {
+                            if (busSolutionsChange.getNodeState().equals("终止") || busSolutionsChange.getNodeState().equals("已办结")) {
+                                record.setShowFinancialBtn(true);
+                            }
+                        } else {
+                            record.setShowFinancialBtn(true);
+                        }
+                    }
+                }
+            }
+
+
            /* ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.getContractBySalesOrderSid(record.getSaleOrderSid());
             if (commonContractVoResultBean.getData() != null) {
                 record.setContractId(commonContractVoResultBean.getData().getContractNo());
@@ -6966,18 +6990,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             busSalesOrderIsDTKPJVo.setIsEdit(true);
             busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
         }*/
-        if("1".equals(busSalesOrder.getPayTypeKey())){
+        if ("1".equals(busSalesOrder.getPayTypeKey())) {
             busSalesOrderIsDTKPJVo.setIsEdit(true);
            /* if(busSalesOrder.getOneBillMoney() != null){
                 busSalesOrderIsDTKPJVo.setOneBillMoney(busSalesOrder.getOneBillMoney().toString());
             }*/
 
 
-        }else{
+        } else {
             busSalesOrderIsDTKPJVo.setIsEdit(false);
             LoanSolutions loanSolutions = baseMapper.seletByOrderSid(busSalesOrder.getSid());
-            if(loanSolutions != null){
+            if (loanSolutions != null) {
-                if(loanSolutions.getMainVehicleAmount() != null){
+                if (loanSolutions.getMainVehicleAmount() != null) {
                     busSalesOrderIsDTKPJVo.setOneBillMoney(loanSolutions.getMainVehicleAmount().toString());
                 }
             }
@@ -7552,9 +7576,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     confirmNum = confirmNum;
                 }
                 //查询车架号后8位
-                List<String> vinsList = busSalesOrderVehicleService.selectVinNos(sid,saleOrderSid);
+                List<String> vinsList = busSalesOrderVehicleService.selectVinNos(sid, saleOrderSid);
-                if(!vinsList.isEmpty()){
+                if (!vinsList.isEmpty()) {
-                    String vin = String.join("\n",vinsList);
+                    String vin = String.join("\n", vinsList);
                     lenderVo.setVins(vin);
                 }
             }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeMapper.java

@@ -52,4 +52,6 @@ public interface BusSolutionsChangeMapper extends BaseMapper<BusSolutionsChange>
     IPage<BusSolutionsChangeVo> listPage(IPage<BusSolutionsChange> page,@Param(Constants.WRAPPER) QueryWrapper<BusSolutionsChange> qw);
 
     int updateFlowFiled(Map<String, Object> map);
+
+    BusSolutionsChange selectBySolutionSid(String solutionsSid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeMapper.xml

@@ -40,4 +40,11 @@
             ${ew.sqlSegment}
         </where>
     </select>
+    <select id="selectBySolutionSid"
+            resultType="com.yxt.anrui.buscenter.api.bussolutionschange.BusSolutionsChange">
+        select *
+        from bus_solutions_change
+        where solutionsSid = #{solutionsSid}
+          and isDelete = 0
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeRest.java

@@ -138,8 +138,8 @@ public class BusSolutionsChangeRest implements BusSolutionsChangeFeign {
     }
 
     @Override
-    public ResultBean<AppSolutionChangeVo> solutionsInit(String orderSid, String userSid, String orgPath) {
+    public ResultBean<AppSolutionChangeVo> solutionsInit(String sid, String userSid, String orgPath) {
-        return busSolutionsChangeService.solutionsInit(orderSid, userSid, orgPath);
+        return busSolutionsChangeService.solutionsInit(sid, userSid, orgPath);
     }
 
     @Override
@@ -148,8 +148,8 @@ public class BusSolutionsChangeRest implements BusSolutionsChangeFeign {
     }
 
     @Override
-    public ResultBean<AppSolutionChangeVo> appDetails(String sid) {
+    public ResultBean<AppSolutionChangeVo> appDetails(String sid,String userSid, String orgPath) {
-        return busSolutionsChangeService.appDetails(sid);
+        return busSolutionsChangeService.appDetails(sid,userSid,orgPath);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussolutionschange/BusSolutionsChangeService.java

@@ -503,6 +503,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         variables.put("businessSid", businessSid);
         appMap.put("sid", businessSid);
         appMap.put("noCalc", true);
+        appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails");
         variables.put("app", appMap);
         BusSolutionsChange busSolutionsChange1 = fetchBySid(businessSid);
         String msgBusinessSid = busSolutionsChange1.getSid();
@@ -586,6 +587,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
             variables.put("businessSid", businessSid);
             appMap.put("sid", businessSid);
             appMap.put("noCalc", true);
+            appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails");
             variables.put("app", appMap);
             bv.setFormVariables(variables);
             ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
@@ -665,6 +667,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
                 Map<String, Object> appMap = new HashMap<>();
                 appMap.put("sid", businessSid);
                 appMap.put("noCalc", true);
+                appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails");
                 variables.put("app", appMap);
                 //若有网关，则赋值网关中判断的字段。
                 flowTaskVo.setValues(variables);
@@ -798,17 +801,17 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
     }
 
     //----------------------------------app---------------------------------------
-    public ResultBean<AppSolutionChangeVo> solutionsInit(String orderSid, String userSid, String orgPath) {
+    public ResultBean<AppSolutionChangeVo> solutionsInit(String sid, String userSid, String orgPath) {
         ResultBean<AppSolutionChangeVo> rb = ResultBean.fireFail();
         AppSolutionChangeVo vo = new AppSolutionChangeVo();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        SolutionssVo solutionssVo = loanSolutionsFeign.selectDetails2(orderSid).getData();
+        SolutionssVo solutionssVo = loanSolutionsFeign.selectDetails2(sid).getData();
         if (null != solutionssVo) {
             BeanUtil.copyProperties(solutionssVo, vo);
         }
         vo.setUserSid(userSid);
         vo.setOrgPath(orgPath);
-        vo.setOrderSid(orderSid);
+        vo.setOrderSid(sid);
         vo.setApplyDate(sdf.format(new Date()));
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(userSid).getData();
         if (null != sysUserVo) {
@@ -827,7 +830,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
             vo.setPublishInfo(vo.getDept() + "-" + vo.getApplyName());
         }
         //销售订单信息
-        BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(orderSid);
+        BusSalesOrder salesOrder = busSalesOrderService.fetchBySid(sid);
         if (null != salesOrder) {
             if (StringUtils.isNotBlank(salesOrder.getAffiliatedCompany())) {
                 vo.setAffiliatedCompany(salesOrder.getAffiliatedCompany());
@@ -938,6 +941,13 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
                 LoanSolutions solutions = loanSolutionsFeign.getOneByOrderSid(dto.getOrderSid()).getData();
                 if (solutions != null) {
                     entity.setSolutionsSid(solutions.getSid());
+                    String solutionsSid = solutions.getSid();
+                    BusSolutionsChange busSolutionsChange = baseMapper.selectBySolutionSid(solutionsSid);
+                    if (null != busSolutionsChange) {
+                        if (!busSolutionsChange.getNodeState().equals("终止")) {
+                            return rb.fail().setMsg("请勿重复新增！");
+                        }
+                    }
                 }
             }
             ResultBean<String> orgSidByPath = sysStaffOrgFeign.getOrgSidByPath(dto.getOrgPath());
@@ -990,7 +1000,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         return rb.success().setData(sid);
     }
 
-    public ResultBean<AppSolutionChangeVo> appDetails(String sid) {
+    public ResultBean<AppSolutionChangeVo> appDetails(String sid, String userSid, String orgPath) {
         ResultBean<AppSolutionChangeVo> rb = ResultBean.fireFail();
         AppSolutionChangeVo vo = new AppSolutionChangeVo();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
@@ -1113,9 +1123,10 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         String businessSid = "";
         //新增修改保存
         ResultBean<String> resultBean = saveAppSolutions(dto);
-        if (resultBean.getSuccess()) {
+        if (!resultBean.getSuccess()) {
-            businessSid = resultBean.getData();
+            return rb.fail().setMsg(resultBean.getMsg());
         }
+        businessSid = resultBean.getData();
         BusSolutionsChange entity = fetchBySid(businessSid);
         String orgSidPath = "";
         if (StringUtils.isNotBlank(entity.getOrgSidPath())) {
@@ -1150,6 +1161,7 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         variables.put("businessSid", businessSid);
         appMap.put("sid", businessSid);
         appMap.put("noCalc", true);
+        appMap.put("initUrl", "terminal/autoservice/v1/SolutionsChange/appDetails");
         variables.put("app", appMap);
         BusSolutionsChange busSolutionsChange1 = fetchBySid(businessSid);
         String msgBusinessSid = busSolutionsChange1.getSid();
@@ -1218,4 +1230,8 @@ public class BusSolutionsChangeService extends MybatisBaseService<BusSolutionsCh
         }
         return rb;
     }
+
+    public BusSolutionsChange selectBySolutionSid(String solutionsSid) {
+        return baseMapper.selectBySolutionSid(solutionsSid);
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/solutionsChange/SolutionsChangeFeign.java

@@ -32,7 +32,7 @@ public interface SolutionsChangeFeign {
     @ApiOperation("变更初始化")
     @GetMapping("/solutionsInit")
     @ResponseBody
-    public ResultBean<SolutionChangeVo> solutionsInit(@RequestParam("orderSid") String orderSid, @RequestParam("userSid") String userSid, @RequestParam("orgPath") String orgPath);
+    public ResultBean<SolutionChangeVo> solutionsInit(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
 
     @ApiOperation("保存修改")
     @PostMapping("/saveAppSolutions")
@@ -40,9 +40,9 @@ public interface SolutionsChangeFeign {
     public ResultBean<String> saveAppSolutions(@RequestBody SolutionssChangeDto dto);
 
     @ApiOperation("详情、编辑回显")
-    @GetMapping("/appDetails/{sid}")
+    @GetMapping("/appDetails")
     @ResponseBody
-    public ResultBean<SolutionChangeVo> appDetails(@PathVariable("sid") String sid);
+    public ResultBean<SolutionChangeVo> appDetails(@RequestParam("sid") String sid, @RequestParam("orgPath") String orgPath, @RequestParam("userSid") String userSid);
 
     @ApiOperation("移动端-删除")
     @DeleteMapping("/deleteSolution/{sid}")

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/solutionsChange/SolutionsChangeFeignFallback.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class SolutionsChangeFeignFallback implements SolutionsChangeFeign{
     @Override
-    public ResultBean<SolutionChangeVo> solutionsInit(String orderSid, String userSid, String orgPath) {
+    public ResultBean<SolutionChangeVo> solutionsInit(String sid, String userSid, String orgPath) {
         return null;
     }
 
@@ -22,10 +22,11 @@ public class SolutionsChangeFeignFallback implements SolutionsChangeFeign{
     }
 
     @Override
-    public ResultBean<SolutionChangeVo> appDetails(String sid) {
+    public ResultBean<SolutionChangeVo> appDetails(String sid, String userSid, String orgPath) {
         return null;
     }
 
+
     @Override
     public ResultBean deleteSolution(String sid) {
         return null;

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/solutionsChange/SolutionsChangeRest.java

@@ -39,9 +39,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 
-
 /**
- *
  * @author liupopo
  * @version 1.0
  * @since 1.0
@@ -56,8 +54,8 @@ public class SolutionsChangeRest implements SolutionsChangeFeign {
 
 
     @Override
-    public ResultBean<SolutionChangeVo> solutionsInit(String orderSid, String userSid, String orgPath) {
+    public ResultBean<SolutionChangeVo> solutionsInit(String sid, String userSid, String orgPath) {
-        return solutionsChangeService.solutionsInit(orderSid,userSid,orgPath);
+        return solutionsChangeService.solutionsInit(sid, userSid, orgPath);
     }
 
     @Override
@@ -66,8 +64,8 @@ public class SolutionsChangeRest implements SolutionsChangeFeign {
     }
 
     @Override
-    public ResultBean<SolutionChangeVo> appDetails(String sid) {
+    public ResultBean<SolutionChangeVo> appDetails(String sid, String userSid, String orgPath) {
-        return solutionsChangeService.appDetails(sid);
+        return solutionsChangeService.appDetails(sid, userSid, orgPath);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/solutionsChange/SolutionsChangeService.java

@@ -64,9 +64,9 @@ public class SolutionsChangeService {
     @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
 
-    public ResultBean<SolutionChangeVo> solutionsInit(String orderSid, String userSid, String orgPath) {
+    public ResultBean<SolutionChangeVo> solutionsInit(String sid, String userSid, String orgPath) {
         ResultBean<SolutionChangeVo> rb = ResultBean.fireFail();
-        ResultBean<AppSolutionChangeVo> resultBean = busSolutionsChangeFeign.solutionsInit(orderSid, orgPath, userSid);
+        ResultBean<AppSolutionChangeVo> resultBean = busSolutionsChangeFeign.solutionsInit(sid, orgPath, userSid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -81,15 +81,15 @@ public class SolutionsChangeService {
                 AppSolutionssChangeDto();
         BeanUtil.copyProperties(dto, solutionssChangeDto);
         ResultBean<String> resultBean = busSolutionsChangeFeign.saveAppSolutions(solutionssChangeDto);
-        if (resultBean.getSuccess()) {
+        if (!resultBean.getSuccess()) {
-            rb.success().setData(resultBean.getData());
+            return rb.fail().setMsg(resultBean.getMsg());
         }
-        return rb.success();
+        return rb.success().setData(resultBean.getData());
     }
 
-    public ResultBean<SolutionChangeVo> appDetails(String sid) {
+    public ResultBean<SolutionChangeVo> appDetails(String sid, String userSid, String orgPath) {
         ResultBean<SolutionChangeVo> rb = ResultBean.fireFail();
-        ResultBean<AppSolutionChangeVo> resultBean = busSolutionsChangeFeign.appDetails(sid);
+        ResultBean<AppSolutionChangeVo> resultBean = busSolutionsChangeFeign.appDetails(sid, userSid, orgPath);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
         }
@@ -110,7 +110,7 @@ public class SolutionsChangeService {
         BeanUtil.copyProperties(dto, submitSolutionDto);
         ResultBean resultBean = busSolutionsChangeFeign.submitAppSolution(submitSolutionDto);
         if (!resultBean.getSuccess()) {
-            return rb.setMsg(resultBean.getMsg());
+            return rb.fail().setMsg(resultBean.getMsg());
         }
         return rb.success();
     }