From 78aeb77cd6f3bafc4f48837a4124ca18fe83c4b7 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Tue, 2 Jun 2026 10:32:13 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=A2=E5=8D=95=E9=92=B1=E5=8C=85?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/dto/order/HardOrderDto.java | 5 ++++ .../hard/api/vo/order/HardOrderVo.java | 5 ++++ .../mapper/order/HardOrderMapper.xml | 28 +++++++++++++++++-- .../api/dto/act/ActCouponRecordDto.java | 7 ++++- .../act/ActCouponRecordController.java | 2 +- .../mapper/WalletTransactionMapper.xml | 1 + .../mapper/act/ActCouponRecordMapper.xml | 3 ++ 7 files changed, 47 insertions(+), 4 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java index aaa7960bd..ecb97ca09 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/HardOrderDto.java @@ -90,4 +90,9 @@ public class HardOrderDto extends HardOrderEntity implements BaseIsIncludeTreeIn */ private String isDiscountsProduct; + /** + * 钱包类型id + */ + private Long walletTypeId; + } diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java index 815aea19c..0f4a403bb 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardOrderVo.java @@ -69,4 +69,9 @@ public class HardOrderVo extends HardOrderEntity implements BaseUserDeptInterfac */ private String walletTypeUniqueCode; + /** + * 钱包类型id + */ + private Long walletTypeId; + } 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 503e62205..5ce54daf0 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 @@ -240,7 +240,8 @@ m.type as hardType, m.dept_id as hardTypeDeptId, s.id as afterSaleId, - s.no as afterSaleNo + s.no as afterSaleNo, + w_m.wallet_type_id as walletTypeId from (select a.id from hard_order a @@ -260,12 +261,18 @@ order by a.create_time desc, a.user_id desc) t join hard_order a on a.id = t.id - left join hard_manager m on m.id = a.hard_id and m.tenant_id = 1 + left join hard_manager m on m.id = a.hard_id + left join pjcloudx_wallet.wallet_manage w_m on w_m.id = a.wallet_id left join (select order_id, max(id) as id from hard_after_sale where tenant_id = 1 group by order_id) sx on sx.order_id = a.id left join hard_after_sale s on s.id = sx.id + + + and w_m.wallet_type_id = #{dto.walletTypeId} + + order by a.create_time desc, a.user_id desc @@ -434,9 +441,13 @@ sum(a.pay_price) as totalPayPrice, count(0) as totalPayCount from hard_order a + left join pjcloudx_wallet.wallet_manage w_m ON w_m.id = a.wallet_id and a.merchant_id is not null + + and w_m.wallet_type_id = #{dto.walletTypeId} + and m.type in @@ -462,9 +473,13 @@ count(0) as totalPayCount from hard_after_sale r inner join hard_order a on a.id = r.order_id and r.del_flag = '0' + left join pjcloudx_wallet.wallet_manage w_m ON w_m.id = a.wallet_id and a.merchant_id is not null + + and w_m.wallet_type_id = #{dto.walletTypeId} + and r.audit_time between #{dto.refundTimeList[0]} and #{dto.refundTimeList[1]} @@ -598,8 +613,12 @@ sum(a.pay_price) as sum, count(0) as count from hard_order a + left join pjcloudx_wallet.wallet_manage w_m ON w_m.id = a.wallet_id a.del_flag = 0 + + and w_m.wallet_type_id = #{dto.walletTypeId} + and (a.refund_status is null or a.refund_status not in ('20')) @@ -642,8 +661,12 @@ select o.user_dept_id as deptId,sum(ifnull(a.refund_price, 0)) as sum, count(0) as count from hard_after_sale a inner join hard_order o on o.id = a.order_id and o.del_flag = '0' + left join pjcloudx_wallet.wallet_manage w_m ON w_m.id = o.wallet_id a.del_flag = '0' + + and w_m.wallet_type_id = #{dto.walletTypeId} + and o.order_status in @@ -1032,4 +1055,5 @@ limit #{dto.limit} + \ No newline at end of file diff --git a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/act/ActCouponRecordDto.java b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/act/ActCouponRecordDto.java index 1bbe5171d..37ae1f855 100644 --- a/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/act/ActCouponRecordDto.java +++ b/pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/dto/act/ActCouponRecordDto.java @@ -10,10 +10,15 @@ import java.util.List; public class ActCouponRecordDto extends ActCouponRecordEntity { /** - * 是否查询未过期的核销项 + * 是否在活动中 */ private Boolean isFindNoExpire = false; + /** + * 是否查询未过期的核销项 + */ + private Boolean isFindNotInExpire = false; + private List statusCodeList; private LocalDateTime[] createTimeList; diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java index b0cb50800..055b49b72 100755 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/act/ActCouponRecordController.java @@ -106,7 +106,7 @@ public class ActCouponRecordController { ActCouponRecordStatusEnum.USED.getCode(), ActCouponRecordStatusEnum.EXPIRED.getCode() )); - // dto.setIsFindNoExpire(true); + dto.setIsFindNotInExpire(true); return R.ok(actCouponRecordService.pageList(page, dto)); } 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 340200903..69ebcab22 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 @@ -160,6 +160,7 @@ a.wallet_id = ${dto.walletId} + and m.wallet_type_id = ${dto.walletTypeId} diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCouponRecordMapper.xml b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCouponRecordMapper.xml index abbb6c231..b9d03606a 100755 --- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCouponRecordMapper.xml +++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/act/ActCouponRecordMapper.xml @@ -40,6 +40,9 @@ and a.end_time >= now() and a.start_time <= now() + + and a.end_time >= now() + and a.status IN