From b5666485de7a64565b87ce92b990f80ac2b96361 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 23 Jan 2025 14:22:03 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E9=83=A8=E9=97=A8=E4=BA=A4=E6=98=93?= =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/dto/order/HardDeptTotalDto.java | 17 ++++ .../dto/order/HardOrderSumAndCountDto.java | 2 + .../order/HardOrderTotalController.java | 73 ++++++++++++++++-- .../hard/service/HardOrderTotalService.java | 3 +- .../impl/order/HardOrderTotalServiceImpl.java | 24 +++++- .../main/resources/file/部门交易金额汇总.xlsx | Bin 0 -> 10062 bytes .../mapper/order/HardOrderMapper.xml | 2 + .../admin/api/feign/RemoteDeptService.java | 1 + .../admin/controller/SysDeptController.java | 4 + .../dto/WalletTransactionSumAndCountDto.java | 3 + .../mapper/WalletTransactionMapper.xml | 2 + 11 files changed, 122 insertions(+), 9 deletions(-) create mode 100644 pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardDeptTotalDto.java create mode 100644 pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardDeptTotalDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardDeptTotalDto.java new file mode 100644 index 000000000..e414333d2 --- /dev/null +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardDeptTotalDto.java @@ -0,0 +1,17 @@ +package com.bsd.pjcloud.hard.api.dto.order; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class HardDeptTotalDto { + + @Schema(description = "饭卡类型id") + private Long walletTypeId; + + @Schema(description = "饭卡类型id") + private LocalDateTime[] createTimeList; + +} diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java index 225ea7a4a..e29580abb 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderSumAndCountDto.java @@ -14,4 +14,6 @@ public class HardOrderSumAndCountDto { private LocalDateTime[] createTimeList; + private Long walletTypeId; + } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java index e56565163..b3eac7a16 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderTotalController.java @@ -10,8 +10,10 @@ import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.excel.write.metadata.fill.FillConfig; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.common.core.util.R; +import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.hard.api.constant.HardTypeEnum; import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum; +import com.bsd.pjcloud.hard.api.dto.order.HardDeptTotalDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.vo.order.HardDeptTotalVo; import com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo; @@ -59,13 +61,13 @@ public class HardOrderTotalController { @GetMapping("/page-list-dept") @Operation(summary = "部门交易记录") - public R> pageListDept(@ParameterObject Page page, @ParameterObject HardOrderDto dto) { - dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); - return R.ok(HardOrderTotalService.pageListDept(page, dto)); + public R> pageListDept(@ParameterObject HardDeptTotalDto dto) { + return R.ok(HardOrderTotalService.pageListDept(dto)); } - @Operation(summary = "设备交易记录导出", description = "退款导出") + @Operation(summary = "设备交易记录导出", description = "设备交易记录导出") @GetMapping("/export-sb") + @SysLog("设备交易记录导出") @PreAuthorize("@pms.hasPermission('hard_hardTotal_export_sb')") public void exportSb(HttpServletResponse response, HardOrderDto dto) throws IOException { dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); @@ -103,8 +105,9 @@ public class HardOrderTotalController { } - @Operation(summary = "商户交易记录导出", description = "退款导出") + @Operation(summary = "商户交易记录导出", description = "商户交易记录导出") @GetMapping("/export-cs") + @SysLog("商户交易记录导出") @PreAuthorize("@pms.hasPermission('hard_hardTotal_export_cs')") public void exportTk(HttpServletResponse response, HardOrderDto dto) throws IOException { dto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); @@ -140,4 +143,64 @@ public class HardOrderTotalController { excelWriter.fill(list, fillConfig, writeSheet); } } + + @Operation(summary = "部门交易记录导出", description = "部门交易记录导出") + @GetMapping("/export-dept") + @SysLog("部门交易记录导出") + @PreAuthorize("@pms.hasPermission('hard_hardTotal_export_dept')") + public void exportDept(HttpServletResponse response, HardDeptTotalDto dto) throws IOException { + List list = HardOrderTotalService.pageListDept(dto); + try (ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream()).withTemplate(ResourceUtil.getStream("file/部门交易金额汇总.xlsx")).build()) { + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build(); + Map map = new HashMap(); + if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { + map.put("timeSpan", " 到 "); + map.put("startTime", LocalDateTimeUtil.format(dto.getCreateTimeList()[0], DatePattern.NORM_DATETIME_PATTERN)); + map.put("endTime", LocalDateTimeUtil.format(dto.getCreateTimeList()[0], DatePattern.NORM_DATETIME_PATTERN)); + } + if (ObjectUtil.isNotEmpty(list)) { + BigDecimal walletPriceSum = BigDecimal.ZERO; + BigDecimal walletCountSum = BigDecimal.ZERO; + BigDecimal totalPayPriceSum = BigDecimal.ZERO; + BigDecimal totalPayCountSum = BigDecimal.ZERO; + BigDecimal orderRefundPriceSum = BigDecimal.ZERO; + BigDecimal orderRefundContSum = BigDecimal.ZERO; + for (HardDeptTotalVo v : list) { + if (ObjectUtil.isNotEmpty(v.getWalletPrice())) { + walletPriceSum = walletPriceSum.add(BigDecimal.valueOf(v.getWalletPrice())); + v.setWalletPrice(BigDecimal.valueOf(v.getWalletPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); + } + if (ObjectUtil.isNotEmpty(v.getWalletCount())) { + walletCountSum = walletCountSum.add(BigDecimal.valueOf(v.getWalletCount())); + v.setWalletCount(BigDecimal.valueOf(v.getWalletCount()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); + } + if (ObjectUtil.isNotEmpty(v.getOrderPayPrice())) { + totalPayPriceSum = totalPayPriceSum.add(BigDecimal.valueOf(v.getOrderPayPrice())); + v.setOrderPayPrice(BigDecimal.valueOf(v.getOrderPayPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); + } + if (ObjectUtil.isNotEmpty(v.getOrderPayCount())) { + totalPayCountSum = totalPayCountSum.add(BigDecimal.valueOf(v.getOrderPayCount())); + v.setOrderPayCount(BigDecimal.valueOf(v.getOrderPayCount()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); + } + if (ObjectUtil.isNotEmpty(v.getOrderRefundPrice())) { + orderRefundPriceSum = orderRefundPriceSum.add(BigDecimal.valueOf(v.getOrderRefundPrice())); + v.setOrderRefundPrice(BigDecimal.valueOf(v.getOrderRefundPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); + } + if (ObjectUtil.isNotEmpty(v.getOrderRefundCont())) { + orderRefundContSum = orderRefundContSum.add(BigDecimal.valueOf(v.getOrderRefundCont())); + v.setOrderRefundCont(BigDecimal.valueOf(v.getOrderRefundCont()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).longValue()); + } + map.put("walletPriceSum", walletPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + map.put("walletCountSum", walletCountSum.toString()); + map.put("totalPayPriceSum", totalPayPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + map.put("totalPayCountSum", totalPayCountSum.toString()); + map.put("orderRefundPriceSum", orderRefundPriceSum.divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString()); + map.put("orderRefundContSum", orderRefundContSum.toString()); + } + } + excelWriter.fill(map, writeSheet); + excelWriter.fill(list, fillConfig, writeSheet); + } + } } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderTotalService.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderTotalService.java index cdd9f6d03..6a605938c 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderTotalService.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/HardOrderTotalService.java @@ -1,6 +1,7 @@ package com.bsd.pjcloud.hard.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.bsd.pjcloud.hard.api.dto.order.HardDeptTotalDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.vo.order.HardDeptTotalVo; import com.bsd.pjcloud.hard.api.vo.order.HardOrderCsVo; @@ -18,5 +19,5 @@ public interface HardOrderTotalService { List listCs(HardOrderDto dto); - Page pageListDept(Page page, HardOrderDto dto); + List pageListDept(HardDeptTotalDto dto); } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java index 72a3a21f3..78adec755 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderTotalServiceImpl.java @@ -9,6 +9,7 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.CollectionUtils; import com.bsd.pjcloud.hard.api.constant.order.HardOrderStatusEnum; import com.bsd.pjcloud.hard.api.dto.HardManagerDto; +import com.bsd.pjcloud.hard.api.dto.order.HardDeptTotalDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderDto; import com.bsd.pjcloud.hard.api.dto.order.HardOrderSumAndCountDto; import com.bsd.pjcloud.hard.api.entity.HardManagerEntity; @@ -133,7 +134,7 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { } @Override - public Page pageListDept(Page page, HardOrderDto dto) { + public List pageListDept(HardDeptTotalDto dto) { // 查询部门 CompletableFuture> deptFuture = CompletableFuture.supplyAsync(() -> remoteDeptService.getInnerAllDept().getData() @@ -151,6 +152,12 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { CompletableFuture> walletFuture = CompletableFuture.supplyAsync(() -> { WalletTransactionSumAndCountDto walletDto = new WalletTransactionSumAndCountDto(); walletDto.setDeptIds(deptIds); + if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { + walletDto.setCreateTimeList(dto.getCreateTimeList()); + } + if (ObjectUtil.isNotEmpty(dto.getWalletTypeId())) { + walletDto.setWalletTypeId(dto.getWalletTypeId()); + } return remoteWalletTransactionService.sumAndCount(walletDto).getData(); }); // 查询订单支付流水 @@ -158,6 +165,12 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { HardOrderSumAndCountDto payDto = new HardOrderSumAndCountDto(); payDto.setDeptIds(deptIds); payDto.setOrderStatusCodes(HardOrderStatusEnum.getPaySuccessCodes()); + if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { + payDto.setCreateTimeList(dto.getCreateTimeList()); + } + if (ObjectUtil.isNotEmpty(dto.getWalletTypeId())) { + payDto.setWalletTypeId(dto.getWalletTypeId()); + } return hardOrderMapper.sumAndCount(payDto); }); // 查询订单退款流水 @@ -165,6 +178,12 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { HardOrderSumAndCountDto refundDto = new HardOrderSumAndCountDto(); refundDto.setDeptIds(deptIds); refundDto.setOrderStatusCodes(HardOrderStatusEnum.getPayErrorCodes()); + if (ObjectUtil.isNotEmpty(dto.getCreateTimeList())) { + refundDto.setCreateTimeList(dto.getCreateTimeList()); + } + if (ObjectUtil.isNotEmpty(dto.getWalletTypeId())) { + refundDto.setWalletTypeId(dto.getWalletTypeId()); + } return hardOrderMapper.sumAndCount(refundDto); }); CompletableFuture allFutures = CompletableFuture.allOf(walletFuture, payFuture, refundFuture); @@ -195,7 +214,6 @@ public class HardOrderTotalServiceImpl implements HardOrderTotalService { } return resultList; }); - List resultList = resultListFuture.join(); - return null; + return resultListFuture.join(); } } diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/file/部门交易金额汇总.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f0d9426b8070641c31dd88d573eaf5452c1c7643 GIT binary patch literal 10062 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 literal 0 HcmV?d00001 diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml index f583469ba..33001b027 100644 --- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml +++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardOrderMapper.xml @@ -146,6 +146,8 @@ from hard_order a a.del_flag = 0 and a.dept_id is not null + + and a.order_status in diff --git a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java index 3c9ceb845..c1a44e43d 100644 --- a/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java +++ b/pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java @@ -19,6 +19,7 @@ package com.bsd.pjcloud.admin.api.feign; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.admin.api.entity.SysDept; import com.bsd.pjcloud.common.core.constant.ServiceNameConstants; import com.bsd.pjcloud.common.core.util.R; diff --git a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java index 5732c87a6..bf123e0d9 100644 --- a/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java +++ b/pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysDeptController.java @@ -19,6 +19,9 @@ package com.bsd.pjcloud.admin.controller; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bsd.pjcloud.admin.api.entity.SysDept; import com.bsd.pjcloud.admin.api.vo.DeptExcelVO; import com.bsd.pjcloud.admin.service.SysDeptService; @@ -32,6 +35,7 @@ import io.swagger.v3.oas.annotations.security.SecurityRequirement; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.AllArgsConstructor; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.HttpHeaders; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java index 7aef47cf0..e4b837ea3 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/WalletTransactionSumAndCountDto.java @@ -1,5 +1,6 @@ package com.bsd.pjcloud.wallet.api.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import java.time.LocalDateTime; @@ -24,4 +25,6 @@ public class WalletTransactionSumAndCountDto { private LocalDateTime[] createTimeList; + private Long walletTypeId; + } diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml index 1c571c899..8e0718ab8 100644 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/WalletTransactionMapper.xml @@ -58,6 +58,8 @@ from wallet_transaction a a.del_flag = 0 and a.dept_id is not null + + and a.price > 0