优化

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseQuotationVo.java

@@ -0,0 +1,110 @@
+package com.yxt.anrui.base.api.basevehicleout;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/9/29 12:00
+ * @Description
+ */
+@Data
+public class BaseQuotationVo implements Vo {
+
+    @ApiModelProperty("销售部门")
+    private String sid;
+    @ApiModelProperty("销售专员")
+    private String vinSid;
+    @ApiModelProperty("贷款合同编号")
+    private String vinNo;
+
+    @ApiModelProperty("贷款人姓名")
+    private String modelConfig;
+
+    @ApiModelProperty("车架号")
+    private String type;
+
+    @ApiModelProperty("电话")
+    private String saleDate;
+
+    @ApiModelProperty("地址")
+    private String price;
+
+    @ApiModelProperty("挂靠公司")
+    private String orgName;
+
+    @ApiModelProperty("车型")
+    private String staffName;
+
+    @ApiModelProperty("数量")
+    private int num = 1;
+
+    @ApiModelProperty("是否为终端客户")
+    private String isTerminal;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("手机号码")
+    private String mobile;
+
+    @ApiModelProperty("赠品说明")
+    private String giftsDescription;
+
+    @ApiModelProperty("销售折让")
+    private String salesAllowance;
+
+    @ApiModelProperty("中介人1")
+    private String middleOne;
+
+
+    @ApiModelProperty("返利金额1")
+    private String rebateMoneyOne;
+
+    @ApiModelProperty("中介人2")
+    private String middleTwo;
+
+
+    @ApiModelProperty("返利金额2")
+    private String rebateMoneyTwo;
+
+    @ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+
+    @ApiModelProperty("车型简称")
+    private String modelName; // 车型简称
+
+    @ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+
+    @ApiModelProperty("内部编码")
+    private String insideCode; // 内部编码
+
+    @ApiModelProperty("配置sid")
+    private String modelConfigSid; // 配置sid
+
+    @ApiModelProperty("车型与配置关联sid")
+    private String vehModelConfigSid; // 车型与配置关联sid
+
+    @ApiModelProperty("销售指导价")
+    private String guidedPrice; // 销售指导价
+
+    @ApiModelProperty("单据编号")
+    private String billNo; // 单据编号
+
+    @ApiModelProperty("上装/挂车名称")
+    private String trailerOrInstallName;
+    @ApiModelProperty("上装/挂车成交价")
+    private String trailerOrInstallDealPrice;
+    @ApiModelProperty("上装/挂车物料编码")
+    private String trailerOrInstallCode;
+    @ApiModelProperty("内部引荐人姓名")
+    private String innerName;
+
+    @ApiModelProperty("采购类型value")
+    private String manPurOrderTypeValue;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -98,6 +98,10 @@ public interface BaseVehicleOutFeign {
     @ResponseBody
     public ResultBean deleteByVehReturn(@RequestParam("vinSid") String vinSid, @RequestParam("mainSid") String mainSid);
 
+    @ApiOperation("查询报价单")
+    @PostMapping("/selectQuotation")
+    @ResponseBody
+    public ResultBean<BaseQuotationVo> selectQuotation(@RequestParam("sid") String sid);
 }
 
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -134,4 +134,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     public ResultBean deleteByVehReturn(String vinSid, String mainSid) {
         return baseVehicleOutService.deleteByVehReturn(vinSid,mainSid);
     }
+
+    @Override
+    public ResultBean<BaseQuotationVo> selectQuotation(String sid) {
+        return null;
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -1628,11 +1628,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                     //推送主车对应的上装或挂车销售出库单
                     if (gcOrSzDtos.size() > 0) {
                         List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
-                        for (int i1 = gcOrSzDtos.size() - 1; i1 < gcOrSzDtos.size(); i1++) {
-                            gcOrSzDtosDK.add(gcOrSzDtos.get(i1));
+                        for (BaseVehicleZSOutDto gcOrSzDto : gcOrSzDtos) {
+                            if (gcOrSzDto.getVinSid().equals(dto.getVinSid())) {
+                                gcOrSzDtosDK.add(gcOrSzDto);
+                            }
+                        }
+                        if (gcOrSzDtosDK.size() > 0){
+                            SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz);
+                            finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                            j = j + 1;
                         }
-                        SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz);
-                        finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
                     }
                 } catch (Exception e) {
                     log.error(e.getMessage());
@@ -1757,7 +1762,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             salOutStock.setFBillNo(baseVehicleOutApply.getBillNo());
         }
         //日期
-        salOutStock.setFDate(DateUtil.today());
+        salOutStock.setFDate(baseVehicleOutApply.getSaleDate());
         //分公司id
         BaseVehicleZSOutDto baseVehicleZSOutDto = gcOrSzDtos.get(0);
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(baseVehicleZSOutDto.getVinSid());
@@ -2184,7 +2189,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
             }
         } else {//贷款
-            List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
             //挂车单独出库重推
             if (zcDtosDK.size() == 0) {
                 if (gcOrSzDtos.size() > 0) {
@@ -2198,6 +2202,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
             }
             int j = 1;
             for (BaseVehicleOut vehicleOut : zcDtosDK) {
+                List<BaseVehicleZSOutDto> gcOrSzDtosDK = new ArrayList<>();
                 BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehicleOut.getVinSid());
                 //推送主车销售出库单
                 String temporaryNumZc = String.format("%02d", j);
@@ -2214,6 +2219,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 if (gcOrSzDtosDK.size() > 0) {
                     SalOutStock salOutStockGcOrSz = createZSGCOrSZOutStock(gcOrSzDtosDK, baseVehicleOutApply, temporaryNumGcOrSz);
                     finKingDeeFeign.draftSalOutStock(salOutStockGcOrSz);
+                    j = j + 1;
                 }
             }
         }

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyDtos.java

