From f288f141ad05e793356c25448a612623cb1ca62f Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 7 Sep 2023 09:39:44 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=B4=B7?= =?UTF-8?q?=E6=AC=BE=E4=BA=BA=E7=A1=AE=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusSalesOrderBorrowerFeign.java | 12 +++++++ .../BusSalesOrderBorrowerFeignFallback.java | 10 ++++++ .../OrderBorrowQuery.java | 25 +++++++++++++ .../api/bussalesorderborrower/OrderNumVo.java | 22 ++++++++++++ .../BusSalesOrderBorrowerMapper.java | 2 ++ .../BusSalesOrderBorrowerMapper.xml | 4 +++ .../BusSalesOrderBorrowerRest.java | 18 ++++++---- .../BusSalesOrderBorrowerService.java | 36 +++++++++++++++---- .../LoanPreloanCreditApplyFeign.java | 1 + .../LoanPreloanQuery.java | 5 ++- .../LoanPreloanCreditApplyMapper.java | 2 +- .../LoanPreloanCreditApplyMapper.xml | 20 ++++++++++- .../LoanPreloanCreditApplyService.java | 19 ++++++++-- 13 files changed, 158 insertions(+), 18 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderBorrowQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderNumVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java index 618a7260c2..da63979176 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeign.java @@ -80,4 +80,16 @@ public interface BusSalesOrderBorrowerFeign { @PostMapping("/updateBusNo") @ResponseBody ResultBean updateBusNo(@RequestParam("busNo") String busNo, @RequestParam("saleOrderBorrowerSid") String saleOrderBorrowerSid); + + @ApiOperation("点击贷款人确认时弹出的数量") + @GetMapping("/getOrderNum") + @ResponseBody + ResultBean getOrderNum(@RequestParam("sid") String sid); + + @ApiOperation("确认数量") + @PostMapping("/confirmBorrow") + @ResponseBody + ResultBean confirmBorrow(@RequestBody OrderBorrowQuery query); + + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java index 5c6c071c92..304d1c4f7c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/BusSalesOrderBorrowerFeignFallback.java @@ -74,4 +74,14 @@ public class BusSalesOrderBorrowerFeignFallback implements BusSalesOrderBorrower public ResultBean updateBusNo(String busNo, String saleOrderBorrowerSid) { return null; } + + @Override + public ResultBean getOrderNum(String sid) { + return null; + } + + @Override + public ResultBean confirmBorrow(OrderBorrowQuery query) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderBorrowQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderBorrowQuery.java new file mode 100644 index 0000000000..9448b241d0 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderBorrowQuery.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.buscenter.api.bussalesorderborrower; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/7 + **/ +@Data +public class OrderBorrowQuery implements Query { + private static final long serialVersionUID = -4207473035489477666L; + @ApiModelProperty("销售订单sid") + private String sid; + @ApiModelProperty("贷款人sid") + private String customSid; + @ApiModelProperty("贷款人名称") + private String borrowerName; + @ApiModelProperty("贷款人手机号") + private String mobile; + @ApiModelProperty("台数") + private int vehCount; +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderNumVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderNumVo.java new file mode 100644 index 0000000000..59a1f22cbc --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderborrower/OrderNumVo.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.buscenter.api.bussalesorderborrower; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @description: + * @author: dimengzhe + * @date: 2023/9/7 + **/ +@Data +public class OrderNumVo implements Vo { + private static final long serialVersionUID = 6808159039047017010L; + + @ApiModelProperty("订单总台数") + private String orderAllNum; + @ApiModelProperty("订单剩余台数") + private String orderYuNum; + + +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java index 69bf38a37a..36c740547d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerMapper.java @@ -66,4 +66,6 @@ public interface BusSalesOrderBorrowerMapper extends BaseMapper SELECT * FROM bus_sales_order_borrower ${ew.sqlSegment} + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java index 8953c3ef4d..c5ca8955e9 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerRest.java @@ -25,6 +25,7 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesorderborrower; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -35,13 +36,6 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerQuery; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerVo; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDto; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; - /** * Project: anrui-buscenter(销售订单)
* File: BusSalesOrderBorrowerFeignFallback.java
@@ -103,4 +97,14 @@ public class BusSalesOrderBorrowerRest implements BusSalesOrderBorrowerFeign { public ResultBean updateBusNo(String busNo, String saleOrderBorrowerSid) { return busSalesOrderBorrowerService.updateBusNo(busNo, saleOrderBorrowerSid); } + + @Override + public ResultBean getOrderNum(String sid) { + return busSalesOrderBorrowerService.getOrderNum(sid); + } + + @Override + public ResultBean confirmBorrow(OrderBorrowQuery query) { + return busSalesOrderBorrowerService.confirmBorrow(query); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java index 022d9c9488..be65ea6c6a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderborrower/BusSalesOrderBorrowerService.java @@ -28,19 +28,17 @@ package com.yxt.anrui.buscenter.biz.bussalesorderborrower; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.buscenter.api.bussalesorderborrower.*; +import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; +import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrower; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerQuery; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerVo; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDto; -import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -60,6 +58,11 @@ import java.util.List; */ @Service public class BusSalesOrderBorrowerService extends MybatisBaseService { + + @Autowired + private BusSalesOrderPriceService busSalesOrderPriceService; + + private QueryWrapper createQueryWrapper(BusSalesOrderBorrowerQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -113,4 +116,25 @@ public class BusSalesOrderBorrowerService extends MybatisBaseService getOrderNum(String sid) { + ResultBean rb = ResultBean.fireFail(); + OrderNumVo orderNumVo = new OrderNumVo(); + BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(sid); + if (busSalesOrderPrice != null) { + orderNumVo.setOrderAllNum(busSalesOrderPrice.getQuantity().toString()); + } + //查询已使用多少 + int num = baseMapper.selectBySalesOrderSid(sid); + //剩余台数 + int yuNum = busSalesOrderPrice.getQuantity() - num; + orderNumVo.setOrderYuNum(String.valueOf(yuNum)); + return rb.success().setData(orderNumVo); + } + + public ResultBean confirmBorrow(OrderBorrowQuery query) { + ResultBean rb = ResultBean.fireFail(); + + return null; + } } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java index 183a7fb060..c2cc3202e7 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanCreditApplyFeign.java @@ -95,4 +95,5 @@ public interface LoanPreloanCreditApplyFeign { @GetMapping("/judgeIsLoan") @ResponseBody ResultBean judgeIsLoan(@RequestParam("sid") String sid); + } \ No newline at end of file diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java index 8e7a2ebd13..2914add206 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanpreloancreditapply/LoanPreloanQuery.java @@ -19,6 +19,9 @@ public class LoanPreloanQuery implements Query { private String idCard; @ApiModelProperty("手机号码") private String phone; - @ApiModelProperty("用户sid") + @ApiModelProperty("用户sid,即销售专员的用户sid") private String userSid; + + @ApiModelProperty("移动端：姓名、身份证、手机号") + private String name; } diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java index 61f9e0818d..5fffe96d39 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java @@ -60,7 +60,7 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper getOrderLoanPagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw); + IPage getOrderLoanPagerList(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw,@Param("name") String name); LoanPreloanCreditApply judgeIsLoan(String sid); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml index add4b77070..5f396d29e9 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.xml @@ -22,7 +22,25 @@