优化

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -98,16 +98,16 @@ public interface BusSalesOrderFeign {
     @PostMapping("/updateOneBillMoneyByOrderSid")
     ResultBean<Integer> updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid, @RequestParam("oneBillMoney") String oneBillMoney);
 
-   /* @ApiOperation("提交")
-    @PostMapping("/submit")
-    @ResponseBody
-    ResultBean submit(@RequestBody SubmitAllOrderDto dto);
-
-    @ApiOperation("pc端是否允许提交")
-    @PostMapping("/pcIsSubmit")
-    @ResponseBody
-    ResultBean pcIsSubmit(@RequestBody SubmitAllOrderDto dto);
-*/
+    /* @ApiOperation("提交")
+     @PostMapping("/submit")
+     @ResponseBody
+     ResultBean submit(@RequestBody SubmitAllOrderDto dto);
+
+     @ApiOperation("pc端是否允许提交")
+     @PostMapping("/pcIsSubmit")
+     @ResponseBody
+     ResultBean pcIsSubmit(@RequestBody SubmitAllOrderDto dto);
+ */
     @ApiOperation(value = "办理（同意）")
     @PutMapping("/complete")
     @ResponseBody
@@ -324,4 +324,9 @@ public interface BusSalesOrderFeign {
     @PostMapping("/selNewComSaleByVehSid")
     @ResponseBody
     ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(@RequestParam("vehSid") String vehSid);
+
+    @ApiOperation("已办结的订单未生成合同及应收未收的生成")
+    @PostMapping("/saveContract")
+    @ResponseBody
+    ResultBean saveContract(@RequestParam("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -300,4 +300,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(String vehSid) {
         return null;
     }
+
+    @Override
+    public ResultBean saveContract(String sid) {
+        return null;
+    }
 }

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

@@ -381,4 +381,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     public ResultBean<BusSalesOrderDetailsVo> selNewComSaleByVehSid(String vehSid) {
         return busSalesOrderService.selNewComSaleByVehSid(vehSid);
     }
+
+    @Override
+    public ResultBean saveContract(String sid) {
+        return busSalesOrderService.saveContractOne(sid);
+    }
 }

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

@@ -6790,4 +6790,43 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     public BusSalesOrder selectByContractNos(String contractNo) {
         return baseMapper.selectByContractNos(contractNo);
     }
+
+    public ResultBean saveContractOne(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder= fetchBySid(sid);
+        //查询是否有合同，如果没有则生成合同
+        OrderContractQuery orderContractQuery = new OrderContractQuery();
+        orderContractQuery.setSid(sid);
+        orderContractQuery.setUserSid(busSalesOrder.getCreateBySid());
+        saveContract(orderContractQuery);
+        ResultBean<AppOrderDetailsVo> details = getSaleOrderDetails(sid);
+        AppOrderDetailsVo vo = details.getData();
+        //为三方金融和担保贷款
+        if ("2".equals(busSalesOrder.getFinancePlan()) || "2".equals(busSalesOrder.getPayTypeKey())) {
+            //根据销售订单sid查询金融方案
+            ResultBean<SolutionsDetailsVo> solutionsDetailsVoResultBean = loanSolutionsFeign.selectDetailsss(sid);
+            SolutionsDetailsVo solutionsDetailsVo = solutionsDetailsVoResultBean.getData();
+            if (solutionsDetailsVo != null) {
+                if (StringUtils.isNotBlank(solutionsDetailsVo.getTypeKey())) {
+                    //推送车款
+                    if ("02".equals(solutionsDetailsVo.getTypeKey())) {
+                        //外部金融
+                        createFin(vo, busSalesOrder, solutionsDetailsVo);
+                    } else {
+                        //自营非担保
+                        createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
+                    }
+                } else {//担保贷款
+                    createFinTwo(vo, busSalesOrder, solutionsDetailsVo);
+                }
+            } else {
+                //推送车款
+                createCarFin(vo, busSalesOrder);
+            }
+        } else {
+            //推送车款
+            createCarFin(vo, busSalesOrder);
+        }
+        return rb.success();
+    }
 }

anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysflowableconfig/SysFlowableConfigFeign.java

@@ -36,4 +36,8 @@ public interface SysFlowableConfigFeign {
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
     ResultBean saveOrUpdate(@Valid @RequestBody SysFlowableConfigDto dto);
+
+    @ApiOperation("置空")
+    @PostMapping("/setBlank")
+    ResultBean setBlank(@RequestParam("userSid")String userSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigRest.java

@@ -34,4 +34,9 @@ public class SysFlowableConfigRest implements SysFlowableConfigFeign {
     public ResultBean saveOrUpdate(SysFlowableConfigDto dto) {
         return sysFlowableConfigService.saveOrUpdateDto(dto);
     }
+
+    @Override
+    public ResultBean setBlank(String userSid) {
+        return sysFlowableConfigService.setBlank(userSid);
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysflowableconfig/SysFlowableConfigService.java

@@ -48,4 +48,8 @@ public class SysFlowableConfigService extends MybatisBaseService<SysFlowableConf
         baseMapper.insert(sysFlowableConfig);
         return rb.success();
     }
+
+    public ResultBean setBlank(String userSid) {
+        return null;
+    }
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java

@@ -178,7 +178,7 @@ public interface AppBusSalesOrderFeign {
     @ApiOperation("保存价格信息")
     @PostMapping("/save/priceInfo")
     @ResponseBody
-    ResultBean savePriceInfo(@RequestBody PriceDto dto);
+    ResultBean savePriceInfo(@Valid @RequestBody PriceDto dto);
 
     /*-----------------------------------------保险信息------------------------------------------*/
 

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceDto.java

@@ -5,6 +5,8 @@ import com.yxt.common.core.dto.Dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+
 /**
  * @Author dimengzhe
  * @Date 2022/6/6 10:40
@@ -19,6 +21,7 @@ public class PriceDto implements Dto {
     private String plannedPickUpLocation;
     @ApiModelProperty(value = "预计提车地点key")
     @JsonProperty(value = "addressKey")
+    @NotBlank(message = "请选择计划提车地点")
     private String plannedPickUpLocationKey;
     @ApiModelProperty(value = "主车单台成交价格")
     @JsonProperty(value = "transactionPrice")