销售订单编辑初始化接口

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousDetailsVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.busdepositfictitious;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusDepositFictitiousVo.java <br/>
@@ -51,16 +51,15 @@ import java.math.BigDecimal;
 public class BusDepositFictitiousDetailsVo implements Vo {
 
     private static final long serialVersionUID = -972207402015740843L;
-    private String sid;
 
     @ApiModelProperty("虚拟订单编号")
     private String depositBillNo;
-    @ApiModelProperty("订金信息sid")
-    private String depositSid;
     @ApiModelProperty("订金剩余金额")
-    private BigDecimal depositPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String depositPrice;
     @ApiModelProperty("本次结转金额")
-    private BigDecimal price;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String price;
     @ApiModelProperty("款项支付委托书")
     private String payPath;
 

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

@@ -26,22 +26,21 @@
 package com.yxt.anrui.buscenter.api.bussalesorder;
 
 
-import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo;
-import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo;
-import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo;
-import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo;
-import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo;
-import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
-import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleListVo;
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderVo;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -100,23 +99,23 @@ public class BusSalesOrderDetailsVo implements Vo {
     private String type;
 
     @ApiModelProperty(value = "主车车型信息")
-    private BusSalesOrderModelVo busSalesOrderModel;
+    private BusSalesOrderModelDetailsVo busSalesOrderModel;
     @ApiModelProperty(value = "现车车辆信息")
-    private List<BusSalesOrderVehicleListVo> busSalesOrderVehicleList;
+    private List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleList = new ArrayList<>();
     @ApiModelProperty(value = "采购订单信息")
-    private List<BusSalesVehicleOrderVo> busSalesVehicleOrderList;
+    private List<BusSalesVehicleOrderDetailsVo> busSalesVehicleOrderList = new ArrayList<>();
     @ApiModelProperty(value = "上装配置信息")
-    private BusSalesOrderMakeupVo busSalesOrderMakeup;
+    private BusSalesOrderMakeupDetailsVo busSalesOrderMakeup;
     @ApiModelProperty(value = "价格信息")
-    private BusSalesOrderPriceVo busSalesOrderPrice;
+    private BusSalesOrderPriceDetailsVo busSalesOrderPrice;
     @ApiModelProperty(value = "主车优惠明细")
-    private List<BusSalesOrderDiscountVo> busSalesOrderDiscountList;
+    private List<BusSalesOrderDiscountDetailsVo> busSalesOrderDiscountList = new ArrayList<>();
     @ApiModelProperty(value = "保险说明")
-    private BusSalesOrderInsuranceVo busSalesOrderInsurance;
+    private BusSalesOrderInsuranceDetailsVo busSalesOrderInsurance;
     @ApiModelProperty(value = "订金信息")
-    private BusSalesOrderDepositVo busSalesOrderDeposit;
+    private BusSalesOrderDepositDetailsVo busSalesOrderDeposit;
     @ApiModelProperty(value = "虚拟订单和订金关联信息")
-    private List<BusDepositFictitiousVo> busDepositFictitiousList;
+    private List<BusDepositFictitiousDetailsVo> busDepositFictitiousList = new ArrayList<>();
 
     @ApiModelProperty("单台开票金额")
     private String oneBillMoney; // 单台开票金额

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

@@ -69,13 +69,14 @@ public interface BusSalesOrderFeign {
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
 
-    @ApiOperation("根据SID获取一条记录")
+    @ApiOperation("编辑初始化")
     @GetMapping("/fetchDetailsBySid/{sid}")
     @ResponseBody
     public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ResponseBody
     @PostMapping("/updateOneBillMoneyByOrderSid")
-    ResultBean<Integer> updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid,@RequestParam("oneBillMoney") String oneBillMoney);
+    ResultBean<Integer> updateOneBillMoneyByOrderSid(@RequestParam("orderSid") String orderSid, @RequestParam("oneBillMoney") String oneBillMoney);
 
     @ApiOperation("提交")
     @PostMapping("/submit")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDetailsVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderDepositVo.java <br/>
@@ -51,19 +51,20 @@ import java.math.BigDecimal;
 public class BusSalesOrderDepositDetailsVo implements Vo {
 
     private static final long serialVersionUID = -2982858398780933605L;
+    @ApiModelProperty(value = "sid")
     private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
     @ApiModelProperty("单台订金")
-    private BigDecimal deposit;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String deposit;
     @ApiModelProperty("订金合计")
-    private BigDecimal depositAll;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String depositAll;
     @ApiModelProperty("订金交纳方式")
     private String depositType;
     @ApiModelProperty("订金交纳方式key")
     private String depositTypeKey;
     @ApiModelProperty("需补交订金")
-    private BigDecimal makeUpDeposit;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String makeUpDeposit;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountDetailsVo.java

@@ -49,10 +49,7 @@ import lombok.Data;
 @ApiModel(value = "销售订单-主车优惠明细 视图数据详情", description = "销售订单-主车优惠明细 视图数据详情")
 public class BusSalesOrderDiscountDetailsVo implements Vo {
 
-    private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
+    private static final long serialVersionUID = 3473959286223813480L;
     @ApiModelProperty("销售政策sid")
     private String salesPolicySid;
     @ApiModelProperty("优惠名称")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceDetailsVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderinsurance;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderInsuranceVo.java <br/>
@@ -51,14 +51,11 @@ import java.math.BigDecimal;
 public class BusSalesOrderInsuranceDetailsVo implements Vo {
 
     private static final long serialVersionUID = -6347871635639885185L;
-    private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
     @ApiModelProperty("保险公司名称")
     private String insuranceName;
     @ApiModelProperty("单台车保费预估金额")
-    private BigDecimal insuranceCarMoney;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String insuranceCarMoney;
     @ApiModelProperty("公司入保期数")
     private Integer insuranceNum;
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupDetailsVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesordermakeup;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderMakeupVo.java <br/>
@@ -51,10 +51,6 @@ import java.math.BigDecimal;
 public class BusSalesOrderMakeupDetailsVo implements Vo {
 
     private static final long serialVersionUID = 6043993539109459479L;
-    private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
     @ApiModelProperty("上装名称")
     private String topName;
     @ApiModelProperty("委改方式")
@@ -70,7 +66,8 @@ public class BusSalesOrderMakeupDetailsVo implements Vo {
     @ApiModelProperty("公告型号")
     private String announcementModel;
     @ApiModelProperty("上装价格")
-    private BigDecimal topPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String topPrice;
     @ApiModelProperty("更多配置")
     private String moreConfig;
     @ApiModelProperty("合同上传")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java

@@ -26,13 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesordermodel;
 
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderModelVo.java <br/>
@@ -50,10 +50,6 @@ import java.math.BigDecimal;
 @ApiModel(value = "销售订单-主车车型 视图数据详情", description = "销售订单-主车车型 视图数据详情")
 public class BusSalesOrderModelDetailsVo implements Vo {
 
-    private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
     @ApiModelProperty("车型sid")
     private String modelSid;
     @ApiModelProperty("配置sid")
@@ -69,8 +65,10 @@ public class BusSalesOrderModelDetailsVo implements Vo {
     @ApiModelProperty("特殊配置说明")
     private String specialConfig;
     @ApiModelProperty("单台指导价")
-    private BigDecimal guildPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String guildPrice;
     @ApiModelProperty("单台成交价")
-    private BigDecimal finalPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String finalPrice;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java

@@ -63,15 +63,9 @@ public interface BusSalesOrderModelFeign {
     @PostMapping("/save")
     @ResponseBody
     public ResultBean save(@RequestBody BusSalesOrderModelDto dto);
-        
+
     @ApiOperation("根据sid删除记录")
     @DeleteMapping("/delBySids")
     @ResponseBody
     public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderModelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeignFallback.java

@@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderModelFeignFallback.java <br/>
@@ -63,10 +61,4 @@ public class BusSalesOrderModelFeignFallback implements BusSalesOrderModelFeign
 	public ResultBean delBySids( String[] sids){
 		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordermodel/delBySids无法访问");
 	}
-
-	@Override
-	public ResultBean<BusSalesOrderModelDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesordermodel/fetchDetailsBySid无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDetailsVo.java

@@ -26,15 +26,13 @@
 package com.yxt.anrui.buscenter.api.bussalesorderprice;
 
 
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yxt.common.core.vo.Vo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-import java.util.Date;
-
 /**
  * Project: anrui-buscenter(业务管理) <br/>
  * File: BusSalesOrderPriceVo.java <br/>
@@ -53,22 +51,20 @@ import java.util.Date;
 public class BusSalesOrderPriceDetailsVo implements Vo {
 
     private static final long serialVersionUID = 5499940712460451699L;
-    private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
     @ApiModelProperty("单台指导价（主车加上装）")
-    private BigDecimal singleGuildPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String singleGuildPrice;
     @ApiModelProperty("单台成交价（主车加上装）")
-    private BigDecimal singleFinalPrice;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String singleFinalPrice;
     @ApiModelProperty("台数")
     private Integer quantity;
     @ApiModelProperty("车价合计")
-    private BigDecimal priceSum;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private String priceSum;
     @ApiModelProperty("计划提车地点")
     private String plannedPickUpLocation;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty("计划提车日期")
-    private Date plannedPickUpDateStart;
+    private String plannedPickUpDate;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleDetailsVo.java

@@ -50,10 +50,6 @@ import lombok.Data;
 public class BusSalesOrderVehicleDetailsVo implements Vo {
 
     private static final long serialVersionUID = 7843658414945191854L;
-    private String sid;
-
-    @ApiModelProperty("销售订单sid")
-    private String salesOrderSid;
     @ApiModelProperty("车架号")
     private String linkNo;
     @ApiModelProperty("车辆存放地点")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderDetailsVo.java

@@ -49,15 +49,12 @@ import lombok.Data;
 @ApiModel(value = "销售订单-采购订单信息 视图数据详情", description = "销售订单-采购订单信息 视图数据详情")
 public class BusSalesVehicleOrderDetailsVo implements Vo {
 
-    private String sid; // sid
-
-	@ApiModelProperty("销售订单sid")
-    private String salesOrderSid; // 销售订单sid
-	@ApiModelProperty("采购订单sid")
-    private String linkSid; // 采购订单sid
-	@ApiModelProperty("采购订单编号")
-    private String linkNo; // 采购订单编号
-	@ApiModelProperty("采购订单日期")
-    private String linkText; // 采购订单日期
+    private static final long serialVersionUID = -1876792209833287984L;
+    @ApiModelProperty("采购订单sid")
+    private String linkSid;
+    @ApiModelProperty("采购订单编号")
+    private String linkNo;
+    @ApiModelProperty("采购订单日期")
+    private String linkText;
 
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,15 +54,23 @@ import java.util.List;
 @Mapper
 public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictitious> {
 
-	//@Update("update bus_deposit_fictitious set name=#{msg} where id=#{id}")
-	//IPage<BusDepositFictitiousVo> voPage(IPage<BusDepositFictitious> page, @Param(Constants.WRAPPER) QueryWrapper<BusDepositFictitious> qw);
-	
-	IPage<BusDepositFictitiousVo> selectPageVo(IPage<BusDepositFictitious> page, @Param(Constants.WRAPPER) Wrapper<BusDepositFictitious> qw);
-	
-	List<BusDepositFictitiousVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDepositFictitious> qw);
-	
-	@Select("select * from bus_deposit_fictitious")
-	List<BusDepositFictitiousVo> selectListVo();
+    //@Update("update bus_deposit_fictitious set name=#{msg} where id=#{id}")
+    //IPage<BusDepositFictitiousVo> voPage(IPage<BusDepositFictitious> page, @Param(Constants.WRAPPER) QueryWrapper<BusDepositFictitious> qw);
+
+    IPage<BusDepositFictitiousVo> selectPageVo(IPage<BusDepositFictitious> page, @Param(Constants.WRAPPER) Wrapper<BusDepositFictitious> qw);
+
+    List<BusDepositFictitiousVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDepositFictitious> qw);
+
+    @Select("select * from bus_deposit_fictitious")
+    List<BusDepositFictitiousVo> selectListVo();
 
     int deleteByOrderSid(String sid);
+
+    /**
+     * 根据订金sid查询虚拟订单和订金的信息
+     *
+     * @param sid 订金sid
+     * @return
+     */
+    List<BusDepositFictitiousDetailsVo> detailsList(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -24,4 +24,14 @@
         from bus_deposit_fictitious
         where depositSid = #{sid}
     </delete>
+
+    <select id="detailsList"
+            resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo">
+        select depositBillNo,
+               depositPrice,
+               price,
+               payPath
+        from bus_deposit_fictitious
+        where depositSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -99,4 +99,13 @@ public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFi
        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
         return baseMapper.deleteByOrderSid(busSalesOrderDeposit.getSid());
     }
+
+    /**
+     * 根据订金sid查询虚拟订单和订金的信息
+     * @param sid 订金sid
+     * @return
+     */
+    public List<BusDepositFictitiousDetailsVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.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.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -48,7 +49,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 1.0
  */
 @Api(tags = "销售订单主表")
-@RestController("com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderRest")
+@Controller
 @RequestMapping("v1/bussalesorder")
 public class BusSalesOrderRest implements BusSalesOrderFeign {
 
@@ -84,17 +85,21 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
         return rb.success();
     }
 
+    /**
+     * 销售订单初始化
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
     @Override
-    @ApiOperation("根据SID获取一条记录")
+    @ApiOperation("编辑初始化")
     @GetMapping("/fetchDetailsBySid/{sid}")
     public ResultBean<BusSalesOrderDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        BusSalesOrderDetailsVo vo = busSalesOrderService.fetchDetailsVoBySid(sid);
-        return rb.success().setData(vo);
+        return busSalesOrderService.fetchDetailsVoBySid(sid);
     }
 
     @Override
-    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
+    public ResultBean<Integer> updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
         ResultBean rb = ResultBean.fireFail();
         int i = busSalesOrderService.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
         return rb.success().setMsg("操作成功");

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

@@ -29,15 +29,24 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDto;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
@@ -164,11 +173,75 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return p;
     }
 
-    public BusSalesOrderDetailsVo fetchDetailsVoBySid(String sid) {
+    /**
+     * 编辑初始化
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public ResultBean<BusSalesOrderDetailsVo> fetchDetailsVoBySid(String sid) {
+        ResultBean<BusSalesOrderDetailsVo> rb = ResultBean.fireFail();
         BusSalesOrder entity = fetchBySid(sid);
+        if (entity == null) {
+            return rb.setMsg("该销售订单不存在");
+        }
         BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo();
         BeanUtil.copyProperties(entity, vo);
-        return vo;
+        //查询主车车型信息
+        BusSalesOrderModelDetailsVo busSalesOrderModelDetailsVo = busSalesOrderModelService.details(entity.getSid());
+        if (busSalesOrderModelDetailsVo != null) {
+            vo.setBusSalesOrderModel(busSalesOrderModelDetailsVo);
+        }
+        //查询现车车辆
+        if ("1".equals(entity.getType())) {
+            List<BusSalesOrderVehicleDetailsVo> busSalesOrderVehicleListVoList = busSalesOrderVehicleService.detailsList(entity.getSid());
+            if (busSalesOrderVehicleListVoList.size() != 0) {
+                vo.setBusSalesOrderVehicleList(busSalesOrderVehicleListVoList);
+            }
+        } else if ("2".equals(entity.getType())) {
+            //查询采购订单
+            List<BusSalesVehicleOrderDetailsVo> busSalesVehicleOrderDetailsVoList = busSalesVehicleOrderService.detailsList(entity.getSid());
+            if (busSalesVehicleOrderDetailsVoList.size() != 0) {
+                vo.setBusSalesVehicleOrderList(busSalesVehicleOrderDetailsVoList);
+            }
+        }
+        //查询上装配置
+        if ("1".equals(entity.getIsTop())) {
+            BusSalesOrderMakeupDetailsVo busSalesOrderMakeupDetailsVo = busSalesOrderMakeupService.details(entity.getSid());
+            if (busSalesOrderMakeupDetailsVo != null) {
+                vo.setBusSalesOrderMakeup(busSalesOrderMakeupDetailsVo);
+            }
+        }
+        //查询价格信息
+        BusSalesOrderPriceDetailsVo busSalesOrderPriceDetailsVo = busSalesOrderPriceService.details(entity.getSid());
+        if (busSalesOrderPriceDetailsVo != null) {
+            vo.setBusSalesOrderPrice(busSalesOrderPriceDetailsVo);
+        }
+        //查询主车优惠明细
+        List<BusSalesOrderDiscountDetailsVo> busSalesOrderDiscountDetailsVoList = busSalesOrderDiscountService.detailsList(entity.getSid());
+        if (busSalesOrderDiscountDetailsVoList.size() != 0) {
+            vo.setBusSalesOrderDiscountList(busSalesOrderDiscountDetailsVoList);
+        }
+        //查询保险说明
+        if ("1".equals(entity.getIsInsurance())) {
+            BusSalesOrderInsuranceDetailsVo busSalesOrderInsuranceDetailsVo = busSalesOrderInsuranceService.details(entity.getSid());
+            if (busSalesOrderInsuranceDetailsVo != null) {
+                vo.setBusSalesOrderInsurance(busSalesOrderInsuranceDetailsVo);
+            }
+        }
+        //查询订金信息
+        BusSalesOrderDepositDetailsVo busSalesOrderDepositDetailsVo = busSalesOrderDepositService.details(entity.getSid());
+        if (busSalesOrderDepositDetailsVo != null) {
+            vo.setBusSalesOrderDeposit(busSalesOrderDepositDetailsVo);
+            if ("02".equals(busSalesOrderDepositDetailsVo.getDepositTypeKey())) {
+                //查询虚拟订单和订金关联信息
+                List<BusDepositFictitiousDetailsVo> busDepositFictitiousDetailsVoList = busDepositFictitiousService.detailsList(busSalesOrderDepositDetailsVo.getSid());
+                if (busDepositFictitiousDetailsVoList.size() != 0) {
+                    vo.setBusDepositFictitiousList(busDepositFictitiousDetailsVoList);
+                }
+            }
+        }
+        return rb.success().setData(vo);
     }
 
     /**
@@ -466,7 +539,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return new ResultBean().success();
     }
 
-    public int updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
+    public int updateOneBillMoneyByOrderSid(String orderSid, String oneBillMoney) {
         int i = baseMapper.updateOneBillMoneyByOrderSid(orderSid, oneBillMoney);
         return i;
     }

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

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,15 +54,23 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDeposit> {
 
-	//@Update("update bus_sales_order_deposit set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderDepositVo> voPage(IPage<BusSalesOrderDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderDeposit> qw);
-	
-	IPage<BusSalesOrderDepositVo> selectPageVo(IPage<BusSalesOrderDeposit> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderDeposit> qw);
-	
-	List<BusSalesOrderDepositVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderDeposit> qw);
-	
-	@Select("select * from bus_sales_order_deposit")
-	List<BusSalesOrderDepositVo> selectListVo();
+    //@Update("update bus_sales_order_deposit set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderDepositVo> voPage(IPage<BusSalesOrderDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderDeposit> qw);
+
+    IPage<BusSalesOrderDepositVo> selectPageVo(IPage<BusSalesOrderDeposit> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderDeposit> qw);
+
+    List<BusSalesOrderDepositVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderDeposit> qw);
+
+    @Select("select * from bus_sales_order_deposit")
+    List<BusSalesOrderDepositVo> selectListVo();
 
     BusSalesOrderDeposit selectByOrderSid(String sid);
+
+    /**
+     * 根据销售订单sid查询订金信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    BusSalesOrderDepositDetailsVo details(String sid);
 }

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

@@ -24,4 +24,15 @@
         from bus_sales_order_discount
         where salesOrderSid = #{sid}
     </select>
+    <!--根据销售订单sid查询订金信息-->
+    <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
+        select sid,
+               deposit,
+               depositAll,
+               depositType,
+               depositTypeKey,
+               makeUpDeposit
+        from bus_sales_order_deposit
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

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

@@ -94,4 +94,14 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public BusSalesOrderDeposit selectByOrderSid(String sid) {
         return baseMapper.selectByOrderSid(sid);
     }
+
+    /**
+     * 根据销售订单sid查询订金信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public BusSalesOrderDepositDetailsVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,15 +54,23 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDiscount> {
 
-	//@Update("update bus_sales_order_discount set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderDiscountVo> voPage(IPage<BusSalesOrderDiscount> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderDiscount> qw);
-	
-	IPage<BusSalesOrderDiscountVo> selectPageVo(IPage<BusSalesOrderDiscount> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderDiscount> qw);
-	
-	List<BusSalesOrderDiscountVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderDiscount> qw);
-	
-	@Select("select * from bus_sales_order_discount")
-	List<BusSalesOrderDiscountVo> selectListVo();
+    //@Update("update bus_sales_order_discount set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderDiscountVo> voPage(IPage<BusSalesOrderDiscount> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderDiscount> qw);
+
+    IPage<BusSalesOrderDiscountVo> selectPageVo(IPage<BusSalesOrderDiscount> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderDiscount> qw);
+
+    List<BusSalesOrderDiscountVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderDiscount> qw);
+
+    @Select("select * from bus_sales_order_discount")
+    List<BusSalesOrderDiscountVo> selectListVo();
 
     int deleteList(String sid);
+
+    /**
+     * 根据销售订单sid查询主车优惠明细
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    List<BusSalesOrderDiscountDetailsVo> detailsList(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml

@@ -24,4 +24,16 @@
         from bus_sales_order_discount
         where salesOrderSid = #{sid}
     </delete>
+    <!--根据销售订单sid查询主车优惠明细-->
+    <select id="detailsList"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo">
+        select salesPolicySid,
+               name,
+               price,
+               discountExplain,
+               num,
+               totalValue
+        from bus_sales_order_discount
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -90,4 +90,14 @@ public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrd
             baseMapper.insert(busSalesOrderDiscount);
         }
     }
+
+    /**
+     * 根据销售订单sid查询主车优惠明细
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public List<BusSalesOrderDiscountDetailsVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -64,4 +65,12 @@ public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderIn
     List<BusSalesOrderInsuranceVo> selectListVo();
 
     int deleteByOrderSid(String sid);
+
+    /**
+     * 根据销售订单sid查询保险信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    BusSalesOrderInsuranceDetailsVo details(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml

@@ -25,4 +25,13 @@
         from bus_sales_order_insurance
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="details"
+            resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo">
+        select insuranceName,
+               insuranceCarMoney,
+               insuranceNum
+        from bus_sales_order_insurance
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java

@@ -82,4 +82,14 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
     public int deleteByOrderSid(String sid) {
         return baseMapper.deleteByOrderSid(sid);
     }
+
+    /**
+     * 根据销售订单sid查询保险信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public BusSalesOrderInsuranceDetailsVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

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

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,15 +54,23 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeup> {
 
-	//@Update("update bus_sales_order_makeup set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderMakeupVo> voPage(IPage<BusSalesOrderMakeup> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderMakeup> qw);
-	
-	IPage<BusSalesOrderMakeupVo> selectPageVo(IPage<BusSalesOrderMakeup> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderMakeup> qw);
-	
-	List<BusSalesOrderMakeupVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderMakeup> qw);
-	
-	@Select("select * from bus_sales_order_makeup")
-	List<BusSalesOrderMakeupVo> selectListVo();
+    //@Update("update bus_sales_order_makeup set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderMakeupVo> voPage(IPage<BusSalesOrderMakeup> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderMakeup> qw);
+
+    IPage<BusSalesOrderMakeupVo> selectPageVo(IPage<BusSalesOrderMakeup> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderMakeup> qw);
+
+    List<BusSalesOrderMakeupVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderMakeup> qw);
+
+    @Select("select * from bus_sales_order_makeup")
+    List<BusSalesOrderMakeupVo> selectListVo();
 
     int deleteBySalesOrderSid(String sid);
+
+    /**
+     * 根据销售订单sid查询销售订单的上装配置
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    BusSalesOrderMakeupDetailsVo details(String sid);
 }

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

@@ -24,4 +24,11 @@
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </delete>
+    <!--根据销售订单sid查询上装配置-->
+    <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
+        select
+
+        from bus_sales_order_makeup
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

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

@@ -88,4 +88,8 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public int deleteBySalesOrderSid(String sid) {
         return baseMapper.deleteBySalesOrderSid(sid);
     }
+
+    public BusSalesOrderMakeupDetailsVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

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

@@ -26,14 +26,15 @@
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
-import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
 
 import java.util.List;
 
@@ -53,15 +54,23 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel> {
 
-	//@Update("update bus_sales_order_model set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderModelVo> voPage(IPage<BusSalesOrderModel> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderModel> qw);
-	
-	IPage<BusSalesOrderModelVo> selectPageVo(IPage<BusSalesOrderModel> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderModel> qw);
-	
-	List<BusSalesOrderModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderModel> qw);
-	
-	@Select("select * from bus_sales_order_model")
-	List<BusSalesOrderModelVo> selectListVo();
+    //@Update("update bus_sales_order_model set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderModelVo> voPage(IPage<BusSalesOrderModel> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderModel> qw);
+
+    IPage<BusSalesOrderModelVo> selectPageVo(IPage<BusSalesOrderModel> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderModel> qw);
+
+    List<BusSalesOrderModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderModel> qw);
+
+    @Select("select * from bus_sales_order_model")
+    List<BusSalesOrderModelVo> selectListVo();
 
     BusSalesOrderModel selectBySalesSid(String sid);
+
+    /**
+     * 根据销售订单sid查询销售订单主车车型信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    BusSalesOrderModelDetailsVo details(String sid);
 }

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

@@ -24,4 +24,18 @@
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo">
+        select modelSid,
+               modelConfigSid,
+               modelName,
+               modelConfig,
+               config,
+               moreConfig,
+               specialConfig,
+               guildPrice,
+               finalPrice
+        from bus_sales_order_model
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

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

@@ -81,13 +81,4 @@ public class BusSalesOrderModelRest implements BusSalesOrderModelFeign {
 		busSalesOrderModelService.delBySids(sids);
 		return rb.success();
 	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderModelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesOrderModelDetailsVo vo = busSalesOrderModelService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

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

@@ -94,4 +94,14 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
         }
 
     }
+
+    /**
+     * 根据销售订单sid查询销售订单主车车型信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public BusSalesOrderModelDetailsVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -67,4 +68,12 @@ public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice>
 
     @Select("select singleFinalPrice from bus_sales_order_price where salesOrderSid = #{busSid}")
     String getPriceByOrderSid(String busSid);
+
+    /**
+     * 根据销售订单sid查询价格信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    BusSalesOrderPriceDetailsVo details(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -24,4 +24,15 @@
         from bus_sales_order_price
         where salesOrderSid = #{sid}
     </select>
+
+    <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDetailsVo">
+        select singleFinalPrice,
+               singleGuildPrice,
+               quantity,
+               priceSum,
+               plannedPickUpLocation,
+               DATE_FORMAT(plannedPickUpDate, '%Y-%m-%d') as plannedPickUpDate
+        from bus_sales_order_price
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -88,7 +88,7 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     public void updateOrderPrice(BusSalesOrderPriceDto busSalesOrderPriceDto, String sid) {
         //根据销售订单sid查询价格信息
         BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectBySalesOrderSid(sid);
-        BeanUtil.copyProperties(busSalesOrderPriceDto,busSalesOrderPrice,"sid");
+        BeanUtil.copyProperties(busSalesOrderPriceDto, busSalesOrderPrice, "sid");
         BigDecimal guildPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleGuildPrice());
         busSalesOrderPrice.setSingleGuildPrice(guildPriceAll);
         BigDecimal finalPriceAll = new BigDecimal(busSalesOrderPriceDto.getSingleFinalPrice());
@@ -100,4 +100,14 @@ public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderP
     public String getPriceByOrderSid(String busSid) {
         return baseMapper.getPriceByOrderSid(busSid);
     }
+
+    /**
+     * 根据销售订单sid查询价格信息
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public BusSalesOrderPriceDetailsVo details(String sid) {
+        return baseMapper.details(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -26,14 +26,15 @@
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleVo;
 
 import java.util.List;
 
@@ -53,17 +54,25 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehicle> {
 
-	//@Update("update bus_sales_order_vehicle set name=#{msg} where id=#{id}")
-	//IPage<BusSalesOrderVehicleVo> voPage(IPage<BusSalesOrderVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderVehicle> qw);
-	
-	IPage<BusSalesOrderVehicleVo> selectPageVo(IPage<BusSalesOrderVehicle> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderVehicle> qw);
-	
-	List<BusSalesOrderVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderVehicle> qw);
-	
-	@Select("select * from bus_sales_order_vehicle")
-	List<BusSalesOrderVehicleVo> selectListVo();
+    //@Update("update bus_sales_order_vehicle set name=#{msg} where id=#{id}")
+    //IPage<BusSalesOrderVehicleVo> voPage(IPage<BusSalesOrderVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderVehicle> qw);
+
+    IPage<BusSalesOrderVehicleVo> selectPageVo(IPage<BusSalesOrderVehicle> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderVehicle> qw);
+
+    List<BusSalesOrderVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderVehicle> qw);
+
+    @Select("select * from bus_sales_order_vehicle")
+    List<BusSalesOrderVehicleVo> selectListVo();
 
     List<BusSalesOrderVehicle> selectVehicleList(String sid);
 
-	int deleteBySalesOrderSid(String sid);
+    int deleteBySalesOrderSid(String sid);
+
+    /**
+     * 根据销售订单sid查询现车车辆
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    List<BusSalesOrderVehicleDetailsVo> detailsList(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -30,4 +30,13 @@
         from bus_sales_order_vehicle
         where salesOrderSid = #{sid}
     </delete>
+
+    <select id="detailsList"
+            resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo">
+        select linkNo,
+               linkText,
+               linkSid
+        from bus_sales_order_vehicle
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -82,16 +82,20 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
     }
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
-        List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(sid) ;
-        if (stringList.size()>0){
+        List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(sid);
+        if (stringList.size() > 0) {
             //删除
             baseMapper.deleteBySalesOrderSid(sid);
-            for (int i = 0; i <list.size(); i++) {
+            for (int i = 0; i < list.size(); i++) {
                 BusSalesOrderVehicleDto busSalesOrderVehicleDto = list.get(i);
                 BusSalesOrderVehicle busSalesOrderVehicle = new BusSalesOrderVehicle();
-                BeanUtil.copyProperties(busSalesOrderVehicleDto,busSalesOrderVehicle,"sid");
+                BeanUtil.copyProperties(busSalesOrderVehicleDto, busSalesOrderVehicle, "sid");
                 save(busSalesOrderVehicle);
             }
         }
     }
+
+    public List<BusSalesOrderVehicleDetailsVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
@@ -53,17 +54,25 @@ import java.util.List;
 @Mapper
 public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOrder> {
 
-	//@Update("update bus_sales_vehicle_order set name=#{msg} where id=#{id}")
-	//IPage<BusSalesVehicleOrderVo> voPage(IPage<BusSalesVehicleOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesVehicleOrder> qw);
+    //@Update("update bus_sales_vehicle_order set name=#{msg} where id=#{id}")
+    //IPage<BusSalesVehicleOrderVo> voPage(IPage<BusSalesVehicleOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesVehicleOrder> qw);
 
-	IPage<BusSalesVehicleOrderVo> selectPageVo(IPage<BusSalesVehicleOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesVehicleOrder> qw);
+    IPage<BusSalesVehicleOrderVo> selectPageVo(IPage<BusSalesVehicleOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesVehicleOrder> qw);
 
-	List<BusSalesVehicleOrderVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesVehicleOrder> qw);
+    List<BusSalesVehicleOrderVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesVehicleOrder> qw);
 
-	@Select("select * from bus_sales_vehicle_order")
-	List<BusSalesVehicleOrderVo> selectListVo();
+    @Select("select * from bus_sales_vehicle_order")
+    List<BusSalesVehicleOrderVo> selectListVo();
 
     List<BusSalesVehicleOrder> selectVehicleList(String sid);
 
-	int deleteBySalesOrderSid(@Param("sid") String sid);
+    int deleteBySalesOrderSid(@Param("sid") String sid);
+
+    /**
+     * 根据销售订单sid查询采购订单
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    List<BusSalesVehicleOrderDetailsVo> detailsList(String sid);
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -30,4 +30,13 @@
         from bus_sales_vehicle_order
         where salesOrderSid = #{sid}
     </delete>
+    <!--根据销售订单sid查询采购订单-->
+    <select id="detailsList"
+            resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDetailsVo">
+        select linkSid,
+               linkNo,
+               linkText
+        from bus_sales_vehicle_order
+        where salesOrderSid = #{sid}
+    </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -82,16 +82,26 @@ public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehi
     }
 
     public void saveOrder(List<BusSalesVehicleOrderDto> vehicleList, String sid) {
-        List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(sid) ;
-        if (stringList.size()>0){
+        List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(sid);
+        if (stringList.size() > 0) {
             //删除
             baseMapper.deleteBySalesOrderSid(sid);
-            for (int i = 0; i <vehicleList.size(); i++) {
+            for (int i = 0; i < vehicleList.size(); i++) {
                 BusSalesVehicleOrderDto busSalesVehicleOrderDto = vehicleList.get(i);
                 BusSalesVehicleOrder busSalesVehicleOrder = new BusSalesVehicleOrder();
-                BeanUtil.copyProperties(busSalesVehicleOrderDto,busSalesVehicleOrder,"sid");
+                BeanUtil.copyProperties(busSalesVehicleOrderDto, busSalesVehicleOrder, "sid");
                 save(busSalesVehicleOrder);
             }
         }
     }
+
+    /**
+     * 根据销售订单sid查询销售订单的采购订单
+     *
+     * @param sid 销售订单sid
+     * @return
+     */
+    public List<BusSalesVehicleOrderDetailsVo> detailsList(String sid) {
+        return baseMapper.detailsList(sid);
+    }
 }