zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

账户门店

Browse Source
This commit is contained in:
zt
2024-12-19 17:52:07 +08:00
parent 4cd56a5d6c
commit 1795a9dc1b
3 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/group/vo/MemberGroupPageReqVO.java
View File

@ -27,4 +27,6 @@ public class MemberGroupPageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime; private LocalDateTime[] createTime;
private Long carteenId;
} }

1
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/dal/mysql/group/MemberGroupMapper.java
View File

@ -28,6 +28,7 @@ public interface MemberGroupMapper extends BaseMapperX<MemberGroupDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<MemberGroupDO>() return selectPage(reqVO, new LambdaQueryWrapperX<MemberGroupDO>()
.likeIfPresent(MemberGroupDO::getName, reqVO.getName()) .likeIfPresent(MemberGroupDO::getName, reqVO.getName())
.eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus()) .eqIfPresent(MemberGroupDO::getStatus, reqVO.getStatus())
.eqIfPresent(MemberGroupDO::getCarteenId, reqVO.getCarteenId())
.betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime()) .betweenIfPresent(MemberGroupDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(MemberGroupDO::getId)); .orderByDesc(MemberGroupDO::getId));
} }

1
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/amount/DeductionServiceImpl.java
View File

@ -273,7 +273,6 @@ public class DeductionServiceImpl implements DeductionService {
@Override @Override
public void refund(Long userId, BigDecimal money, DishOrderDO dishOrderDO) { public void refund(Long userId, BigDecimal money, DishOrderDO dishOrderDO) {
//获取最新余额 //获取最新余额
BigDecimal newMoney2;
BigDecimal wxNewMoney; BigDecimal wxNewMoney;
BigDecimal giftNewMoney; BigDecimal giftNewMoney;
BigDecimal cashNewMoney; BigDecimal cashNewMoney;