Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@@ -106,7 +106,7 @@ public class BaseVehicleDto implements Dto {
     @ApiModelProperty(value = "运费")
     private Integer freight;
     @ApiModelProperty(value = "合格证状态key")
-    private String certificateState = "0001";
+    private String certificateState = "001";
     @ApiModelProperty(value = "合格证状态value")
     private String certificateStateValue = "虚拟";
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java

@@ -16,7 +16,7 @@ public enum BillTypeEnum {
     CJTKSQ("CJTKSQ", "厂家退库申请"),
     FYSQ("FYSQ","费用申请"),
     FKSQ("FKSQ","付款申请"),
-    KCDDBGSQ("KCDDBGSQ","库存地点变更申请")
+    KCDDBGSQ("KCDDBG","库存地点变更申请")
     ;
 
     private String billType;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -121,6 +121,9 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             baseVehicleCertificate.setVinNo(dto.getVinNo());
             baseVehicleCertificate.setCertificateState(dto.getCertificateState());
             baseVehicleCertificate.setCertificateStateValue(dto.getCertificateStateValue());
+            baseVehicleCertificate.setVehicleSid(baseVehicle.getSid());
+            baseVehicleCertificate.setTransferStateKey("001");
+            baseVehicleCertificate.setTransferStateValue("未接收");
             baseVehicleCertificateService.save(baseVehicleCertificate);
         }else {
             return rb.setMsg("车架号不能为空");

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleorder/BusVehicleOrderMapper.xml

@@ -203,12 +203,12 @@
     </select>
 
     <select id="getContractPrice" resultType="java.lang.String">
-        SELECT bvad.contractPrice
+        SELECT
-        FROM anrui_base.bus_vehicle_apply_detail bvad
+                bvad.contractPrice
-                     LEFT JOIN anrui_base.bus_vehicle_order bvo
+        FROM
-                ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
+                anrui_base.bus_vehicle_apply_detail bvad
-                     LEFT JOIN anrui_scm.`scm_apply_inbound` sai
+                        LEFT JOIN anrui_base.bus_vehicle_order bvo
-                ON sai.vehicleOrderSid = bvo.`sid`
+                        ON bvad.`sid` = bvo.purchaseApplyMediumModelSid
-        WHERE bvad.applySid = #{sid}
+        WHERE bvad.sid = #{sid}
     </select>
 </mapper>

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

@@ -113,4 +113,12 @@ public class BusSalesOrder extends BaseEntity {
     private String customerPhoto;
     @ApiModelProperty(value = "任务编号id")
     private String taskId;
+
+    @ApiModelProperty(value = "付款类型下级")
+    private String financePlan;
+    @ApiModelProperty(value = "付款类型下级value")
+    private String financePlanValue;
+
+    @ApiModelProperty(value = "意向车型sid")
+    private String intentionSid;
 }

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

@@ -135,9 +135,9 @@ public interface BusSalesOrderFeign {
     public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("初始化销售订单单据信息")
-    @GetMapping("/init/billInfo/{saleOrderSid}/{userSid}")
+    @PostMapping("/init/billInfo")
     @ResponseBody
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@RequestBody AppBusSalesOrderBillInfoQuery appBusSalesOrderBillInfoQuery);
 
     /**
      * 新增保存销售订单信息

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

@@ -118,7 +118,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(AppBusSalesOrderBillInfoQuery appBusSalesOrderBillInfoQuery) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderAllDto.java

@@ -53,4 +53,12 @@ public class AppBusSalesOrderAllDto implements Dto {
     @ApiModelProperty("挂靠公司名称sid")
     private String affiliatedOrgSid;
 
+    @ApiModelProperty(value = "付款类型下级")
+    private String financePlan;
+    @ApiModelProperty(value = "付款类型下级value")
+    private String financePlanValue;
+
+    @ApiModelProperty(value = "意向车型sid")
+    private String intentionSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/29 10:28
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderBillInfoQuery implements Query {
+    private static final long serialVersionUID = -8298788981321935337L;
+
+    @ApiModelProperty(value = "意向车型sid")
+    private String intentionSid;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderBillInfoVo.java

@@ -50,4 +50,13 @@ public class AppBusSalesOrderBillInfoVo implements Vo {
     @ApiModelProperty("客户sid")
     private String customerSid;
 
+    @ApiModelProperty("意向车型sid")
+    private String intentionSid;
+
+    @ApiModelProperty(value = "金融方案")
+    private String financePlan;
+
+    @ApiModelProperty(value = "金融方案value")
+    private String financePlanValue;
+
 }

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

@@ -90,7 +90,10 @@
                billingTypeKey    AS invoiceType,
                billingType       AS invoiceValue,
                affiliatedCompany,
-               affiliatedCompany as affiliatedOrgSid
+               affiliatedCompany as affiliatedOrgSid,
+               financePlan,
+               financePlanValue,
+               intentionSid
         FROM bus_sales_order bo
         WHERE bo.sid = #{saleOrderSid}
     </select>

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

@@ -172,9 +172,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
 
     @Override
     @ApiOperation("App初始化销售订单单据信息")
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(AppBusSalesOrderBillInfoQuery appBusSalesOrderBillInfoQuery) {
         ResultBean<AppBusSalesOrderBillInfoVo> rb = ResultBean.fireFail();
-        AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(saleOrderSid, userSid);
+        AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(appBusSalesOrderBillInfoQuery);
         return rb.success().setData(vo);
     }
 

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

@@ -88,7 +88,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
-import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.api.utils.ProcessStateEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
@@ -704,7 +703,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 variables.put("isLoan1", false);
             }
             variables.put("orgSid", orgSid);
-            ResultBean businessResultBean =null;// flowableFeign.businessStart(ProcDefEnum.SALESORDER.getProDefId(), dto.getUserSid(), variables);
+            ResultBean businessResultBean = null;// flowableFeign.businessStart(ProcDefEnum.SALESORDER.getProDefId(), dto.getUserSid(), variables);
             if (businessResultBean.getSuccess() && businessResultBean.getData() != null) {
                 Map<String, String> map = (Map<String, String>) businessResultBean.getData();
                 //更新业务表中的流程状态
@@ -1233,11 +1232,14 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     /**
      * App初始化销售订单单据信息
      *
-     * @param saleOrderSid 销售订单sid
+     * @param appBusSalesOrderBillInfoQuery
-     * @param userSid      用户sid
      * @return
      */
-    public AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid, String userSid) {
+    public AppBusSalesOrderBillInfoVo getBillInfo(AppBusSalesOrderBillInfoQuery appBusSalesOrderBillInfoQuery) {
+        String saleOrderSid = appBusSalesOrderBillInfoQuery.getSaleOrderSid();
+        String userSid = appBusSalesOrderBillInfoQuery.getUserSid();
+        String intentionSid = appBusSalesOrderBillInfoQuery.getIntentionSid();
+        String customerSid = appBusSalesOrderBillInfoQuery.getCustomerSid();
         AppBusSalesOrderBillInfoVo vo = baseMapper.getBillInfo(saleOrderSid);
         String affiliatedOrgSid = vo.getAffiliatedOrgSid();
         if (StringUtils.isNotBlank(affiliatedOrgSid)) {
@@ -1247,13 +1249,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setAffiliatedType("0");
             vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
         }
-        vo.setUserSid(userSid);
         vo.setSaleOrderSid(saleOrderSid);
+        vo.setUserSid(userSid);
         return vo;
     }
 
     /**
-     * App初始化销售订单单据信息
+     * App新增、修改销售订单基础信息
      *
      * @param dto
      * @return

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFile.java

@@ -62,6 +62,6 @@ public class CrmCustomerFile extends BaseEntity {
     private String attachType;
     @ApiModelProperty("排序号")
     private Integer sortNo;
-    @ApiModelProperty("示例")
+//    @ApiModelProperty("示例")
-    private String sample;
+//    private String sample;
 }

anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomerfile/CrmCustomerFileListVo.java

@@ -27,7 +27,6 @@ package com.yxt.anrui.crm.api.crmcustomerfile;
 
 
 import com.yxt.anrui.crm.api.crmfile.CrmFileDetailsVo;
-import com.yxt.anrui.crm.api.crmfile.CrmFileVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -37,6 +36,7 @@ import java.util.List;
 @Data
 public class CrmCustomerFileListVo implements Vo {
 
+    private static final long serialVersionUID = -7975044183441168149L;
     @ApiModelProperty("文件类别")
     private String attachType;
     @ApiModelProperty("文件名称")

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

@@ -90,9 +90,9 @@ public interface AppBusSalesOrderFeign {
     public ResultBean deleteSaleOrder(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
 
     @ApiOperation("初始化销售订单单据信息")
-    @GetMapping("/init/billInfo/{saleOrderSid}/{userSid}")
+    @PostMapping("/init/billInfo")
     @ResponseBody
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(@RequestBody BusSalesOrderBillInfoQuery busSalesOrderBillInfoQuery);
 
     @ApiOperation("新增/修改销售订单单据")
     @PostMapping("/save/billInfo")
@@ -101,7 +101,7 @@ public interface AppBusSalesOrderFeign {
 
     /*-----------------------------------------车型信息------------------------------------------*/
 
-    @ApiOperation("初始化销售订单 车型信息")
+    @ApiOperation("初始化销售订单车型信息")
     @GetMapping("/init/modelInfo")
     @ResponseBody
     public ResultBean<BusSaleOrderInitModelInfoVo> getInitModelInfo(@RequestParam("saleOrderSid") String saleOrderSid, @RequestParam("customerSid") String customerSid, @RequestParam("userSid") String userSid);

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

@@ -76,7 +76,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(BusSalesOrderBillInfoQuery busSalesOrderBillInfoQuery) {
         return null;
     }
 

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

@@ -57,4 +57,12 @@ public class BusOrerSalesAllDto implements Dto {
     private String affiliatedOrgNameWrite;
     @ApiModelProperty("挂靠公司名称sid")
     private String affiliatedOrgSid;
+
+    @ApiModelProperty(value = "付款类型下级")
+    private String financePlan;
+    @ApiModelProperty(value = "付款类型下级value")
+    private String financePlanValue;
+
+    @ApiModelProperty(value = "意向车型sid")
+    private String intentionSid;
 }

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

@@ -0,0 +1,27 @@
+package com.yxt.anrui.terminal.api.autoservice.saleOrders.order;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/29 10:21
+ * @Description
+ */
+@Data
+public class BusSalesOrderBillInfoQuery implements Query {
+    private static final long serialVersionUID = -7221867419937264103L;
+
+    @ApiModelProperty(value = "意向车型sid")
+    private String intentionSid;
+    @ApiModelProperty(value = "销售订单sid")
+    private String saleOrderSid;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+
+
+}

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

@@ -54,4 +54,13 @@ public class BusSalesOrderBillInfoVo implements Vo {
 
     @ApiModelProperty("客户sid")
     private String customerSid;
+
+    @ApiModelProperty("意向车型sid")
+    private String intentionSid;
+
+    @ApiModelProperty(value = "金融方案")
+    private String financePlan;
+
+    @ApiModelProperty(value = "金融方案value")
+    private String financePlanValue;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java

@@ -94,8 +94,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
 
     @Override
     @ApiOperation("初始化销售订单单据信息")
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(BusSalesOrderBillInfoQuery busSalesOrderBillInfoQuery) {
-        return appBusSalesOrderService.getBillInfo(saleOrderSid, userSid);
+        return appBusSalesOrderService.getBillInfo(busSalesOrderBillInfoQuery);
     }
 
     @Override

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java

@@ -158,14 +158,15 @@ public class AppBusSalesOrderService {
     /**
      * 初始化销售订单单据信息
      *
-     * @param saleOrderSid
+     * @param busSalesOrderBillInfoQuery
-     * @param userSid
      * @return
      */
-    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+    public ResultBean<BusSalesOrderBillInfoVo> getBillInfo(BusSalesOrderBillInfoQuery busSalesOrderBillInfoQuery) {
         ResultBean<BusSalesOrderBillInfoVo> rb = ResultBean.fireFail();
         BusSalesOrderBillInfoVo vo = new BusSalesOrderBillInfoVo();
-        ResultBean<AppBusSalesOrderBillInfoVo> resultBean = busSalesOrderFeign.getBillInfo(saleOrderSid, userSid);
+        AppBusSalesOrderBillInfoQuery appBusSalesOrderBillInfoQuery = new AppBusSalesOrderBillInfoQuery();
+        BeanUtil.copyProperties(busSalesOrderBillInfoQuery, appBusSalesOrderBillInfoQuery);
+        ResultBean<AppBusSalesOrderBillInfoVo> resultBean = busSalesOrderFeign.getBillInfo(appBusSalesOrderBillInfoQuery);
         AppBusSalesOrderBillInfoVo appBusSalesOrderBillInfoVo = resultBean.getData();
         BeanUtil.copyProperties(appBusSalesOrderBillInfoVo, vo);
         return rb.success().setData(vo);