销售订单-移动端销售订单修改初始化车型（第一次选择）时的参数

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;
@@ -154,6 +155,5 @@ public interface BusSalesOrderFeign {
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
     @GetMapping("/init/modelInfo2")
     @ResponseBody
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@RequestParam("special") String special, @RequestParam("customerSid") String customerSid,
-                                                                        @RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery);
 }

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
-	public ResultBean<PagerVo<BusSalesOrderVo>> listPage(PagerQuery<BusSalesOrderQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorder/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderAllDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorder/fetchDetailsBySid无法访问");
-	}
-
-	@Override
-	public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
-		return null;
-	}
-
-	@Override
-	public ResultBean submit(BusSalesOrderAllDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {
-		return null;
-	}
-
-	@Override
-	public ResultBean reject(BusSalesOrderFlowDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean revokeProcess(BusSalesOrderFlowDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
-		return null;
-	}
-
-	@Override
-	public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
-		return null;
-	}
-
-	@Override
-	public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
-		return null;
-	}
+    @Override
+    public ResultBean<PagerVo<BusSalesOrderVo>> listPage(PagerQuery<BusSalesOrderQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/bussalesorder/listPage无法访问");
+    }
+
+    @Override
+    public ResultBean save(BusSalesOrderAllDto dto) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/save无法访问");
+    }
+
+    @Override
+    public ResultBean delBySids(String[] sids) {
+        return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorder/delBySids无法访问");
+    }
+
+    @Override
+    public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        return rb.setMsg("接口anrui-buscenter/bussalesorder/fetchDetailsBySid无法访问");
+    }
+
+    @Override
+    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submit(BusSalesOrderAllDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(BusSalesOrderFlowQuery busSalesOrderFlowQuery) {
+        return null;
+    }
+
+    @Override
+    public ResultBean reject(BusSalesOrderFlowDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(BusSalesOrderFlowDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(BusSalesOrderFlowDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusSaleOrderStateVo> saleOrderState(String saleOrderSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<PagerVo<AppBusSalesOrderVo>> getSaleOrders(PagerQuery<AppBusSalesOrderQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean deleteSaleOrder(String saleOrderSid, String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusSalesOrderBillInfoVo> getBillInfo(String saleOrderSid, String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveBillInfo(AppBusSalesOrderAllDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo(String saleOrderSid, String customerSid, String userSid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
+        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-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/>
@@ -190,9 +193,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
 
     @Override
     @ApiOperation("初始化销售订单(第一次选择或重选) 车型信息")
-    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(String special, String customerSid, String userSid, String modelSid, String configSid) {
-        ResultBean rb = ResultBean.fireFail();
-        AppBusSaleOrderInitModelInfoVo vo = busSalesOrderService.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
+        ResultBean<AppBusSaleOrderInitModelInfoVo> rb = ResultBean.fireFail();
+        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

@@ -1323,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-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,
-                                                                        @RequestParam("userSid") String userSid, @RequestParam("modelSid") String modelSid, @RequestParam("configSid") String configSid);
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery);
 
 }

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) {
-        return appBusSalesOrderService.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
+        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) {
-        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(special, customerSid, userSid, modelSid, configSid);
+    public ResultBean<AppBusSaleOrderInitModelInfoVo> getInitModelInfo2(@SpringQueryMap AppBusSaleOrderInitModelInfoQuery appBusSaleOrderInitModelInfoQuery) {
+        ResultBean resultBean = busSalesOrderFeign.getInitModelInfo2(appBusSaleOrderInitModelInfoQuery);
         return resultBean;
     }