From 68a6928563382432c9d62741ad9ec3644bba72d6 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 16 Nov 2023 17:49:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E8=BF=9E=E8=A1=A8=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/mapper/ErpDispatchDataMapper.java | 4 +-- .../controller/DateCheckApplyController.java | 3 +- .../modules/excel/entity/DataPayMainInfo.java | 29 +++++++++++++++++++ .../excel/service/DateCheckApplyService.java | 3 +- .../impl/DateCheckApplyServiceImpl.java | 15 ++++++---- .../goods/controller/GoodsSpuController.java | 3 +- .../vtb/mapper/VtbVerForPayReportMapper.java | 12 +++++++- 7 files changed, 57 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java diff --git a/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java b/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java index 318e1872..737ed9c9 100644 --- a/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java +++ b/src/main/java/com/qs/serve/modules/erp/mapper/ErpDispatchDataMapper.java @@ -37,8 +37,8 @@ public interface ErpDispatchDataMapper extends BaseMapper { @InterceptorIgnore(tenantLine = "1") - @Select("SELECT inv_code FROM `erp_dispatch_data` where `date` > #{lastTowMonth}") - List selectLast2MonthInvCode(@Param("lastTowMonth") LocalDate lastTowMonth); + @Select("SELECT inv_code FROM `erp_dispatch_data` where `date` > #{lastTowMonth} and cus_code = #{cusCode}") + List selectLast2MonthInvCode(@Param("lastTowMonth") LocalDate lastTowMonth,@Param("cusCode")String cusCode); } diff --git a/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java b/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java index 5ce40205..560ad362 100644 --- a/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java +++ b/src/main/java/com/qs/serve/modules/excel/controller/DateCheckApplyController.java @@ -10,6 +10,7 @@ import com.qs.serve.common.util.Assert; import com.qs.serve.modules.excel.common.DataSupplierSo; import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo; import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo; +import com.qs.serve.modules.excel.entity.DataPayMainInfo; import com.qs.serve.modules.excel.service.DateCheckApplyService; import com.qs.serve.modules.sys.entity.SysConfig; import com.qs.serve.modules.sys.service.SysConfigService; @@ -96,7 +97,7 @@ public class DateCheckApplyController { @RepeatSubmit @GetMapping("/getPayJoinList") @SysLog(module = SystemModule.Verification, title = "客户支付帐", biz = BizType.EXPORT) - public R getPayJoinList(DataSupplierSo param){ + public R getPayJoinList(DataSupplierSo param){ return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java b/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java new file mode 100644 index 00000000..dcc75528 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/excel/entity/DataPayMainInfo.java @@ -0,0 +1,29 @@ +package com.qs.serve.modules.excel.entity; + +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @author YenHex + * @since 2023/11/16 + */ +@Data +public class DataPayMainInfo { + + + /** + * 已支付 + */ + private BigDecimal payAmt; + + + PageVo pageInfo; + + + List list; + +} diff --git a/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java b/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java index 8ea2d59a..68a37961 100644 --- a/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java +++ b/src/main/java/com/qs/serve/modules/excel/service/DateCheckApplyService.java @@ -4,6 +4,7 @@ import com.qs.serve.common.model.dto.PageVo; import com.qs.serve.modules.excel.common.DataSupplierSo; import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo; import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo; +import com.qs.serve.modules.excel.entity.DataPayMainInfo; import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend; import com.qs.serve.modules.vtb.entity.so.PayPaymentItemExtendSo; @@ -28,6 +29,6 @@ public interface DateCheckApplyService { DataCheckApplyMainInfo getDataCheckApplyMainInfo(DataSupplierSo param); - PageVo pagePayPaymentItems(PayPaymentItemExtendSo extendSo); + DataPayMainInfo pagePayPaymentItems(PayPaymentItemExtendSo extendSo); } diff --git a/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java index 64bc2697..73face27 100644 --- a/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/excel/service/impl/DateCheckApplyServiceImpl.java @@ -13,6 +13,7 @@ import com.qs.serve.modules.excel.common.DataSupplierSo; import com.qs.serve.modules.excel.entity.DataCheckApplyDetailInfo; import com.qs.serve.modules.excel.entity.DataCheckApplyDetailItem; import com.qs.serve.modules.excel.entity.DataCheckApplyMainInfo; +import com.qs.serve.modules.excel.entity.DataPayMainInfo; import com.qs.serve.modules.excel.service.DateCheckApplyService; import com.qs.serve.modules.pay.common.PaymentType; import com.qs.serve.modules.pay.entity.PayPaymentItem; @@ -250,15 +251,19 @@ public class DateCheckApplyServiceImpl implements DateCheckApplyService { @Override - public PageVo pagePayPaymentItems(PayPaymentItemExtendSo extendSo) { + public DataPayMainInfo pagePayPaymentItems(PayPaymentItemExtendSo extendSo) { + DataPayMainInfo mainInfo = new DataPayMainInfo(); Long count = payReportMapper.countPayItemList(extendSo); - RowParam rowParam = new RowParam(true); PageVo pageVo = new PageVo<>(); pageVo.initPageByTotal(count); + mainInfo.setPageInfo(pageVo); if(count>0){ - List list = payReportMapper.selectPayItemList(extendSo); - pageVo.setList(list); + //统计支付金额 + BigDecimal payAmt = payReportMapper.sumPayItemListAmt(extendSo); + mainInfo.setPayAmt(payAmt); + List list = payReportMapper.selectPayItemList(extendSo,new RowParam(true)); + mainInfo.setList(list); } - return pageVo; + return mainInfo; } } diff --git a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java index 964afb3d..17bce4a4 100644 --- a/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java +++ b/src/main/java/com/qs/serve/modules/goods/controller/GoodsSpuController.java @@ -105,8 +105,7 @@ public class GoodsSpuController { @PostMapping("listLast2Month") public R> listLast2Month(@RequestBody @Valid GoodsHisOrderQuery query){ LocalDate date = LocalDate.now().plusMonths(-2); - List invCodes = dispatchDataMapper.selectLast2MonthInvCode(date); - + List invCodes = dispatchDataMapper.selectLast2MonthInvCode(date,query.getSupplierCode()); if(CollectionUtil.isNotEmpty(invCodes)){ List goodsSkus = goodsSkuService.getByCodes(invCodes); List goodsSpuIds = goodsSkus.stream().map(GoodsSku::getSpuId).distinct().collect(Collectors.toList()); diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java index a5dd551b..c7718292 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java +++ b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerForPayReportMapper.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.vtb.mapper; +import com.qs.serve.common.model.dto.RowParam; import com.qs.serve.modules.vtb.entity.dto.PayPaymentItemExtend; import com.qs.serve.modules.vtb.entity.dto.VtbActivityCheckDTO; import com.qs.serve.modules.vtb.entity.dto.VtbVerificationDTO; @@ -8,6 +9,7 @@ import com.qs.serve.modules.vtb.entity.so.VtbActivityCheckSo; import com.qs.serve.modules.vtb.entity.so.VtbVerificationCheckSo; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; /** @@ -41,11 +43,19 @@ public interface VtbVerForPayReportMapper { Long countPayItemList(@Param("query")Object param); + + /** + * 统计支付金额 + * @param param + * @return + */ + BigDecimal sumPayItemListAmt(@Param("query")Object param); + /** * 查询支付 left 核销 left 活动 * @param param * @return */ - List selectPayItemList(@Param("query") PayPaymentItemExtendSo param); + List selectPayItemList(@Param("query") PayPaymentItemExtendSo param, @Param("pageInfo")RowParam rowParam); }