From f4c4338973592f6332cd8b6777d71ce95d710962 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 14 Apr 2022 18:02:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E7=BC=96=E8=BE=91=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=96=B0=E5=A2=9E=E5=BA=94=E6=94=B6=E6=9C=AA=E6=94=B6?= =?UTF-8?q?=E6=AC=BE=E9=A1=B9=E5=86=85=E5=AE=B9=E3=80=81=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=96=B0=E5=A2=9E=E8=AE=A2=E9=87=91=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E3=80=81=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=88=86=E5=85=AC=E5=8F=B8sid=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E6=AC=BE=E9=A1=B9=E7=A1=AE=E8=AE=A4=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=97=B6=E5=AF=B9=E9=87=91=E9=A2=9D=E7=9A=84=E7=AE=97?= =?UTF-8?q?=E6=B3=95=E9=80=BB=E8=BE=91=E3=80=81=E4=BF=AE=E6=94=B9=E6=AC=BE?= =?UTF-8?q?=E9=A1=B9=E7=A1=AE=E8=AE=A4=E5=8D=95=E6=97=B6=EF=BC=8C=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=B7=B2=E9=80=89=E5=BA=94=E6=94=B6=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractRest.java | 53 ++++- .../buscenter/api/busorder/BusOrder.java | 3 + .../api/busorder/BusOrderAllDto.java | 4 + .../buscenter/api/busorder/BusOrderAllVo.java | 5 +- .../buscenter/api/busorder/BusOrderVo.java | 2 + .../api/busorderdeposit/BusOrderDeposit.java | 67 ++++++ .../busorderdeposit/BusOrderDepositDto.java | 64 +++++ .../busorderdeposit/BusOrderDepositFeign.java | 94 ++++++++ .../BusOrderDepositFeignFallback.java | 100 ++++++++ .../busorderdeposit/BusOrderDepositQuery.java | 64 +++++ .../busorderdeposit/BusOrderDepositVo.java | 64 +++++ .../BusSelectedReceivablesDetailedFeign.java | 29 +-- ...ectedReceivablesDetailedFeignFallback.java | 39 +--- .../BusUncollectedReceivablesDetailed.java | 133 +---------- .../BusUncollectedReceivablesDetailedDto.java | 12 +- ...usUncollectedReceivablesDetailedFeign.java | 30 +-- ...ectedReceivablesDetailedFeignFallback.java | 37 +-- ...usUncollectedReceivablesDetailedQuery.java | 24 -- .../BusUncollectedReceivablesDetailedVo.java | 20 +- .../BusCollectionConfirmationService.java | 1 - .../biz/busorder/BusOrderMapper.java | 1 + .../biz/busorder/BusOrderService.java | 19 ++ .../BusOrderDepositMapper.java | 72 ++++++ .../busorderdeposit/BusOrderDepositMapper.xml | 13 ++ .../busorderdeposit/BusOrderDepositRest.java | 144 ++++++++++++ .../BusOrderDepositService.java | 144 ++++++++++++ .../BusSelectedReceivablesDetailedMapper.java | 22 +- .../BusSelectedReceivablesDetailedMapper.xml | 17 +- .../BusSelectedReceivablesDetailedRest.java | 60 +---- ...BusSelectedReceivablesDetailedService.java | 219 +++++++++--------- ...sUncollectedReceivablesDetailedMapper.java | 2 + ...usUncollectedReceivablesDetailedMapper.xml | 10 + ...BusUncollectedReceivablesDetailedRest.java | 66 +----- ...UncollectedReceivablesDetailedService.java | 79 ++----- 34 files changed, 1095 insertions(+), 618 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDeposit.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositDto.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeign.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeignFallback.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositQuery.java create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositVo.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositMapper.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositMapper.xml create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositRest.java create mode 100644 anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositService.java diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java index 1a72ebe670..cc2a91527e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java @@ -6,6 +6,17 @@ import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum; import com.yxt.anrui.base.api.commonappendix.PcCommonAppendixDto; import com.yxt.anrui.base.api.commoncontract.*; import com.yxt.anrui.base.biz.commonappendix.CommonAppendixService; +import com.yxt.anrui.buscenter.api.busorder.BusOrder; +import com.yxt.anrui.buscenter.api.busorder.BusOrderAllVo; +import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign; +import com.yxt.anrui.buscenter.api.busorder.BusOrderVo; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; +import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo; +import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel; +import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo; +import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo; +import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; +import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.StringUtils; @@ -55,15 +66,16 @@ public class CommonContractRest implements CommonContractFeign { @Autowired private HttpServletResponse response; - @Autowired private CommonContractService commonContractService; - @Autowired private CommonAppendixService commonAppendixService; - @Autowired private FileUploadComponent fileUploadComponent; + @Autowired + private BusUncollectedReceivablesDetailedFeign busUncollectedReceivablesDetailedFeign; + @Autowired + private BusOrderFeign busOrderFeign; @Override public ResultBean> listPage(@RequestBody PagerQuery pq) { @@ -117,6 +129,41 @@ public class CommonContractRest implements CommonContractFeign { commonContract.setSceneSignUrl(s.substring(0, s.length() - 1)); } commonContractService.save(commonContract); + ResultBean all = busOrderFeign.getAll(commonContract.getBusSid()); + BusOrderAllVo data = all.getData(); + BusOrder busOrderDto = data.getBusOrderDto(); + BusOrderModel modelDto = data.getModelDto(); + BusOrderDepositVo busOrderDepositVo = data.getBusOrderDepositVo(); + List vehicleDtos = data.getVehicleDtos(); + //车款 + BigDecimal Single_price = modelDto.getSingle_price().subtract(new BigDecimal(busOrderDepositVo.getDeposit())); + //订金 + String deposit = busOrderDepositVo.getDeposit(); + int fictitious = 1; + for (BusOrderVehicleVo vehicleDto : vehicleDtos) { + BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedDepositDto = new BusUncollectedReceivablesDetailedDto(); + busUncollectedReceivablesDetailedDepositDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); + busUncollectedReceivablesDetailedDepositDto.setReceivablesName("订金"); + busUncollectedReceivablesDetailedDepositDto.setCurrentReceivableMoney(deposit); + busUncollectedReceivablesDetailedDepositDto.setContractNo(busOrderDto.getContractNo()); + busUncollectedReceivablesDetailedDepositDto.setContractSid(commonContract.getSid()); + busUncollectedReceivablesDetailedDepositDto.setCustomerName(busOrderDto.getCustomerName()); + busUncollectedReceivablesDetailedDepositDto.setCustomerSid(busOrderDto.getCustomerSid()); + busUncollectedReceivablesDetailedDepositDto.setCustomerPhone(busOrderDto.getMobile()); + busUncollectedReceivablesDetailedDepositDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedDepositDto); + BusUncollectedReceivablesDetailedDto busUncollectedReceivablesDetailedSingleDto = new BusUncollectedReceivablesDetailedDto(); + busUncollectedReceivablesDetailedSingleDto.setVIN(StringUtils.isNotBlank(vehicleDto.getVINNo()) ? vehicleDto.getVINNo() : String.valueOf(fictitious++)); + busUncollectedReceivablesDetailedSingleDto.setReceivablesName("车款"); + busUncollectedReceivablesDetailedSingleDto.setCurrentReceivableMoney(String.valueOf(Single_price)); + busUncollectedReceivablesDetailedSingleDto.setContractNo(busOrderDto.getContractNo()); + busUncollectedReceivablesDetailedSingleDto.setContractSid(commonContract.getSid()); + busUncollectedReceivablesDetailedSingleDto.setCustomerName(busOrderDto.getCustomerName()); + busUncollectedReceivablesDetailedSingleDto.setCustomerSid(busOrderDto.getCustomerSid()); + busUncollectedReceivablesDetailedSingleDto.setCustomerPhone(busOrderDto.getMobile()); + busUncollectedReceivablesDetailedSingleDto.setUseOrgSid(busOrderDto.getUseOrgSid()); + busUncollectedReceivablesDetailedFeign.saveOrUpdate(busUncollectedReceivablesDetailedSingleDto); + } return rb.success().setData(commonContract.getSid()); } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java index 4bda0124f3..5b440e434c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java @@ -105,4 +105,7 @@ public class BusOrder extends BaseEntity { @ApiModelProperty(value = "合同金额") private BigDecimal contractAmount; + + @ApiModelProperty(value = "分公司sid") + private String useOrgSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllDto.java index 114aeecdee..629f21bcf9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllDto.java @@ -1,6 +1,7 @@ package com.yxt.anrui.buscenter.api.busorder; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositDto; import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountDto; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelDto; import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleDto; @@ -19,6 +20,9 @@ public class BusOrderAllDto implements Dto { @ApiModelProperty("主车车型及价款信息表") private BusOrderModelDto modelDto; + @ApiModelProperty("订金信息") + private BusOrderDepositDto busOrderDepositDto; + @ApiModelProperty("主车优惠情况") private List busOrderDiscountDtoList; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllVo.java index 4e7291beea..6bebc4d41b 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderAllVo.java @@ -1,5 +1,7 @@ package com.yxt.anrui.buscenter.api.busorder; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositDto; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModel; import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelVo; @@ -13,7 +15,6 @@ import java.util.List; @Data public class BusOrderAllVo implements Vo { - private static final long serialVersionUID = 2966394732072870032L; @ApiModelProperty("销售订单客户信息回显") private BusOrder busOrderDto; @@ -26,4 +27,6 @@ public class BusOrderAllVo implements Vo { @ApiModelProperty("车辆详情列表回显") private List vehicleDtos; + @ApiModelProperty("订金信息") + private BusOrderDepositVo busOrderDepositVo; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java index 9ecc7c670b..9a30e46a95 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java @@ -76,4 +76,6 @@ public class BusOrderVo implements Vo { @ApiModelProperty("订金") private BigDecimal deposit; + @ApiModelProperty(value = "分公司sid") + private String useOrgSid; } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDeposit.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDeposit.java new file mode 100644 index 0000000000..e085d50b64 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDeposit.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busorderdeposit; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDeposit.java
+ * Class: com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDeposit
+ * Description: 订金信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "订金信息", description = "订金信息") +@Data +@TableName("bus_order_deposit") +public class BusOrderDeposit extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("单台订金") + private BigDecimal deposit; // 单台订金 + @ApiModelProperty("订金合计") + private BigDecimal depositAll; // 订金合计 + @ApiModelProperty("订金交纳方式") + private String depositType; // 订金交纳方式 + @ApiModelProperty("订金交纳方式key") + private String depositTypeKey; // 订金交纳方式key + @ApiModelProperty("需补交订金") + private BigDecimal makeUpDeposit; // 需补交订金 + @ApiModelProperty("销售订单sid") + private String orderSid; // 销售订单sid +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositDto.java new file mode 100644 index 0000000000..fc1f74a58e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositDto.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busorderdeposit; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositDto.java
+ * Class: com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositDto
+ * Description: 订金信息 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "订金信息 数据传输对象", description = "订金信息 数据传输对象") +@Data +public class BusOrderDepositDto implements Dto { + + @ApiModelProperty("单台订金") + private String deposit; // 单台订金 + @ApiModelProperty("订金合计") + private String depositAll; // 订金合计 + @ApiModelProperty("订金交纳方式") + private String depositType; // 订金交纳方式 + @ApiModelProperty("订金交纳方式key") + private String depositTypeKey; // 订金交纳方式key + @ApiModelProperty("需补交订金") + private String makeUpDeposit; // 需补交订金 + @ApiModelProperty("销售订单sid") + private String orderSid; // 销售订单sid +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeign.java new file mode 100644 index 0000000000..57afde1905 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeign.java @@ -0,0 +1,94 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busorderdeposit; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositFeign.java
+ * Class: com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositFeign
+ * Description: 订金信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "订金信息") +@FeignClient( + contextId = "anrui-buscenter-BusOrderDeposit", + name = "anrui-buscenter", + path = "busorderdeposit", + fallback = BusOrderDepositFeignFallback.class) +public interface BusOrderDepositFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody BusOrderDepositQuery query); + + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(); + + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody BusOrderDepositDto dto); + + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody BusOrderDepositDto dto, @PathVariable("sid") String sid); + + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids); + + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeignFallback.java new file mode 100644 index 0000000000..2087ad28d7 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositFeignFallback.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busorderdeposit; + +import com.yxt.common.core.query.PagerQuery; +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(销售业务)
+ * File: BusOrderDepositFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositFeignFallback
+ * Description: 订金信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BusOrderDepositFeignFallback implements BusOrderDepositFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busorderdeposit/listPage无法访问"); + } + + @Override + public ResultBean> listAll(BusOrderDepositQuery query){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busorderdeposit/listAll无法访问"); + } + + @Override + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busorderdeposit/list无法访问"); + } + + @Override + public ResultBean save(BusOrderDepositDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-buscenter/busorderdeposit/save无法访问"); + } + + @Override + public ResultBean update(BusOrderDepositDto dto, String sid){ + return ResultBean.fireFail().setMsg("接口anrui-buscenter/busorderdeposit/update无法访问"); + } + + @Override + public ResultBean del(String ids){ + return ResultBean.fireFail().setMsg("接口anrui-buscenter/busorderdeposit/del无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-buscenter/busorderdeposit/delBySids无法访问"); + } + + @Override + public ResultBean fetch(String id){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busorderdeposit/fetch无法访问"); + } + + @Override + public ResultBean fetchBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-buscenter/busorderdeposit/fetchBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositQuery.java new file mode 100644 index 0000000000..079472ab13 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositQuery.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busorderdeposit; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositQuery.java
+ * Class: com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositQuery
+ * Description: 订金信息 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "订金信息 查询条件", description = "订金信息 查询条件") +@Data +public class BusOrderDepositQuery implements Query { + + @ApiModelProperty("单台订金") + private String deposit; // 单台订金 + @ApiModelProperty("订金合计") + private String depositAll; // 订金合计 + @ApiModelProperty("订金交纳方式") + private String depositType; // 订金交纳方式 + @ApiModelProperty("订金交纳方式key") + private String depositTypeKey; // 订金交纳方式key + @ApiModelProperty("需补交订金") + private String makeUpDeposit; // 需补交订金 + @ApiModelProperty("销售订单sid") + private String orderSid; // 销售订单sid +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositVo.java new file mode 100644 index 0000000000..70ee228734 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorderdeposit/BusOrderDepositVo.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.busorderdeposit; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositVo.java
+ * Class: com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo
+ * Description: 订金信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@ApiModel(value = "订金信息 视图数据对象", description = "订金信息 视图数据对象") +@Data +public class BusOrderDepositVo implements Vo { + + @ApiModelProperty("单台订金") + private String deposit; // 单台订金 + @ApiModelProperty("订金合计") + private String depositAll; // 订金合计 + @ApiModelProperty("订金交纳方式") + private String depositType; // 订金交纳方式 + @ApiModelProperty("订金交纳方式key") + private String depositTypeKey; // 订金交纳方式key + @ApiModelProperty("需补交订金") + private String makeUpDeposit; // 需补交订金 + @ApiModelProperty("销售订单sid") + private String orderSid; // 销售订单sid +} diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java index d9de288247..b61f4969fe 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeign.java @@ -56,18 +56,6 @@ import java.util.List; fallback = BusSelectedReceivablesDetailedFeignFallback.class) public interface BusSelectedReceivablesDetailedFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); - - @ApiOperation("根据条件查询所有数据列表") - @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody BusSelectedReceivablesDetailedQuery query); - - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(); - @ApiOperation("新增保存") @PostMapping("/save") public ResultBean save(@RequestBody BusSelectedReceivablesDetailedDto dto); @@ -76,19 +64,8 @@ public interface BusSelectedReceivablesDetailedFeign { @PostMapping("/update/{sid}") public ResultBean update(@RequestBody BusSelectedReceivablesDetailedDto dto, @PathVariable("sid") String sid); - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids); - - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids); + @ApiOperation("根据车架号和应收款项名称移除数据") + @DeleteMapping("/delByVinAndRecName") + public ResultBean delByVinAndRecName(@RequestParam("vin") String vin,@RequestParam("receivablesName") String receivablesName); - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id); - - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java index 48ac78469d..4168a3fa97 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedFeignFallback.java @@ -48,24 +48,6 @@ import java.util.List; @Component public class BusSelectedReceivablesDetailedFeignFallback implements BusSelectedReceivablesDetailedFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/listPage无法访问"); - } - - @Override - public ResultBean> listAll(BusSelectedReceivablesDetailedQuery query){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/listAll无法访问"); - } - - @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/list无法访问"); - } - @Override public ResultBean save(BusSelectedReceivablesDetailedDto dto){ return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/save无法访问"); @@ -77,24 +59,7 @@ public class BusSelectedReceivablesDetailedFeignFallback implements BusSelectedR } @Override - public ResultBean del(String ids){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/del无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/delBySids无法访问"); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/fetch无法访问"); - } - - @Override - public ResultBean fetchBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busselectedreceivablesdetailed/fetchBySid无法访问"); + public ResultBean delByVinAndRecName(String vin, String receivablesName) { + return null; } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java index 7c3ff53e04..2b14261775 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailed.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.yxt.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; +import lombok.Data; import java.math.BigDecimal; @@ -46,6 +47,7 @@ import java.math.BigDecimal; * @since 1.0 */ @ApiModel(value = "应收未收款项明细表", description = "应收未收款项明细表") +@Data @TableName("bus_uncollected_receivables_detailed") public class BusUncollectedReceivablesDetailed extends BaseEntity { private static final long serialVersionUID = 1L; @@ -80,135 +82,4 @@ public class BusUncollectedReceivablesDetailed extends BaseEntity { @ApiModelProperty("当前应收金额") private BigDecimal currentReceivableMoney; // 当前应收金额 - - /** - * @return 创建人接口 - */ - public String getCreateByName(){ - return createByName; - } - - /** - * @param createByName 创建人接口 to set - */ - public void setCreateByName(String createByName){ - this.createByName = createByName; - } - /** - * @return 合同sid - */ - public String getContractSid(){ - return contractSid; - } - - /** - * @param contractSid 合同sid to set - */ - public void setContractSid(String contractSid){ - this.contractSid = contractSid; - } - /** - * @return 合同编号 - */ - public String getContractNo(){ - return contractNo; - } - - /** - * @param contractNo 合同编号 to set - */ - public void setContractNo(String contractNo){ - this.contractNo = contractNo; - } - /** - * @return 客户sid - */ - public String getCustomerSid(){ - return customerSid; - } - - /** - * @param customerSid 客户sid to set - */ - public void setCustomerSid(String customerSid){ - this.customerSid = customerSid; - } - /** - * @return 客户名称 - */ - public String getCustomerName(){ - return customerName; - } - - /** - * @param customerName 客户名称 to set - */ - public void setCustomerName(String customerName){ - this.customerName = customerName; - } - /** - * @return 车架号 - */ - public String getVIN(){ - return VIN; - } - - /** - * @param VIN 车架号 to set - */ - public void setVIN(String VIN){ - this.VIN = VIN; - } - /** - * @return 分公司sid - */ - public String getUseOrgSid(){ - return useOrgSid; - } - - /** - * @param useOrgSid 分公司sid to set - */ - public void setUseOrgSid(String useOrgSid){ - this.useOrgSid = useOrgSid; - } - /** - * @return 联系电话 - */ - public String getCustomerPhone(){ - return customerPhone; - } - - /** - * @param customerPhone 联系电话 to set - */ - public void setCustomerPhone(String customerPhone){ - this.customerPhone = customerPhone; - } - /** - * @return 应收项目名称 - */ - public String getReceivablesName(){ - return receivablesName; - } - - /** - * @param receivablesName 应收项目名称 to set - */ - public void setReceivablesName(String receivablesName){ - this.receivablesName = receivablesName; - } - /** - * @return 当前应收金额 - */ - public BigDecimal getCurrentReceivableMoney(){ - return currentReceivableMoney; - } - - /** - * @param currentReceivableMoney 当前应收金额 to set - */ - public void setCurrentReceivableMoney(BigDecimal currentReceivableMoney){ - this.currentReceivableMoney = currentReceivableMoney; - } } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java index 047988a1f0..9badb16d55 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedDto.java @@ -49,34 +49,26 @@ import lombok.Data; @Data public class BusUncollectedReceivablesDetailedDto implements Dto { - + @ApiModelProperty("应收未收款项sid") + private String sid; // 应收未收款项sid @ApiModelProperty("创建人接口") private String createByName; // 创建人接口 - @ApiModelProperty("合同sid") private String contractSid; // 合同sid - @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - @ApiModelProperty("客户sid") private String customerSid; // 客户sid - @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("车架号") private String VIN; // 车架号 - @ApiModelProperty("分公司sid") private String useOrgSid; // 分公司sid - @ApiModelProperty("联系电话") private String customerPhone; // 联系电话 - @ApiModelProperty("应收项目名称") private String receivablesName; // 应收项目名称 - @ApiModelProperty("当前应收金额") private String currentReceivableMoney; // 当前应收金额 } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java index 3b529e9532..8f77318fe7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeign.java @@ -56,37 +56,13 @@ import java.util.List; fallback = BusUncollectedReceivablesDetailedFeignFallback.class) public interface BusUncollectedReceivablesDetailedFeign { - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq); - @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") public ResultBean> listAll(@RequestBody BusUncollectedReceivablesDetailedQuery query); - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(); - - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody BusUncollectedReceivablesDetailedDto dto); - - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusUncollectedReceivablesDetailedDto dto, @PathVariable("sid") String sid); - - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids); - - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids); - - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id); + @ApiOperation("新增或修改保存") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BusUncollectedReceivablesDetailedDto dto); @ApiOperation("根据SID获取一条记录") @GetMapping("/fetchBySid/{sid}") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java index 176d3e171f..37f04abd86 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedFeignFallback.java @@ -48,12 +48,6 @@ import java.util.List; @Component public class BusUncollectedReceivablesDetailedFeignFallback implements BusUncollectedReceivablesDetailedFeign { - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/listPage无法访问"); - } - @Override public ResultBean> listAll(BusUncollectedReceivablesDetailedQuery query){ ResultBean rb = ResultBean.fireFail(); @@ -61,35 +55,8 @@ public class BusUncollectedReceivablesDetailedFeignFallback implements BusUncoll } @Override - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/list无法访问"); - } - - @Override - public ResultBean save(BusUncollectedReceivablesDetailedDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/save无法访问"); - } - - @Override - public ResultBean update(BusUncollectedReceivablesDetailedDto dto, String sid){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/update无法访问"); - } - - @Override - public ResultBean del(String ids){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/del无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/delBySids无法访问"); - } - - @Override - public ResultBean fetch(String id){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/fetch无法访问"); + public ResultBean saveOrUpdate(BusUncollectedReceivablesDetailedDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-buscenter/busuncollectedreceivablesdetailed/saveOrUpdate无法访问"); } @Override diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java index d72e1d8bd5..220f38345a 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedQuery.java @@ -49,34 +49,10 @@ import lombok.Data; @Data public class BusUncollectedReceivablesDetailedQuery implements Query { - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - - @ApiModelProperty("合同sid") - private String contractSid; // 合同sid - @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - - @ApiModelProperty("客户sid") - private String customerSid; // 客户sid - @ApiModelProperty("客户名称") private String customerName; // 客户名称 - - @ApiModelProperty("车架号") - private String VIN; // 车架号 - - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - @ApiModelProperty("联系电话") private String customerPhone; // 联系电话 - - @ApiModelProperty("应收项目名称") - private String receivablesName; // 应收项目名称 - - @ApiModelProperty("当前应收金额") - private String currentReceivableMoney; // 当前应收金额 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java index a7f086cceb..bb4e8c565f 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedVo.java @@ -49,34 +49,18 @@ import lombok.Data; @Data public class BusUncollectedReceivablesDetailedVo implements Vo { - - @ApiModelProperty("创建人接口") - private String createByName; // 创建人接口 - - @ApiModelProperty("合同sid") - private String contractSid; // 合同sid - + @ApiModelProperty("应收未收款项sid") + private String sid; // 应收未收款项sid @ApiModelProperty("合同编号") private String contractNo; // 合同编号 - - @ApiModelProperty("客户sid") - private String customerSid; // 客户sid - @ApiModelProperty("客户名称") private String customerName; // 客户名称 - @ApiModelProperty("车架号") private String VIN; // 车架号 - - @ApiModelProperty("分公司sid") - private String useOrgSid; // 分公司sid - @ApiModelProperty("联系电话") private String customerPhone; // 联系电话 - @ApiModelProperty("应收项目名称") private String receivablesName; // 应收项目名称 - @ApiModelProperty("当前应收金额") private String currentReceivableMoney; // 当前应收金额 } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java index b4a1e443d0..d67eba51b8 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buscollectionconfirmation/BusCollectionConfirmationService.java @@ -26,7 +26,6 @@ package com.yxt.anrui.buscenter.biz.buscollectionconfirmation; import cn.hutool.core.bean.BeanUtil; -import com.alibaba.nacos.api.config.filter.IFilterConfig; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basevehicle.BaseVehicleQuery; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java index d162f38452..e07aefa15b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java @@ -76,4 +76,5 @@ public interface BusOrderMapper extends BaseMapper { BusOrderCommonAppendixVo previewCon(String sid); int selectCountByOrgSidAndMonth(@Param("orgSid") String orgSid); + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java index a07a9e1076..b5b176346d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java @@ -13,6 +13,9 @@ import com.yxt.anrui.base.api.commoncontract.CommonContractFeign; import com.yxt.anrui.base.api.commoncontract.CommonContractVo; import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit; import com.yxt.anrui.buscenter.api.busorder.*; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDeposit; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositDto; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; import com.yxt.anrui.buscenter.api.busorderdiscount.AppBusOrderDiscountListVo; import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountDto; import com.yxt.anrui.buscenter.api.busorderdiscount.BusOrderDiscountVo; @@ -24,6 +27,7 @@ import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleDto; import com.yxt.anrui.buscenter.api.busordervehicle.BusOrderVehicleVo; import com.yxt.anrui.buscenter.api.flow.TaskQuery; import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService; +import com.yxt.anrui.buscenter.biz.busorderdeposit.BusOrderDepositService; import com.yxt.anrui.buscenter.biz.busorderdiscount.BusOrderDiscountService; import com.yxt.anrui.buscenter.biz.busordermodel.BusOrderModelService; import com.yxt.anrui.buscenter.biz.busordervehicle.BusOrderVehicleService; @@ -113,6 +117,8 @@ public class BusOrderService extends MybatisBaseService createQueryWrapper(BusOrderQuery query) { QueryWrapper qw = new QueryWrapper<>(); @@ -496,6 +502,11 @@ public class BusOrderService extends MybatisBaseService busOrderDiscountDtoList = dto.getBusOrderDiscountDtoList(); for (BusOrderDiscountDto busOrderDiscountDto : busOrderDiscountDtoList) { busOrderDiscountDto.setOrderSid(sid); @@ -527,6 +538,9 @@ public class BusOrderService extends MybatisBaseService likeGetName(BusOrderCustNameQuery query) { @@ -558,11 +572,13 @@ public class BusOrderService extends MybatisBaseService_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.busorderdeposit; + +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 org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDeposit; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositMapper.java
+ * Class: com.yxt.anrui.buscenter.biz.busorderdeposit.BusOrderDepositMapper
+ * Description: 订金信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BusOrderDepositMapper extends BaseMapper { + + //@Update("update bus_order_deposit set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_order_deposit") + List selectListVo(); + + @Delete("delete from bus_order_deposit where orderSid = #{s}") + void deleteByOrderSid(String s); + + @Select("select * from bus_order_deposit where orderSid = #{busOrderSid}") + BusOrderDepositVo fetchByOrderSid(String busOrderSid); +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositMapper.xml new file mode 100644 index 0000000000..dddc3b493e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositRest.java new file mode 100644 index 0000000000..f3ef0792ea --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositRest.java @@ -0,0 +1,144 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.busorderdeposit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +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.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDeposit; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositQuery; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositDto; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositFeign; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositFeignFallback.java
+ * Class: com.yxt.anrui.buscenter.biz.busorderdeposit.BusOrderDepositRest
+ * Description: 订金信息.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "订金信息") +@RestController("com.yxt.anrui.buscenter.biz.busorderdeposit.BusOrderDepositRest") +@RequestMapping("/busorderdeposit") +public class BusOrderDepositRest implements BusOrderDepositFeign { + + @Autowired + private BusOrderDepositService busOrderDepositService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = busOrderDepositService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("根据条件查询所有数据列表") + @PostMapping("/listAll") + public ResultBean> listAll(@RequestBody BusOrderDepositQuery query){ + ResultBean rb = ResultBean.fireFail(); + List list = busOrderDepositService.listAllVo(query); + return rb.success().setData(list); + } + + @Override + @ApiOperation("所有数据列表") + @GetMapping("/list") + public ResultBean> list(){ + ResultBean rb = ResultBean.fireFail(); + List list = busOrderDepositService.listVo(); + return rb.success().setData(list); + } + + @Override + @ApiOperation("新增保存") + @PostMapping("/save") + public ResultBean save(@RequestBody BusOrderDepositDto dto){ + ResultBean rb = ResultBean.fireFail(); + busOrderDepositService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("修改保存") + @PostMapping("/update/{sid}") + public ResultBean update(@RequestBody BusOrderDepositDto dto, @PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + busOrderDepositService.updateBySid(dto.toMap(),sid); + return rb.success(); + } + + @Override + @ApiOperation("删除记录") + @GetMapping("/del/{ids}") + public ResultBean del(@PathVariable("ids") String ids){ + ResultBean rb = ResultBean.fireFail(); + busOrderDepositService.delByIds(ids); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + busOrderDepositService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("获取一条记录") + @GetMapping("/fetch/{id}") + public ResultBean fetch(@PathVariable("id") String id){ + ResultBean rb = ResultBean.fireFail(); + BusOrderDepositVo vo = busOrderDepositService.fetchByIdVo(id); + return rb.success().setData(vo); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchBySid/{sid}") + public ResultBean fetchBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BusOrderDepositVo vo = new BusOrderDepositVo(); + return rb.success().setData(vo); + } +} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositService.java new file mode 100644 index 0000000000..e13cf154a8 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorderdeposit/BusOrderDepositService.java @@ -0,0 +1,144 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.biz.busorderdeposit; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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.busorderdeposit.BusOrderDeposit; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositQuery; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositVo; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositDto; +import com.yxt.anrui.buscenter.api.busorderdeposit.BusOrderDepositFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-buscenter(销售业务)
+ * File: BusOrderDepositService.java
+ * Class: com.yxt.anrui.buscenter.biz.busorderdeposit.BusOrderDepositService
+ * Description: 订金信息 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-14 13:34:03
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BusOrderDepositService extends MybatisBaseService { + public PagerVo listPage(PagerQuery pq) { + BusOrderDepositQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List listAll(BusOrderDepositQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(BusOrderDepositQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (query.getDeposit() != null) { + qw.eq("deposit", query.getDeposit()); + } + + if (query.getDepositAll() != null) { + qw.eq("depositAll", query.getDepositAll()); + } + + if (StringUtils.isNotBlank(query.getDepositType())) { + qw.eq("depositType", query.getDepositType()); + } + + if (StringUtils.isNotBlank(query.getDepositTypeKey())) { + qw.eq("depositTypeKey", query.getDepositTypeKey()); + } + + if (query.getMakeUpDeposit() != null) { + qw.eq("makeUpDeposit", query.getMakeUpDeposit()); + } + + if (StringUtils.isNotBlank(query.getOrderSid())) { + qw.eq("orderSid", query.getOrderSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusOrderDepositQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BusOrderDepositQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BusOrderDepositDto dto){ + BusOrderDeposit entity = new BusOrderDeposit(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BusOrderDepositVo fetchByIdVo(String id){ + BusOrderDeposit entity = this.fetchById(id); + BusOrderDepositVo vo = new BusOrderDepositVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByOrderSid(String s) { + baseMapper.deleteByOrderSid(s); + } + + public BusOrderDepositVo fetchByOrderSid(String busOrderSid) { + return baseMapper.fetchByOrderSid(busOrderSid); + } +} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java index b11c0ebb4f..b7680ba401 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.java @@ -57,17 +57,17 @@ import java.util.List; @Mapper public interface BusSelectedReceivablesDetailedMapper extends BaseMapper { - //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + //@Update("update bus_selected_receivables_detailed set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from bus_selected_receivables_detailed") + List selectListVo(); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - - List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); - - @Select("select * from bus_selected_receivables_detailed") - List selectListVo(); - - @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") + @Delete("delete from bus_selected_receivables_detailed where collSid = #{sid}") void deleteByCollSid(String sid); @Select("select * from bus_selected_receivables_detailed where collSid = #{sid}") @@ -82,4 +82,6 @@ public interface BusSelectedReceivablesDetailedMapper extends BaseMapper getPaymentDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + void delByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml index 39928dc880..f70c894a3b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedMapper.xml @@ -6,18 +6,29 @@ + + + DELETE + FROM + bus_selected_receivables_detailed + WHERE VIN = #{vin} + AND receivablesName = #{receivablesName} + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java index 3bfc1459e2..99a639f017 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedRest.java @@ -61,33 +61,6 @@ public class BusSelectedReceivablesDetailedRest implements BusSelectedReceivable @Autowired private BusSelectedReceivablesDetailedService busSelectedReceivablesDetailedService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busSelectedReceivablesDetailedService.listPageVo(pq); - return rb.success().setData(pv); - } - - @Override - @ApiOperation("根据条件查询所有数据列表") - @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody BusSelectedReceivablesDetailedQuery query){ - ResultBean rb = ResultBean.fireFail(); - List list = busSelectedReceivablesDetailedService.listAllVo(query); - return rb.success().setData(list); - } - - @Override - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - List list = busSelectedReceivablesDetailedService.listVo(); - return rb.success().setData(list); - } - @Override @ApiOperation("新增保存") @PostMapping("/save") @@ -107,38 +80,9 @@ public class BusSelectedReceivablesDetailedRest implements BusSelectedReceivable } @Override - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids){ + public ResultBean delByVinAndRecName(String vin, String receivablesName) { ResultBean rb = ResultBean.fireFail(); - busSelectedReceivablesDetailedService.delByIds(ids); + busSelectedReceivablesDetailedService.delByVinAndRecName(vin,receivablesName); return rb.success(); } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - busSelectedReceivablesDetailedService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id){ - ResultBean rb = ResultBean.fireFail(); - BusSelectedReceivablesDetailedVo vo = busSelectedReceivablesDetailedService.fetchByIdVo(id); - return rb.success().setData(vo); - } - - @Override - @ApiOperation("根据SID获取一条记录") - @GetMapping("/fetchBySid/{sid}") - public ResultBean fetchBySid(@PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); - return rb.success().setData(vo); - } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java index a0793c4cce..9c25eff730 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busselectedreceivablesdetailed/BusSelectedReceivablesDetailedService.java @@ -30,7 +30,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsQuery; import com.yxt.anrui.buscenter.api.buscollectionconfirmation.AppBusSelectedReceivablesPaymentDetailsVo; -import io.swagger.annotations.ApiModelProperty; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -62,114 +61,112 @@ import java.util.List; */ @Service public class BusSelectedReceivablesDetailedService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BusSelectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAll(BusSelectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } - - private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - - - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.eq("createByName", query.getCreateByName()); - } - - if (StringUtils.isNotBlank(query.getContractSid())) { - qw.eq("contractSid", query.getContractSid()); - } - - if (StringUtils.isNotBlank(query.getContractNo())) { - qw.eq("contractNo", query.getContractNo()); - } - - if (StringUtils.isNotBlank(query.getCustomerSid())) { - qw.eq("customerSid", query.getCustomerSid()); - } - - if (StringUtils.isNotBlank(query.getCustomerName())) { - qw.eq("customerName", query.getCustomerName()); - } - - if (StringUtils.isNotBlank(query.getVIN())) { - qw.eq("VIN", query.getVIN()); - } - - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("useOrgSid", query.getUseOrgSid()); - } - - if (StringUtils.isNotBlank(query.getCustomerPhone())) { - qw.eq("customerPhone", query.getCustomerPhone()); - } - - if (StringUtils.isNotBlank(query.getReceivablesName())) { - qw.eq("receivablesName", query.getReceivablesName()); - } - - if (query.getCurrentReceivableMoney() != null) { - qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); - } - - if (query.getSubscriptionMoney() != null) { - qw.eq("subscriptionMoney", query.getSubscriptionMoney()); - } - - if (StringUtils.isNotBlank(query.getSubscriptionDate())) { - qw.eq("subscriptionDate", query.getSubscriptionDate()); - } - - if (StringUtils.isNotBlank(query.getCollSid())) { - qw.eq("collSid", query.getCollSid()); - } - return qw; - } - - public PagerVo listPageVo(PagerQuery pq) { - BusSelectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - - public List listAllVo(BusSelectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectListAllVo(qw); - } - - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto) { - BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); - } - - public BusSelectedReceivablesDetailedVo fetchByIdVo(String id) { - BusSelectedReceivablesDetailed entity = this.fetchById(id); - BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); - BeanUtil.copyProperties(entity, vo); - return vo; - } - - public void deleteByCollSid(String sid) { - baseMapper.deleteByCollSid(sid); - } + public PagerVo listPage(PagerQuery pq) { + BusSelectedReceivablesDetailedQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPage(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + public List listAll(BusSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectList(qw); + } + private QueryWrapper createQueryWrapper(BusSelectedReceivablesDetailedQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + + + if (StringUtils.isNotBlank(query.getCreateByName())) { + qw.eq("createByName", query.getCreateByName()); + } + + if (StringUtils.isNotBlank(query.getContractSid())) { + qw.eq("contractSid", query.getContractSid()); + } + + if (StringUtils.isNotBlank(query.getContractNo())) { + qw.eq("contractNo", query.getContractNo()); + } + + if (StringUtils.isNotBlank(query.getCustomerSid())) { + qw.eq("customerSid", query.getCustomerSid()); + } + + if (StringUtils.isNotBlank(query.getCustomerName())) { + qw.eq("customerName", query.getCustomerName()); + } + + if (StringUtils.isNotBlank(query.getVIN())) { + qw.eq("VIN", query.getVIN()); + } + + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("useOrgSid", query.getUseOrgSid()); + } + + if (StringUtils.isNotBlank(query.getCustomerPhone())) { + qw.eq("customerPhone", query.getCustomerPhone()); + } + + if (StringUtils.isNotBlank(query.getReceivablesName())) { + qw.eq("receivablesName", query.getReceivablesName()); + } + + if (query.getCurrentReceivableMoney() != null) { + qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); + } + + if (query.getSubscriptionMoney() != null) { + qw.eq("subscriptionMoney", query.getSubscriptionMoney()); + } + + if (StringUtils.isNotBlank(query.getSubscriptionDate())) { + qw.eq("subscriptionDate", query.getSubscriptionDate()); + } + + if (StringUtils.isNotBlank(query.getCollSid())) { + qw.eq("collSid", query.getCollSid()); + } + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BusSelectedReceivablesDetailedQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public List listAllVo(BusSelectedReceivablesDetailedQuery query) { + QueryWrapper qw = createQueryWrapper(query); + return baseMapper.selectListAllVo(qw); + } + + public List listVo() { + return baseMapper.selectListVo(); + } + + public void saveOrUpdateDto(BusSelectedReceivablesDetailedDto dto){ + BusSelectedReceivablesDetailed entity = new BusSelectedReceivablesDetailed(); + dto.fillEntity(entity); + this.saveOrUpdate(entity); + } + + public BusSelectedReceivablesDetailedVo fetchByIdVo(String id){ + BusSelectedReceivablesDetailed entity = this.fetchById(id); + BusSelectedReceivablesDetailedVo vo = new BusSelectedReceivablesDetailedVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByCollSid(String sid) { + baseMapper.deleteByCollSid(sid); + } public List fetchByCillSid(String sid) { return baseMapper.fetchByCillSid(sid); @@ -185,4 +182,8 @@ public class BusSelectedReceivablesDetailedService extends MybatisBaseService getPaymentDetailsList(IPage page, QueryWrapper qw) { return baseMapper.getPaymentDetailsList(page, qw); } + + public void delByVinAndRecName(String vin, String receivablesName) { + baseMapper.delByVinAndRecName(vin,receivablesName); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java index b772a53f8a..05678f54a7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.java @@ -62,4 +62,6 @@ public interface BusUncollectedReceivablesDetailedMapper extends BaseMapper selectListVo(); + + BusUncollectedReceivablesDetailedVo fetchByVinAndRecName(@Param("vin") String vin, @Param("receivablesName") String receivablesName); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml index 77e855d8b6..65fabeba9d 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedMapper.xml @@ -10,4 +10,14 @@ + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java index a8d157688c..5782f169c3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedRest.java @@ -25,11 +25,13 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.busuncollectedreceivablesdetailed; +import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -61,15 +63,6 @@ public class BusUncollectedReceivablesDetailedRest implements BusUncollectedRece @Autowired private BusUncollectedReceivablesDetailedService busUncollectedReceivablesDetailedService; - @Override - @ApiOperation("根据条件分页查询数据的列表") - @PostMapping("/listPage") - public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = busUncollectedReceivablesDetailedService.listPageVo(pq); - return rb.success().setData(pv); - } - @Override @ApiOperation("根据条件查询所有数据列表") @PostMapping("/listAll") @@ -80,57 +73,10 @@ public class BusUncollectedReceivablesDetailedRest implements BusUncollectedRece } @Override - @ApiOperation("所有数据列表") - @GetMapping("/list") - public ResultBean> list(){ - ResultBean rb = ResultBean.fireFail(); - List list = busUncollectedReceivablesDetailedService.listVo(); - return rb.success().setData(list); - } - - @Override - @ApiOperation("新增保存") - @PostMapping("/save") - public ResultBean save(@RequestBody BusUncollectedReceivablesDetailedDto dto){ - ResultBean rb = ResultBean.fireFail(); - busUncollectedReceivablesDetailedService.saveOrUpdateDto(dto); - return rb.success(); - } - - @Override - @ApiOperation("修改保存") - @PostMapping("/update/{sid}") - public ResultBean update(@RequestBody BusUncollectedReceivablesDetailedDto dto, @PathVariable("sid") String sid){ - ResultBean rb = ResultBean.fireFail(); - busUncollectedReceivablesDetailedService.updateBySid(dto.toMap(),sid); - return rb.success(); - } - - @Override - @ApiOperation("删除记录") - @GetMapping("/del/{ids}") - public ResultBean del(@PathVariable("ids") String ids){ - ResultBean rb = ResultBean.fireFail(); - busUncollectedReceivablesDetailedService.delByIds(ids); - return rb.success(); - } - - @Override - @ApiOperation("根据sid批量删除") - @PostMapping("/delBySids") - public ResultBean delBySids(@RequestBody String[] sids){ - ResultBean rb = ResultBean.fireFail(); - busUncollectedReceivablesDetailedService.delBySids(sids); - return rb.success(); - } - - @Override - @ApiOperation("获取一条记录") - @GetMapping("/fetch/{id}") - public ResultBean fetch(@PathVariable("id") String id){ - ResultBean rb = ResultBean.fireFail(); - BusUncollectedReceivablesDetailedVo vo = busUncollectedReceivablesDetailedService.fetchByIdVo(id); - return rb.success().setData(vo); + @ApiOperation("新增或修改保存") + @PostMapping("/saveOrUpdate") + public ResultBean saveOrUpdate(@RequestBody BusUncollectedReceivablesDetailedDto dto){ + return busUncollectedReceivablesDetailedService.saveOrUpdateDto(dto); } @Override diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java index 64ffb5a4df..b8e45c688e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busuncollectedreceivablesdetailed/BusUncollectedReceivablesDetailedService.java @@ -40,6 +40,7 @@ import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollec import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedDto; import com.yxt.anrui.buscenter.api.busuncollectedreceivablesdetailed.BusUncollectedReceivablesDetailedFeign; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.List; @@ -59,94 +60,42 @@ import java.util.List; */ @Service public class BusUncollectedReceivablesDetailedService extends MybatisBaseService { - public PagerVo listPage(PagerQuery pq) { - BusUncollectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPage(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAll(BusUncollectedReceivablesDetailedQuery query) { - QueryWrapper qw = createQueryWrapper(query); - return baseMapper.selectList(qw); - } private QueryWrapper createQueryWrapper(BusUncollectedReceivablesDetailedQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); QueryWrapper qw = new QueryWrapper<>(); - - if (StringUtils.isNotBlank(query.getCreateByName())) { - qw.eq("createByName", query.getCreateByName()); - } - - if (StringUtils.isNotBlank(query.getContractSid())) { - qw.eq("contractSid", query.getContractSid()); - } - if (StringUtils.isNotBlank(query.getContractNo())) { qw.eq("contractNo", query.getContractNo()); } - - if (StringUtils.isNotBlank(query.getCustomerSid())) { - qw.eq("customerSid", query.getCustomerSid()); - } - if (StringUtils.isNotBlank(query.getCustomerName())) { qw.eq("customerName", query.getCustomerName()); } - - if (StringUtils.isNotBlank(query.getVIN())) { - qw.eq("VIN", query.getVIN()); - } - - if (StringUtils.isNotBlank(query.getUseOrgSid())) { - qw.eq("useOrgSid", query.getUseOrgSid()); - } - if (StringUtils.isNotBlank(query.getCustomerPhone())) { qw.eq("customerPhone", query.getCustomerPhone()); } - - if (StringUtils.isNotBlank(query.getReceivablesName())) { - qw.eq("receivablesName", query.getReceivablesName()); - } - - if (query.getCurrentReceivableMoney() != null) { - qw.eq("currentReceivableMoney", query.getCurrentReceivableMoney()); - } return qw; } - public PagerVo listPageVo(PagerQuery pq) { - BusUncollectedReceivablesDetailedQuery query = pq.getParams(); - QueryWrapper qw = createQueryWrapper(query); - IPage page = PagerUtil.queryToPage(pq); - IPage pagging = baseMapper.selectPageVo(page, qw); - PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; - } - public List listAllVo(BusUncollectedReceivablesDetailedQuery query) { QueryWrapper qw = createQueryWrapper(query); return baseMapper.selectListAllVo(qw); } - public List listVo() { - return baseMapper.selectListVo(); - } - - public void saveOrUpdateDto(BusUncollectedReceivablesDetailedDto dto){ + public ResultBean saveOrUpdateDto(BusUncollectedReceivablesDetailedDto dto){ + ResultBean rb = ResultBean.fireFail(); + String sid = dto.getSid(); BusUncollectedReceivablesDetailed entity = new BusUncollectedReceivablesDetailed(); - dto.fillEntity(entity); - this.saveOrUpdate(entity); + if (StringUtils.isBlank(sid)){//新增 + BeanUtils.copyProperties(dto,entity); + save(entity); + return rb.success().setMsg("添加成功"); + } + updateBySid(dto,sid); + return rb.success().setMsg("修改成功"); } - - public BusUncollectedReceivablesDetailedVo fetchByIdVo(String id){ - BusUncollectedReceivablesDetailed entity = this.fetchById(id); - BusUncollectedReceivablesDetailedVo vo = new BusUncollectedReceivablesDetailedVo(); - BeanUtil.copyProperties(entity, vo); - return vo; + + public BusUncollectedReceivablesDetailedVo fetchByVinAndRecName(String vin, String receivablesName) { + return baseMapper.fetchByVinAndRecName(vin,receivablesName); } } \ No newline at end of file