From 1795a9dc1bafc61c8f4fff725588665239ca72d6 Mon Sep 17 00:00:00 2001 From: zt Date: Thu, 19 Dec 2024 17:52:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A6=E6=88=B7=E9=97=A8=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../member/controller/admin/group/vo/MemberGroupPageReqVO.java | 2 ++ .../yudao/module/member/dal/mysql/group/MemberGroupMapper.java | 1 + .../module/member/service/amount/DeductionServiceImpl.java | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java index ae67d5f6..af8c2943 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java @@ -27,4 +27,6 @@ public class MemberGroupPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; + private Long carteenId; + } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java index bbd9f116..084f364f 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java @@ -28,6 +28,7 @@ public interface MemberGroupMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(MemberGroupDO::getName, reqVO.getName()) .eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus()) + .eqIfPresent(MemberGroupDO::getCarteenId, reqVO.getCarteenId()) .betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(MemberGroupDO::getId)); } diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java index c152f00f..c671acf3 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java @@ -273,7 +273,6 @@ public class DeductionServiceImpl implements DeductionService { @Override public void refund(Long userId, BigDecimal money, DishOrderDO dishOrderDO) { //获取最新余额 - BigDecimal newMoney2; BigDecimal wxNewMoney; BigDecimal giftNewMoney; BigDecimal cashNewMoney;