diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 7d0af33562..2c1b96b536 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -26,6 +26,8 @@ package com.yxt.anrui.buscenter.api.bussalesorder; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java index 4afa539107..53b0c0c109 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java @@ -26,6 +26,8 @@ package com.yxt.anrui.buscenter.api.bussalesorder; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java similarity index 97% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 771c5053aa..cf99cdc60d 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -23,11 +23,12 @@ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* *********************************************************/ -package com.yxt.anrui.buscenter.api.bussalesorder.app; +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java new file mode 100644 index 0000000000..84780b0de5 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDepositInfoVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:27 + * @Description + */ +@Data +public class AppOrderDepositInfoVo implements Vo { + private static final long serialVersionUID = 3569780647862829018L; + + @ApiModelProperty(value = "单台订金") + private String deposit; + @ApiModelProperty(value = "订金合计") + private String depositTotal; + @ApiModelProperty(value = "订金备注") + private String depositRemarks; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java new file mode 100644 index 0000000000..0a736c0848 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:23 + * @Description + */ +@Data +public class AppOrderDetailsVo implements Vo { + private static final long serialVersionUID = 430116235810980123L; + + @ApiModelProperty(value = "合同编号") + private String contractId; + @ApiModelProperty(value = "制单日期") + private String orderDate; + @ApiModelProperty(value = "客户sid") + private String customerSid; + @ApiModelProperty(value = "客户头像") + private String customerImage; + @ApiModelProperty(value = "客户名称") + private String name; + @ApiModelProperty(value = "客户电话") + private String phone; + @ApiModelProperty(value = "客户类型") + private String customerKey; + @ApiModelProperty(value = "订单类型") + private String orderType; + @ApiModelProperty(value = "挂靠公司") + private String affiliated; + @ApiModelProperty(value = "开票类型") + private String invoiceType; + @ApiModelProperty(value = "销售机构") + private String salesOrg; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "销售专员") + private String sellerName; + @ApiModelProperty(value = "保险信息") + private String insuranceInfo; + @ApiModelProperty(value = "总优惠") + private String totaldiscount; + @ApiModelProperty(value = "补充说明") + private String addRemarks; + @ApiModelProperty(value = "车型信息") + private AppOrderModelInfoVo modelInfo; + @ApiModelProperty(value = "价格信息") + private AppOrderPriceInfoVo priceInfo; + @ApiModelProperty(value = "上装信息") + private AppOrderTopInfoVo topInfo; + @ApiModelProperty(value = "主车优惠") + private List discountList; + @ApiModelProperty(value = "订金信息") + private AppOrderDepositInfoVo depositInfo; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDiscountListVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDiscountListVo.java new file mode 100644 index 0000000000..1785e1ce7b --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDiscountListVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:26 + * @Description + */ +@Data +public class AppOrderDiscountListVo implements Vo { + private static final long serialVersionUID = -3316798613545948890L; + + @ApiModelProperty(value = "优惠名称") + private String discountName; + @ApiModelProperty(value = "价值") + private String price; + @ApiModelProperty(value = "说明") + private String explain; + @ApiModelProperty(value = "数量") + private String number; + @ApiModelProperty(value = "总价值") + private String total; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java new file mode 100644 index 0000000000..bbdf295202 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderModelInfoVo.java @@ -0,0 +1,36 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:24 + * @Description + */ +@Data +public class AppOrderModelInfoVo implements Vo { + private static final long serialVersionUID = -4115558574921406198L; + + @ApiModelProperty(value = "车型图片") + private String modelImage; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "配置sid") + private String configSid; + private String brand; + private String price; + @ApiModelProperty(value = "类型") + private String type; + @ApiModelProperty(value = "车架号") + private List vinList; + @ApiModelProperty(value = "采购订单编号") + private List orderList; + @ApiModelProperty(value = "合计数量") + private String total; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java new file mode 100644 index 0000000000..96354831af --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderPriceInfoVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:25 + * @Description + */ +@Data +public class AppOrderPriceInfoVo implements Vo { + private static final long serialVersionUID = 1242900120552287570L; + + @ApiModelProperty(value = "主车成交价") + private String transactionPrice; + @ApiModelProperty(value = "台数") + private String number; + + @ApiModelProperty(value = "车价合计") + private String totalPrice; + @ApiModelProperty(value = "预计提车日期") + private String date; + @ApiModelProperty(value = "预计提车地点") + private String address; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderRemarkDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java similarity index 88% rename from anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderRemarkDto.java rename to anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java index a09611f23b..e7e49c0222 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/AppOrderRemarkDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderRemarkDto.java @@ -1,4 +1,4 @@ -package com.yxt.anrui.buscenter.api.bussalesorder.app; +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java new file mode 100644 index 0000000000..2a07136722 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTopInfoVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:26 + * @Description + */ +@Data +public class AppOrderTopInfoVo implements Vo { + private static final long serialVersionUID = -6895216586396967122L; + + /** + * 拼接字段:委改方式:小委改、委改厂:第三委改厂、外廓尺寸:7.8m*3m、板材厚度:5cm、板材材料:合金材质、公告型号:T-B123456 + * 字段为null或者“” 时 不拼接 + */ + @ApiModelProperty(value = "上装信息") + private String topBean; + @ApiModelProperty(value = "合同附件") + private List contractImages; +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java index 3f08da5511..efe12b9c0b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java @@ -33,7 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderBillInfoVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderSubmitInfoVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; import com.yxt.anrui.buscenter.api.bussalesorder.app.AppModelInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index eaea182296..106ebc7c3f 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -38,7 +38,7 @@ where sid = #{businessSid} - SELECT bo.sid as saleOrderSid, bo.billNo as saleOrderId, bo.customerClass as customerType, diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index b5e2fa2cb1..e32e0d4ae4 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -27,6 +27,8 @@ package com.yxt.anrui.buscenter.biz.bussalesorder; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 2b86a9f173..9ed3637391 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -49,6 +49,8 @@ import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDeta import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto; import com.yxt.anrui.buscenter.api.bussalesorder.*; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDto; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index 33158cdfbf..518fe01ff9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -27,6 +27,7 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeignFallback; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; @@ -39,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; @@ -220,5 +222,10 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean getSubmitInfo(@PathVariable(value = "saleOrderSid") String sid); + @ApiOperation("销售订单详情") + @GetMapping("/getSaleOrderDetail/{saleOrderSid}") + @ResponseBody + ResultBean getSaleOrderDetail(@PathVariable(value = "saleOrderSid") String sid); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index ec1b7e26ca..4024d11de6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.depositinfo.DepositInfoDto; @@ -38,6 +39,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; @@ -189,4 +191,9 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { public ResultBean getSubmitInfo(String sid) { return null; } + + @Override + public ResultBean getSaleOrderDetail(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoDto.java index e61f16392b..8749f82bfc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/depositinfo/DepositInfoDto.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Author dimengzhe * @Date 2022/6/7 14:48 - * @Description + * @Description 销售订单-订金信息 */ @Data public class DepositInfoDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountDto.java index 2bf38c044f..8aade8d03f 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountDto.java @@ -7,7 +7,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/2 11:53 - * @Description + * @Description 销售订单-主车优惠 */ @Data public class DiscountDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountInfo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountInfo.java index b77045890f..9b0bb06b65 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountInfo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountInfo.java @@ -8,7 +8,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/2 11:54 - * @Description + * @Description 销售订单-主车优惠 */ @Data public class DiscountInfo implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountListVo.java index 74fd01a0dd..dedd6f5c59 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountListVo.java @@ -7,7 +7,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/2 10:51 - * @Description + * @Description 销售订单-主车优惠 */ @Data public class DiscountListVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountVo.java index c5b80d0e06..faa920eacd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/discount/DiscountVo.java @@ -8,7 +8,7 @@ import java.util.List; /** * @Author dimengzhe * @Date 2022/6/2 13:55 - * @Description + * @Description 销售订单-主车优惠 */ @Data public class DiscountVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java index 16a25f0bab..b6ff744b54 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoDto.java @@ -8,7 +8,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/6 17:22 - * @Description + * @Description 销售订单-保险说明 */ @Data public class InsuranceInfoDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java index b92e929a7f..381eb29f4b 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/insurance/InsuranceInfoVo.java @@ -7,7 +7,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/6 17:20 - * @Description + * @Description 销售订单-保险说明 */ @Data public class InsuranceInfoVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java index 51d626ca67..0e81c8c938 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/DepositListQuery.java @@ -3,12 +3,11 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.model; import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; /** * @Author dimengzhe * @Date 2022/6/8 10:45 - * @Description + * @Description 移动端-销售订单-虚拟订单订车列表查询条件 */ @Data public class DepositListQuery implements Query { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java index dcf852eff2..54d4529c66 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/ModelDto.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull; /** * @Author dimengzhe * @Date 2022/5/31 17:13 - * @Description + * @Description 移动端-销售订单-车型信息 */ @Data public class ModelDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java index b91ae2f72c..88356b5fc8 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/model/OrderInfoDto.java @@ -12,7 +12,7 @@ import java.util.List; /** * @Author dimengzhe * @Date 2022/5/31 17:14 - * @Description + * @Description 移动端-销售订单-车型信息 */ @Data public class OrderInfoDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java new file mode 100644 index 0000000000..c5a58bb5a5 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDepositInfoVo.java @@ -0,0 +1,21 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:05 + * @Description + */ +@Data +public class OrderDepositInfoVo implements Vo { + private static final long serialVersionUID = -6588818888534142465L; + @ApiModelProperty(value = "单台订金") + private String deposit; + @ApiModelProperty(value = "订金合计") + private String depositTotal; + @ApiModelProperty(value = "订金备注") + private String depositRemarks; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java new file mode 100644 index 0000000000..eb077570b1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -0,0 +1,60 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/9 14:56 + * @Description 移动端销售订单详情 + */ +@Data +public class OrderDetailsVo implements Vo { + private static final long serialVersionUID = 3824138856793171263L; + @ApiModelProperty(value = "合同编号") + private String contractId; + @ApiModelProperty(value = "制单日期") + private String orderDate; + @ApiModelProperty(value = "客户sid") + private String customerSid; + @ApiModelProperty(value = "客户头像") + private String customerImage; + @ApiModelProperty(value = "客户名称") + private String name; + @ApiModelProperty(value = "客户电话") + private String phone; + @ApiModelProperty(value = "客户类型") + private String customerKey; + @ApiModelProperty(value = "订单类型") + private String orderType; + @ApiModelProperty(value = "挂靠公司") + private String affiliated; + @ApiModelProperty(value = "开票类型") + private String invoiceType; + @ApiModelProperty(value = "销售机构") + private String salesOrg; + @ApiModelProperty(value = "部门名称") + private String departmentName; + @ApiModelProperty(value = "销售专员") + private String sellerName; + @ApiModelProperty(value = "保险信息") + private String insuranceInfo; + @ApiModelProperty(value = "总优惠") + private String totaldiscount; + @ApiModelProperty(value = "补充说明") + private String addRemarks; + @ApiModelProperty(value = "车型信息") + private OrderModelInfoVo modelInfo; + @ApiModelProperty(value = "价格信息") + private OrderPriceInfoVo priceInfo; + @ApiModelProperty(value = "上装信息") + private OrderTopInfoVo topInfo; + @ApiModelProperty(value = "主车优惠") + private List discountList; + @ApiModelProperty(value = "订金信息") + private OrderDepositInfoVo depositInfo; + +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDiscountListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDiscountListVo.java new file mode 100644 index 0000000000..197f79a337 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDiscountListVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/9 16:02 + * @Description + */ +@Data +public class OrderDiscountListVo implements Vo { + private static final long serialVersionUID = -4266703223623523971L; + @ApiModelProperty(value = "优惠名称") + private String discountName; + @ApiModelProperty(value = "价值") + private String price; + @ApiModelProperty(value = "说明") + private String explain; + @ApiModelProperty(value = "数量") + private String number; + @ApiModelProperty(value = "总价值") + private String total; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java new file mode 100644 index 0000000000..c28c5e20d1 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderModelInfoVo.java @@ -0,0 +1,35 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/9 15:45 + * @Description 销售订单详情-车型信息 + */ +@Data +public class OrderModelInfoVo implements Vo { + private static final long serialVersionUID = -7281495389286141652L; + @ApiModelProperty(value = "车型图片") + private String modelImage; + @ApiModelProperty(value = "车型名称") + private String modelName; + @ApiModelProperty(value = "车型sid") + private String modelSid; + @ApiModelProperty(value = "配置sid") + private String configSid; + private String brand; + private String price; + @ApiModelProperty(value = "类型") + private String type; + @ApiModelProperty(value = "车架号") + private List vinList; + @ApiModelProperty(value = "采购订单编号") + private List orderList; + @ApiModelProperty(value = "合计数量") + private String total; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java new file mode 100644 index 0000000000..9da4f9f9a0 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderPriceInfoVo.java @@ -0,0 +1,26 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/9 15:58 + * @Description + */ +@Data +public class OrderPriceInfoVo implements Vo { + private static final long serialVersionUID = -3487760224117936621L; + @ApiModelProperty(value = "主车成交价") + private String transactionPrice; + @ApiModelProperty(value = "台数") + private String number; + + @ApiModelProperty(value = "车价合计") + private String totalPrice; + @ApiModelProperty(value = "预计提车日期") + private String date; + @ApiModelProperty(value = "预计提车地点") + private String address; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java index 1f771e01f2..d97d8ead7a 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderRemarksDto.java @@ -7,7 +7,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/8 9:49 - * @Description + * @Description 移动端销售订单补充说明 */ @Data public class OrderRemarksDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java index ad0d912867..0e7d838e7d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderSubmitInfoVo.java @@ -7,7 +7,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/9 13:40 - * @Description + * @Description 移动端-销售订单-确认提交 */ @Data public class OrderSubmitInfoVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTopInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTopInfoVo.java new file mode 100644 index 0000000000..368dfb39a7 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTopInfoVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/9 15:55 + * @Description 销售订单详情-上装信息 + */ +@Data +public class OrderTopInfoVo implements Vo { + private static final long serialVersionUID = 4682350259861289455L; + /** + * 拼接字段:委改方式:小委改、委改厂:第三委改厂、外廓尺寸:7.8m*3m、板材厚度:5cm、板材材料:合金材质、公告型号:T-B123456 + * 字段为null或者“” 时 不拼接 + */ + @ApiModelProperty(value = "上装信息") + private String topBean; + @ApiModelProperty(value = "合同附件") + private List contractImages; +} diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceDto.java index 4b2b9d7165..ad2934b3df 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceDto.java @@ -8,7 +8,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/6 10:40 - * @Description + * @Description 销售订单-价格信息 */ @Data public class PriceDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java index 949e2b9ca3..9d2e53aa76 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/price/PriceVo.java @@ -7,7 +7,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/6/2 16:54 - * @Description + * @Description 销售订单价格信息 */ @Data public class PriceVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java index af8962f827..be966526af 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopDto.java @@ -10,7 +10,7 @@ import java.util.List; /** * @Author dimengzhe * @Date 2022/6/1 16:02 - * @Description 上装信息 + * @Description 销售订单-上装信息 */ @Data public class TopDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java index 39416d9544..6aca07d832 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/topinfo/TopVo.java @@ -9,7 +9,7 @@ import java.util.List; /** * @Author dimengzhe * @Date 2022/6/1 16:50 - * @Description + * @Description 销售订单-上装信息 */ @Data public class TopVo implements Vo { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java index adae24bf60..416d1b3c56 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicle/VehicleDto.java @@ -8,7 +8,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/5/31 17:19 - * @Description + * @Description 销售订单-车辆信息 */ @Data public class VehicleDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java index 990181240f..ca6bc28b4d 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/vehicleorder/VehicleOrderDto.java @@ -8,7 +8,7 @@ import lombok.Data; /** * @Author dimengzhe * @Date 2022/5/31 17:23 - * @Description + * @Description 销售订单-采购订单 */ @Data public class VehicleOrderDto implements Dto { diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 8d297f9697..215000f665 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; import com.yxt.anrui.crm.api.crmvehicledemand.AppCrmOrderVehicleDemandQuery; import com.yxt.anrui.crm.api.crmvehicledemand.AppOrderCrmVehicleDemandVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.AppBusSalesOrderFeign; @@ -39,6 +40,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; @@ -277,4 +279,9 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { return appBusSalesOrderService.getSubmitInfo(sid); } + @Override + public ResultBean getSaleOrderDetail(String sid) { + return appBusSalesOrderService.getSaleOrderDetail(sid); + } + } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 10ffb9e8e9..d988c63f8d 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -26,12 +26,13 @@ package com.yxt.anrui.terminal.biz.autoservice.saleOrders; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.db.sql.Order; import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDepositFeign; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderQuery; import com.yxt.anrui.buscenter.api.busmaindeposit.app.AppBusMainDepositOrderVo; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.app.*; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppBusSalesOrderVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderRemarkDto; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositFeign; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositDto; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppBusSalesOrderDepositVo; @@ -65,6 +66,7 @@ import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfo import com.yxt.anrui.terminal.api.autoservice.saleOrders.insurance.InsuranceInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.DepositListQuery; import com.yxt.anrui.terminal.api.autoservice.saleOrders.model.ModelDto; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderDetailsVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderRemarksDto; import com.yxt.anrui.terminal.api.autoservice.saleOrders.order.OrderSubmitInfoVo; import com.yxt.anrui.terminal.api.autoservice.saleOrders.price.PriceDto; @@ -369,4 +371,8 @@ public class AppBusSalesOrderService { BeanUtil.copyProperties(vo, v); return rb.success().setData(v); } + + public ResultBean getSaleOrderDetail(String sid) { + return null; + } } \ No newline at end of file