From 456e5fc948f1c0facc27392fc7600f4fbae12446 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Thu, 24 Nov 2022 15:50:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=BE=85=E5=87=BA=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/busdelivered/BusDeliveredDto.java | 11 +++++-- .../api/bussalesorder/BusSalesOrderFeign.java | 5 +++ .../BusSalesOrderFeignFallback.java | 5 +++ .../bussalesorder/BusSalesOrderMapper.java | 2 ++ .../biz/bussalesorder/BusSalesOrderMapper.xml | 4 +++ .../biz/bussalesorder/BusSalesOrderRest.java | 5 +++ .../bussalesorder/BusSalesOrderService.java | 9 +++++ .../FinCollectionConfirmationService.java | 33 +++++++++++++++++-- .../portal/biz/sysuser/SysUserMapper.xml | 33 ++++++++++--------- 9 files changed, 88 insertions(+), 19 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java index 7b97ac62b5..c098e415a8 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdelivered/BusDeliveredDto.java @@ -52,8 +52,15 @@ public class BusDeliveredDto implements Dto { private static final long serialVersionUID = -6078868417258339533L; private String sid; - @ApiModelProperty("类型：1车款交清、2欠款提车") - private Integer type; + /* @ApiModelProperty("类型：1车款交清、2欠款提车") + private Integer type;*/ + @ApiModelProperty("款项类型") + private String subscription; + private String subscriptionKey; + @ApiModelProperty("付款方式 1 全款 2 贷款") + private String paymentMethod; + @ApiModelProperty("付款方式 1 全款 2 贷款") + private String paymentMethodKey; @ApiModelProperty("合同编号") private String contractNo; @ApiModelProperty("客户名称") 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 447bd84afb..64f6c8c612 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 @@ -238,4 +238,9 @@ public interface BusSalesOrderFeign { @GetMapping("/selectByContractNo") @ResponseBody ResultBean selectByContractNo(@RequestParam("contractNo")String contractNo); + + @ApiOperation("查询该合同下的销售订单") + @GetMapping("/selectOrderByContractNo") + @ResponseBody + ResultBean selectOrderByContractNo(@RequestParam("contractNo")String contractNo); } \ No newline at end of file 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 affad6efba..043cda55e1 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 @@ -214,4 +214,9 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign { public ResultBean selectByContractNo(String contractNo) { return null; } + + @Override + public ResultBean selectOrderByContractNo(String contractNo) { + return null; + } } \ No newline at end of file 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 61f09deb8d..f197e96df2 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 @@ -183,4 +183,6 @@ public interface BusSalesOrderMapper extends BaseMapper { BusSalesOrderDetailsVo getByContractNo(String contractNo); String getVinsidByConSid(@Param("contractNo") String contractNo, @Param("vinNo") String vinNo); + + BusSalesOrder selectOrderByContractNo(String contractNo); } \ No newline at end of file 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 9a132dd1ea..0197442983 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 @@ -277,4 +277,8 @@ where bo.contractNo = #{contractNo} and bv.linkNo = #{vinNo} + + \ No newline at end of file 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 282d2d112a..a8581e0b27 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 @@ -291,4 +291,9 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { public ResultBean selectByContractNo(String contractNo) { return busSalesOrderService.selectByContractNoOne(contractNo); } + + @Override + public ResultBean selectOrderByContractNo(String contractNo) { + return busSalesOrderService.selectOrderByContractNo(contractNo); + } } 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 e6589f201c..bf9d3f8f3e 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 @@ -2913,4 +2913,13 @@ public class BusSalesOrderService extends MybatisBaseService selectOrderByContractNo(String contractNo) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrder busSalesOrder = baseMapper.selectOrderByContractNo(contractNo); + if(busSalesOrder == null){ + return rb; + } + return rb.success().setData(busSalesOrder); + } } \ No newline at end of file diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 2c1a3b1127..bd81f833b1 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -39,7 +39,12 @@ import com.yxt.anrui.base.api.commonappendix.*; import com.yxt.anrui.base.api.commoncontract.CommonContract; import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.common.enums.VehicleStateTempOrLast; +import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredDto; +import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice; import com.yxt.anrui.fin.api.fincollectionconfirmation.*; import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo; @@ -113,6 +118,8 @@ public class FinCollectionConfirmationService extends MybatisBaseService createQueryWrapper(FinCollectionConfirmationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -1153,10 +1160,32 @@ public class FinCollectionConfirmationService extends MybatisBaseService busSalesOrderResultBean = busSalesOrderFeign.selectOrderByContractNo(v.getContractNo()); + if(busSalesOrderResultBean.getSuccess()){ + BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData(); + if(busSalesOrder != null){ + busDeliveredDto.setPaymentMethodKey(busSalesOrder.getPayTypeKey()); + busDeliveredDto.setPaymentMethod(busSalesOrder.getPayType()); + } + } + busDeliveredDto.setContractNo(v.getContractNo()); + busDeliveredDto.setName(v.getCustomerName()); + busDeliveredDto.setVinNo(v.getVIN()); + busDeliveredDto.setMobile(v.getCustomerPhone()); + busDeliveredDto.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString()); + //根据客户sid查询客户的身份证号和 + ResultBean orderDetails = busSalesOrderFeign.getSaleOrderDetails(busSalesOrderPrice.getSalesOrderSid()); + AppOrderDetailsVo vo = orderDetails.getData(); + if(vo != null){ + AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo(); + busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName()); + } + ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto); } - - } }); //查询该申请已认款金额总数 diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml index 20b9f64cfe..ef9e2318c1 100644 --- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml +++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysuser/SysUserMapper.xml @@ -111,18 +111,20 @@ - select * - from sys_user - where mobile = #{mobile} - and isDelete = 0 - and userType = 1 + select su.* + from sys_user su + left join sys_staffinfo si on si.sid = su.staffSid + where su.mobile = #{mobile} + and su.isDelete = 0 + and su.userType = 1 and si.personTypeKey != '01'