Merge remote-tracking branch 'origin/master'

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

@@ -32,6 +32,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -114,7 +115,12 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<AppBusSaleOrderStateVo> saleOrderState(@PathVariable("saleOrderSid") String saleOrderSid);
 
-
+    /**
+     * app销售订单分页列表
+     *
+     * @param pq 查询条件
+     * @return
+     */
     @ApiOperation("App销售订单分页列表")
     @PostMapping("/getSaleOrders")
     @ResponseBody
@@ -130,6 +136,12 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(@PathVariable("saleOrderSid") String saleOrderSid, @PathVariable("userSid") String userSid);
 
+    /**
+     * 新增保存销售订单信息
+     *
+     * @param dto 数据传输对象
+     * @return
+     */
     @ApiOperation("新增/修改销售订单单据")
     @PostMapping("/save/billInfo")
     @ResponseBody
@@ -143,6 +155,5 @@ public interface BusSalesOrderFeign {
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
     @GetMapping("/init/modelInfo2")
     @ResponseBody
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid,
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery);
-                                                                        @RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
 }

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

@@ -47,90 +47,90 @@ import org.springframework.stereotype.Component;
 @Component
 public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<BusSalesOrderVo>> listPage(PagerQuery<BusSalesOrderQuery> pq){
+    public ResultBean<PagerVo<BusSalesOrderVo>> listPage(PagerQuery<BusSalesOrderQuery> pq) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorder/listPage无法访问");
+        return rb.setMsg("接口anrui-buscenter/bussalesorder/listPage无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean save(BusSalesOrderAllDto dto){
+    public ResultBean save(BusSalesOrderAllDto dto) {
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/save无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/save无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean delBySids( String[] sids){
+    public ResultBean delBySids(String[] sids) {
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/delBySids无法访问");
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/delBySids无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(String sid){
+    public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(String sid) {
-		ResultBean rb = ResultBean.fireFail();
+        ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorder/fetchDetailsBySid无法访问");
+        return rb.setMsg("接口anrui-buscenter/bussalesorder/fetchDetailsBySid无法访问");
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
+    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean submit(BusSalesOrderAllDto dto) {
+    public ResultBean submit(BusSalesOrderAllDto dto) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {
+    public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean reject(BusSalesOrderFlowDto dto) {
+    public ResultBean reject(BusSalesOrderFlowDto dto) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
+    public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean revokeProcess(BusSalesOrderFlowDto dto) {
+    public ResultBean revokeProcess(BusSalesOrderFlowDto dto) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
+    public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
+    public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
+    public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
-		return null;
+        return null;
-	}
+    }
-
+
-	@Override
+    @Override
-	public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
-		return null;
+        return null;
-	}
+    }
 }

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

@@ -0,0 +1,30 @@
+package com.yxt.anrui.buscenter.api.bussalesorder.app;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/27 16:09
+ * @Description
+ */
+@Data
+public class AppBusSaleOrderInitModelInfoQuery implements Query {
+
+    private static final long serialVersionUID = 4393038164656120130L;
+    @ApiModelProperty(value = "车型sid")
+    private String modelSid;
+
+    @ApiModelProperty(value = "配置sid")
+    private String configSid;
+
+    @ApiModelProperty(value = "特殊说明")
+    private String special;
+
+    @ApiModelProperty(value = "客户sid")
+    private String customerSid;
+
+    @ApiModelProperty(value = "用户sid")
+    private String userSid;
+}

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

@@ -26,7 +26,7 @@ public class AppBusSalesOrderBillInfoVo implements Vo {
     @ApiModelProperty("开票类型")
     private String invoiceValue;
 
-    @ApiModelProperty("挂靠公司填写类型 默认值: 1长度: 1正则: ^[1-2]*$ 1选择 2手写")
+    @ApiModelProperty("挂靠公司填写类型：1选择 0手写")
     private String affiliatedType;
 
     @ApiModelProperty("选择的挂靠挂靠公司")

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

@@ -34,7 +34,10 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -141,7 +144,11 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     @Override
     @ApiOperation("初始化销售订单状态")
     public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
-        ResultBean rb = ResultBean.fireFail();
+        ResultBean<AppBusSaleOrderStateVo> rb = ResultBean.fireFail();
+        BusSalesOrder busSalesOrder = busSalesOrderService.fetchBySid(saleOrderSid);
+        if (busSalesOrder == null) {
+            return rb.setMsg("该销售订单不存在");
+        }
         AppBusSaleOrderStateVo vo = busSalesOrderService.saleOrderState(saleOrderSid);
         return rb.success().setData(vo);
     }
@@ -165,7 +172,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     @Override
     @ApiOperation("App初始化销售订单单据信息")
     public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
-        ResultBean rb = ResultBean.fireFail();
+        ResultBean<AppBusSalesOrderBillInfoVo> rb = ResultBean.fireFail();
         AppBusSalesOrderBillInfoVo vo = busSalesOrderService.getBillInfo(saleOrderSid, userSid);
         return rb.success().setData(vo);
     }
@@ -186,9 +193,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
 
     @Override
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
-        ResultBean rb = ResultBean.fireFail();
+        ResultBean<AppBusSaleOrderInitModelInfoVo> rb = ResultBean.fireFail();
-        AppBusSaleOrderInitModelInfoVo vo = busSalesOrderService.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
+        AppBusSaleOrderInitModelInfoVo vo = busSalesOrderService.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
         return rb.success().setData(vo);
     }
 }

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

@@ -994,92 +994,96 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
      * @return
      */
     public AppBusSaleOrderStateVo saleOrderState(String saleOrderSid) {
-
         AppBusSaleOrderStateVo vo = new AppBusSaleOrderStateVo();
-
+        //单据状态
-        //订单状态
         BusSalesOrder busSalesOrder = fetchBySid(saleOrderSid);
         if (busSalesOrder != null) {
             vo.setOrderInfoState(1);
-        } else {
+            //车型状态
-            vo.setOrderInfoState(0);
+            BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(saleOrderSid);
-        }
+            if (busSalesOrderModelDetailsVo != null) {
-
+                vo.setModleInfoState(1);
-        //车型状态
+                vo.setModelSid(busSalesOrderModelDetailsVo.getModelSid());
-        BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.selectOrderModelStateBySid(saleOrderSid);
+                vo.setModelName(busSalesOrderModelDetailsVo.getModelName());
-        if (busSalesOrderModelDetailsVo != null) {
+                vo.setConfigSid(busSalesOrderModelDetailsVo.getModelConfigSid());
-            vo.setModleInfoState(1);
+            } else {
-            vo.setModelSid(busSalesOrderModelDetailsVo.getModelSid());
+                vo.setModleInfoState(0);
-            vo.setModelName(busSalesOrderModelDetailsVo.getModelName());
+                vo.setModelName("未完善");
-        } else {
+            }
-            vo.setModleInfoState(0);
+            //上装状态
-        }
+            if (StringUtils.isNotBlank(busSalesOrder.getIsTop())) {
-
+                //0不包含，1包含
-        //上装状态
+                if ("0".equals(busSalesOrder.getIsTop())) {
-        if (StringUtils.isBlank(busSalesOrder.getIsTop())) {
-            vo.setTopInfoState(0);
-        } else if (busSalesOrder.getIsTop().equals("0")) { //否
-            vo.setTopInfoState(1);
-            vo.setTopName("无上装");
-        } else if (busSalesOrder.getIsTop().equals("1")) {//是
-            BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.selectOrderMakeupStateBySid(saleOrderSid);
-            if (busSalesOrderMakeupDetailsVo != null) {
-                if (StringUtils.isNotBlank(busSalesOrderMakeupDetailsVo.getTopName())) {
-                    vo.setTopName(busSalesOrderMakeupDetailsVo.getTopName());
-                    vo.setTopInfoState(1);
-                } else {
                     vo.setTopInfoState(0);
+                    vo.setTopName("无");
+                }
+                if ("1".equals(busSalesOrder.getIsTop())) {
+                    BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(saleOrderSid);
+                    if (busSalesOrderMakeupDetailsVo != null) {
+                        vo.setTopInfoState(1);
+                        vo.setTopName(busSalesOrderMakeupDetailsVo.getTopName());
+                    }
                 }
             } else {
-                vo.setTopInfoState(1);
+                vo.setTopInfoState(0);
-                vo.setTopName("无上装");
+                vo.setTopName("无");
             }
-        }
+            //挂车状态
-
-        //挂车状态
-        vo.setTrailerInfoState(1);
-
-        //订金状态
-        BusSalesOrderDepositDetailsVo busSalesOrderDepositDetailsVo = busSalesOrderDepositService.selectOrderDepositStateBySid(saleOrderSid);
-        if (busSalesOrderDepositDetailsVo != null) {
-            vo.setTrailerInfoState(1);
-        } else {
             vo.setTrailerInfoState(0);
-        }
+            //价格信息
-
+            //查询是否有价格信息
-        //保险说明状态
+            BusSalesOrderPriceDetailsVo priceDetailsVo = busSalesOrderPriceService.details(saleOrderSid);
-        if (StringUtils.isBlank(busSalesOrder.getIsInsurance())) {
+            if (priceDetailsVo != null) {
-            vo.setInsureInfoState(0);
+                vo.setPriceInfoState(1);
-        } else if (busSalesOrder.getIsInsurance().equals("0")) { //否
+            } else {
-            vo.setInsureInfoState(1);
+                vo.setPriceInfoState(0);
-            vo.setInsureName("不入保");
+            }
-        } else if (busSalesOrder.getIsInsurance().equals("1")) {//是
+            //订金状态
-            BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.selectOrderInsuranceStateBySid(saleOrderSid);
+            BusSalesOrderDepositDetailsVo depositDetailsVo = busSalesOrderDepositService.details(saleOrderSid);
-            if (busSalesOrderInsuranceDetailsVo != null) {
+            if (depositDetailsVo != null) {
-                if (StringUtils.isNotBlank(busSalesOrderInsuranceDetailsVo.getInsuranceName())) {
+                vo.setDepositInfoState(1);
-                    vo.setInsureName(busSalesOrderInsuranceDetailsVo.getInsuranceName());
+            } else {
+                vo.setDepositInfoState(0);
+            }
+            //0不入保，1入保
+            if (StringUtils.isNotBlank(busSalesOrder.getIsInsurance())) {
+                if ("0".equals(busSalesOrder.getIsInsurance())) {
                     vo.setInsureInfoState(1);
-                } else {
+                    vo.setInsureName("非公司投保");
-                    vo.setInsureInfoState(0);
+                }
+                if ("1".equals(busSalesOrder.getIsInsurance())) {
+                    vo.setInsureInfoState(1);
+                    vo.setInsureName("公司投保");
                 }
             } else {
-                vo.setInsureInfoState(1);
+                vo.setInsureInfoState(0);
-                vo.setInsureName("不入保");
+                vo.setInsureName("未完善");
             }
-        }
-
-        //金融方案状态
-        vo.setFinanceInfoState(1);
 
-        //补充说明状态
+            //金融方案状态
-        if (StringUtils.isNotBlank(busSalesOrder.getNotes())) {
+            vo.setFinanceInfoState(0);
-            vo.setRemarksStete(1);
+            //补充说明状态
-            vo.setRemarks(busSalesOrder.getNotes());
+            if (StringUtils.isNotBlank(busSalesOrder.getNotes())) {
+                vo.setRemarksStete(1);
+                vo.setRemarks(busSalesOrder.getNotes());
+            } else {
+                vo.setRemarksStete(0);
+            }
+            vo.setCustomerSid(busSalesOrder.getCustomerSid());
+            vo.setCustomerName(busSalesOrder.getCustomerName());
         } else {
+            vo.setOrderInfoState(0);
+            vo.setModleInfoState(0);
+            vo.setModelName("未完善");
+            vo.setTopInfoState(0);
+            vo.setTopName("无");
+            vo.setTrailerInfoState(0);
+            vo.setPriceInfoState(0);
+            vo.setDepositInfoState(0);
+            vo.setInsureInfoState(0);
+            vo.setFinanceInfoState(0);
             vo.setRemarksStete(0);
         }
-        vo.setCustomerSid(busSalesOrder.getCustomerSid());
-        vo.setCustomerName(busSalesOrder.getCustomerName());
         return vo;
     }
 
@@ -1175,9 +1179,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             //是否保险
             String insuranceInfo = record.getInsuranceInfo();
-            if(StringUtils.isBlank(insuranceInfo)){
+            if (StringUtils.isBlank(insuranceInfo)) {
                 record.setInsuranceInfo("-");
             }
+            if (StringUtils.isBlank(record.getSaleOrderState())) {
+                record.setSaleOrderState("待提交");
+            }
 
         }
         PagerVo<AppBusSalesOrderVo> p = PagerUtil.pageToVo(pagging, null);
@@ -1187,8 +1194,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     /**
      * App初始化销售订单单据信息
      *
-     * @param saleOrderSid
+     * @param saleOrderSid 销售订单sid
-     * @param userSid
+     * @param userSid      用户sid
      * @return
      */
     public AppBusSalesOrderBillInfoVo getBillInfo(String saleOrderSid, String userSid) {
@@ -1198,7 +1205,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             vo.setAffiliatedType("1");
             vo.setAffiliatedOrgNameChoose(vo.getAffiliatedCompany());
         } else {
-            vo.setAffiliatedType("2");
+            vo.setAffiliatedType("0");
             vo.setAffiliatedOrgNameWrite(vo.getAffiliatedCompany());
         }
         vo.setUserSid(userSid);
@@ -1236,11 +1243,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 busSalesOrder.setCustomerClass(customerTempInfoVo.getCustomerType());
                 busSalesOrder.setCustomerClassKey(customerTempInfoVo.getCustomerTypeKey());
                 busSalesOrder.setBillNo(generateBillNo(dto.getUserSid()).get("billNo_Num"));
+                busSalesOrder.setCreateDate(new Date());
                 if ("0".equals(affiliatedType)) {
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
                 }
                 if ("1".equals(affiliatedType)) {
-                    busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
+                    busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                 }
                 boolean isSave = save(busSalesOrder);
@@ -1258,7 +1266,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                     busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
                 }
                 if ("1".equals(affiliatedType)) {
-                    busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameWrite());
+                    busSalesOrder.setAffiliatedCompany(dto.getAffiliatedOrgNameChoose());
                     busSalesOrder.setAffiliatedCompanySid(dto.getAffiliatedOrgSid());
                 }
                 busSalesOrder.setCustomerPhoto(customerTempInfoVo.getCustomerPhoto());
@@ -1315,7 +1323,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return vo;
     }
 
-    public AppBusSaleOrderInitModelInfoVo getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
+    public AppBusSaleOrderInitModelInfoVo getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
+        String modelSid = appBusSaleOrderInitModelInfoQuery.getModelSid();
+        String configSid = appBusSaleOrderInitModelInfoQuery.getConfigSid();
+        String customerSid = appBusSaleOrderInitModelInfoQuery.getCustomerSid();
+        String userSid = appBusSaleOrderInitModelInfoQuery.getUserSid();
+        String special = appBusSaleOrderInitModelInfoQuery.getSpecial();
         AppBusSaleOrderInitModelInfoVo vo = new AppBusSaleOrderInitModelInfoVo();
         AppOrderInfo orderInfo = new AppOrderInfo();
         AppCarInfo appCarInfo = new AppCarInfo();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java

@@ -66,7 +66,7 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
 
     BusSalesOrderDeposit selectByOrderSid(String sid);
 
-    BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(@Param("saleOrderSid") String saleOrderSid);
+//    BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(@Param("saleOrderSid") String saleOrderSid);
 
     /**
      * 根据销售订单sid查询订金信息

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -123,8 +123,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
      * @param saleOrderSid
      * @return
      */
-    public BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(String saleOrderSid) {
+   /* public BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(String saleOrderSid) {
         return baseMapper.selectOrderDepositStateBySid(saleOrderSid);
 
-    }
+    }*/
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -72,7 +72,7 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
      */
     int deleteBySalesOrderSid(String sid);
 
-    BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(@Param("saleOrderSid") String saleOrderSid);
+//    BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(@Param("saleOrderSid") String saleOrderSid);
 
     /**
      * 根据销售订单sid查询销售订单的上装配置

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -112,7 +112,7 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
      * @param saleOrderSid
      * @return
      */
-    public BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(String saleOrderSid) {
+    /*public BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(String saleOrderSid) {
         return baseMapper.selectOrderMakeupStateBySid(saleOrderSid);
-    }
+    }*/
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java

@@ -67,7 +67,7 @@ public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel>
 
     BusSalesOrderModel selectBySalesSid(String sid);
 
-    BusSalesOrderModelDetailsVo selectOrderModelStateBySid(@Param("saleOrderSid") String saleOrderSid);
+//    BusSalesOrderModelDetailsVo selectOrderModelStateBySid(@Param("saleOrderSid") String saleOrderSid);
 
 
     /**

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -138,7 +138,7 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
      * @param saleOrderSid
      * @return
      */
-    public BusSalesOrderModelDetailsVo selectOrderModelStateBySid(String saleOrderSid) {
+   /* public BusSalesOrderModelDetailsVo selectOrderModelStateBySid(String saleOrderSid) {
         return baseMapper.selectOrderModelStateBySid(saleOrderSid);
-    }
+    }*/
 }

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

@@ -25,7 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.terminal.api.autoservice.saleOrders;
 
-import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -33,6 +33,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -93,7 +94,6 @@ public interface AppBusSalesOrderFeign {
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
     @GetMapping("/init/modelInfo2")
     @ResponseBody
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid,
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery);
-                                                                        @RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
 
 }

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

@@ -78,7 +78,7 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
         return null;
     }
 }

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

@@ -33,7 +33,8 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -49,7 +50,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 1.0
  */
 @Api(tags = "销售订单主表")
-@RestController("com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderRest")
+@Controller
 @RequestMapping("/autoservice/v1/saleOrders")
 public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
 
@@ -97,8 +98,8 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign {
 
     @Override
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
-        return appBusSalesOrderService.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
+        return appBusSalesOrderService.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
     }
 
 }

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

@@ -25,12 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.terminal.biz.autoservice.saleOrders;
 
-import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.stereotype.Service;
 
 
@@ -123,8 +124,8 @@ public class AppBusSalesOrderService {
      * @param configSid
      * @return
      */
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
-        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
+        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
         return resultBean;
     }
 

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/virtualOrders/AppBusMainDepositService.java

@@ -275,80 +275,4 @@ public class AppBusMainDepositService {
         ResultBean resultBean = busMainDepositFeign.stopReserveCar(appBusMainDepositFlowTask);
         return resultBean;
     }
-
-    /************************************* 销售订单接口 *********************************************/
-
-    /**
-     * App销售订单分页列表
-     *
-     * @param pq
-     * @return
-     */
-    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
-        ResultBean resultBean = busSalesOrderFeign.getSaleOrders(pq);
-        return resultBean;
-    }
-
-    /**
-     * 初始化销售订单单据信息
-     *
-     * @param saleOrderSid
-     * @param userSid
-     * @return
-     */
-    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
-        ResultBean resultBean = busSalesOrderFeign.getBillInfo(saleOrderSid, userSid);
-        return resultBean;
-    }
-
-    /**
-     * 新增/修改销售订单单据
-     *
-     * @param dto
-     * @return
-     */
-    public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
-        ResultBean resultBean = busSalesOrderFeign.saveBillInfo(dto);
-        return resultBean;
-    }
-
-    /**
-     * 初始化销售订单 车型信息
-     *
-     * @param saleOrderSid
-     * @param customerSid
-     * @param userSid
-     * @return
-     */
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
-        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo(saleOrderSid, customerSid, userSid);
-        return resultBean;
-    }
-
-    /**
-     * 初始化销售订单(第一次选择或重选) 车型信息
-     *
-     * @param special
-     * @param customerSid
-     * @param userSid
-     * @param modelSid
-     * @param configSid
-     * @return
-     */
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
-        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
-        return resultBean;
-    }
-
-    /**
-     * 删除销售订单
-     *
-     * @param saleOrderSid
-     * @param userSid
-     * @return
-     */
-    public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
-        ResultBean resultBean = busSalesOrderFeign.deleteSaleOrder(saleOrderSid, userSid);
-        return resultBean;
-    }
 }