@@ -48,6 +48,8 @@ public class LoanFinOtherPolicyDtos implements Dto {
     private String vehTypeKey;
     @ApiModelProperty("车辆功能value")
     private String vehTypeValue;
+    private List<String> vehTypeKeyList = new ArrayList<>();
+    private List<String> vehTypeValueList = new ArrayList<>();
     @ApiModelProperty("最高融资额比例（%）")
     private String maxLoanRatio;
     @ApiModelProperty("最高融资额")

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanfinotherPolicy/LoanFinOtherPolicyVos.java

@@ -47,6 +47,8 @@ public class LoanFinOtherPolicyVos {
     private String vehTypeKey;
     @ApiModelProperty("车辆功能value")
     private String vehTypeValue;
+    private List<String> vehTypeKeyList = new ArrayList<>();
+    private List<String> vehTypeValueList = new ArrayList<>();
     @ApiModelProperty("最高融资额比例（%）")
     private String maxLoanRatio;
     @ApiModelProperty("最高融资额")

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanfinotherPolicy/LoanFinOtherPolicyService.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -62,6 +63,24 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
     public ResultBean<LoanFinOtherPolicyVos> details(String sid) {
         ResultBean<LoanFinOtherPolicyVos> rb = ResultBean.fireFail();
         LoanFinOtherPolicyVos loanFinOtherPolicyVos = baseMapper.details(sid);
+        String vehTypeKey = loanFinOtherPolicyVos.getVehTypeKey();
+        List<String> vehTypeKeyList = new ArrayList<>();
+        if (StringUtils.isNotBlank(vehTypeKey)){
+            String[] s1s = vehTypeKey.split(",");
+            for (String s1 : s1s) {
+                vehTypeKeyList.add(s1);
+            }
+            loanFinOtherPolicyVos.setVehTypeKeyList(vehTypeKeyList);
+        }
+        String vehTypeValue = loanFinOtherPolicyVos.getVehTypeValue();
+        List<String> vehTypeValueList = new ArrayList<>();
+        if (StringUtils.isNotBlank(vehTypeValue)){
+            String[] s2s = vehTypeValue.split(",");
+            for (String s2 : s2s) {
+                vehTypeValueList.add(s2);
+            }
+            loanFinOtherPolicyVos.setVehTypeValueList(vehTypeValueList);
+        }
         return rb.success().setData(loanFinOtherPolicyVos);
     }
 
@@ -203,6 +222,22 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         entity.setOtherPolicyName(otherPolicyName);
         entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
         entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
+        List<String> vehTypeKeyList = dto.getVehTypeKeyList();
+        List<String> vehTypeValueList = dto.getVehTypeValueList();
+        String vehTypeKey = "";
+        for (String s1 : vehTypeKeyList) {
+            vehTypeKey = vehTypeKey + s1 + ",";
+        }
+        if (StringUtils.isNotBlank(vehTypeKey)){
+            entity.setVehTypeKey(vehTypeKey.substring(0,vehTypeKey.lastIndexOf(",")));
+        }
+        String vehTypeValue = "";
+        for (String s2 : vehTypeValueList) {
+            vehTypeValue = vehTypeValue + s2 + ",";
+        }
+        if (StringUtils.isNotBlank(vehTypeValue)){
+            entity.setVehTypeValue(vehTypeValue.substring(0,vehTypeValue.lastIndexOf(",")));
+        }
         baseMapper.insert(entity);
     }
 
@@ -236,6 +271,22 @@ public class LoanFinOtherPolicyService extends MybatisBaseService<LoanFinOtherPo
         entity.setOtherPolicyName(otherPolicyName);
         entity.setUseDeptSids(useDeptSid.substring(0,useDeptSid.lastIndexOf(",")));
         entity.setUseDeptNames(useDeptName.substring(0,useDeptName.lastIndexOf(",")));
+        List<String> vehTypeKeyList = dto.getVehTypeKeyList();
+        List<String> vehTypeValueList = dto.getVehTypeValueList();
+        String vehTypeKey = "";
+        for (String s1 : vehTypeKeyList) {
+            vehTypeKey = vehTypeKey + s1 + ",";
+        }
+        if (StringUtils.isNotBlank(vehTypeKey)){
+            entity.setVehTypeKey(vehTypeKey.substring(0,vehTypeKey.lastIndexOf(",")));
+        }
+        String vehTypeValue = "";
+        for (String s2 : vehTypeValueList) {
+            vehTypeValue = vehTypeValue + s2 + ",";
+        }
+        if (StringUtils.isNotBlank(vehTypeValue)){
+            entity.setVehTypeValue(vehTypeValue.substring(0,vehTypeValue.lastIndexOf(",")));
+        }
         baseMapper.updateById(entity);
     }