From cceab8c08171d706441080581e3e5908618d123f Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 6 Apr 2023 18:17:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/enums/VehicleStateTempOrLast.java | 2 +- .../api/busdelivered/BusDeliveredVo.java | 5 +++- .../BusSalesOrderDiscountFeign.java | 5 ++++ .../BusSalesOrderDiscountFeignFallback.java | 5 ++++ .../OrderDiscountVo.java | 27 +++++++++++++++++++ .../BusSalesOrderDiscountMapper.java | 3 +++ .../BusSalesOrderDiscountMapper.xml | 4 +++ .../BusSalesOrderDiscountRest.java | 6 +++++ .../BusSalesOrderDiscountService.java | 10 ++++++- .../CrmCustomerTempMapper.java | 3 +++ .../crmcustomertemp/CrmCustomerTempMapper.xml | 11 ++++++-- .../CrmCustomerTempService.java | 2 +- .../api/autoservice/retrieval/VinListVo.java | 2 ++ doc/databases/bus-center_tables.sql | 6 ++--- 14 files changed, 82 insertions(+), 9 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/OrderDiscountVo.java diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java index 47cd34d691..3fec82767f 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/VehicleStateTempOrLast.java @@ -15,7 +15,7 @@ public class VehicleStateTempOrLast { ARREARS_INVOICING("0004", "欠款开票"), - PAY_MODELS("0002", "交清车款"), + PAY_MODELS("0002", "正常交款"), BAG_CARD_BUSINESS("0003", "包牌业务"), diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java index 173a755735..e6c6b6e431 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredVo.java @@ -52,8 +52,11 @@ public class BusDeliveredVo implements Vo { private static final long serialVersionUID = -9212919952192716940L; private String sid; - @ApiModelProperty("类型：1已交款、2未交款") +// @ApiModelProperty("类型：1已交款、2未交款") + @ApiModelProperty("业务状态") private String type; + @ApiModelProperty("销售类型") + private String paymentMethod; @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户名称") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java index a68cbb2573..b23a83bebe 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java @@ -70,4 +70,9 @@ public interface BusSalesOrderDiscountFeign { @PostMapping("/delete") @ResponseBody ResultBean delete(@RequestParam(value = "saleOrderSid") String orderSid, @RequestParam(value = "sid") String sid); + + @ApiOperation("出库选择套餐列表") + @GetMapping("/discountList") + @ResponseBody + ResultBean> discountList(@RequestParam("contractNo") String contractNo,@RequestParam("vinSid")String vinSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeignFallback.java index cdef35de33..fb2f929376 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeignFallback.java @@ -64,4 +64,9 @@ public class BusSalesOrderDiscountFeignFallback implements BusSalesOrderDiscount public ResultBean delete(String orderSid, String sid) { return null; } + + @Override + public ResultBean> discountList(String contractNo,String vinSid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/OrderDiscountVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/OrderDiscountVo.java new file mode 100644 index 0000000000..339867466c --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/OrderDiscountVo.java @@ -0,0 +1,27 @@ +package com.yxt.anrui.buscenter.api.bussalesorderdiscount; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2023/4/6 16:50 + * @Description + */ +@Data +public class OrderDiscountVo { + + @ApiModelProperty("优惠名称") + private String name; + @ApiModelProperty("价值") + private String price; + @ApiModelProperty("优惠项目说明") + private String discountExplain; + @ApiModelProperty("数量") + private Integer num; + @ApiModelProperty("剩余数量") + private Integer surplusNum; + @ApiModelProperty("本次赠送数量") + private Integer giveNum; + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java index e1a644e248..31bbaeced9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java +++ b/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.mapper.BaseMapper; import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -109,4 +110,6 @@ public interface BusSalesOrderDiscountMapper extends BaseMapper selectDiscount(String sid); + + List discountList(String contractNo); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml index 23ea034ac2..0f9b83842d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml @@ -55,4 +55,8 @@ from bus_sales_order_discount where salesOrderSid = #{sid} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountRest.java index 34d8706d6a..8bd872fd7a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountRest.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.biz.bussalesorderdiscount; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountFeign; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; import com.yxt.common.core.result.ResultBean; @@ -71,4 +72,9 @@ public class BusSalesOrderDiscountRest implements BusSalesOrderDiscountFeign { public ResultBean delete(String orderSid, String sid) { return busSalesOrderDiscountService.deleteDiscount(orderSid, sid); } + + @Override + public ResultBean> discountList(String contractNo, String vinSid) { + return busSalesOrderDiscountService.discountList(contractNo, vinSid); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java index bd9db52689..ac303346f6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java @@ -31,6 +31,7 @@ import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListV import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDto; +import com.yxt.anrui.buscenter.api.bussalesorderdiscount.OrderDiscountVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountDto; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppBusSalesOrderDiscountListVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.app.AppDiscountInfoDto; @@ -140,7 +141,7 @@ public class BusSalesOrderDiscountService extends MybatisBaseService selectDiscount(String sid) { return baseMapper.selectDiscount(sid); } + + public ResultBean> discountList(String contractNo,String vinSid) { + ResultBean> rb = ResultBean.fireFail(); + //查询出库的选择套餐中是否存在 + List list = baseMapper.discountList(contractNo); + return rb.success().setData(list); + } } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java index 3ee99685ee..79eaedeba2 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.java @@ -125,8 +125,11 @@ public interface CrmCustomerTempMapper extends BaseMapper { /** * 根据客户编码查询客户信息 + * * @param customerNo 客户编码 * @return */ CrmCustomerTemp selectByCustomerNo(String customerNo); + + List selectLists(@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml index 9221799df6..39e41227c6 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml @@ -20,8 +20,8 @@ select * from crm_customer_temp where customerNo = #{customerNo} + + \ No newline at end of file diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java index a8c3b5bd59..004d70142f 100644 --- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java +++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java @@ -125,7 +125,7 @@ public class CrmCustomerTempService extends MybatisBaseService listAll(CrmCustomerTempQuery query) { QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); + return baseMapper.selectLists(qw); } private QueryWrapper createQueryWrapper(CrmCustomerTempQuery query) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java index 9f8058dcc5..ecf87fb7dc 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/VinListVo.java @@ -10,4 +10,6 @@ public class VinListVo implements Vo { @ApiModelProperty("车架号") private String vin; + @ApiModelProperty("业务状态") + private String businessState; } diff --git a/doc/databases/bus-center_tables.sql b/doc/databases/bus-center_tables.sql index 9e8663aaac..4770191b58 100644 --- a/doc/databases/bus-center_tables.sql +++ b/doc/databases/bus-center_tables.sql @@ -264,9 +264,9 @@ CREATE TABLE `bus_delivered_details_discount` `name` varchar(64) DEFAULT NULL COMMENT '优惠包名称', `price` varchar(64) DEFAULT NULL COMMENT '价值', `discountExplain` VARCHAR(64) DEFAULT NULL COMMENT '优惠包项目说明', - `num` VARCHAR(64) DEFAULT NULL COMMENT '数量', - `surplusNum` VARCHAR(64) DEFAULT NULL COMMENT '剩余数量', - `useMessageSid` VARCHAR(64) DEFAULT NULL COMMENT '本次赠送数量', + `num` int(32) DEFAULT NULL COMMENT '数量', + `surplusNum` int(32) DEFAULT NULL COMMENT '剩余数量', + `giveNum` int(32) DEFAULT NULL COMMENT '本次赠送数量', PRIMARY KEY (`id`), KEY `id` (`id`) ) ENGINE = INNODB