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

优化

Browse Source
This commit is contained in:
zt
2025-06-17 15:49:19 +08:00
parent a9a2460a0e
commit 49e74b91c5
10 changed files with 138 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/api/activitypay/ActivityApiImpl.java
View File

@ -1,8 +1,11 @@
package cn.iocoder.yudao.module.member.api.activitypay;
import cn.hutool.core.bean.BeanUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.member.api.activitypay.dto.ActivityPayDTO;
import cn.iocoder.yudao.module.member.api.activitypay.dto.ActivityPayRespDTO;
import cn.iocoder.yudao.module.member.controller.admin.activitypay.vo.ActivityPaySaveReqVO;
import cn.iocoder.yudao.module.member.dal.dataobject.activitypay.ActivityPayDO;
import cn.iocoder.yudao.module.member.service.activitypay.ActivityPayService;
import org.springframework.stereotype.Service;
@ -26,4 +29,10 @@ public class ActivityApiImpl implements ActivityApi {
bean.setMenu(createReqVO.getMenu());
activityPayService.addActivityPay(bean);
}
@Override
public ActivityPayRespDTO getActivityPay(Long id) {
ActivityPayDO activityPay = activityPayService.getActivityPay(id);
return BeanUtils.toBean(activityPay, ActivityPayRespDTO.class);
}
}

8
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/admin/activitypay/vo/ActivityPayPageRVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.member.controller.admin.activitypay.vo;
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@ -38,9 +39,14 @@ public class ActivityPayPageRVO {
@ExcelProperty("预约就餐时间")
private String reserveTime;
@ExcelProperty("电话")
@ExcelIgnore
private String voucher;
@ExcelProperty("代金券使用数量")
private int voucherNum;
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

10
yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/activitypay/ActivityPayServiceImpl.java
View File

@ -24,6 +24,7 @@ import cn.iocoder.yudao.module.member.service.user.MemberUserService;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -325,6 +326,15 @@ public class ActivityPayServiceImpl implements ActivityPayService {
queryDTOPage.setSize(pageVO.getPageSize());
Page<ActivityPayPageRVO> activityAwardsUserRespVOPage = activityPayMapper.getPage1(queryDTOPage, pageVO);
activityAwardsUserRespVOPage.getRecords().forEach(activityPayPageRVO -> {
if(StringUtils.isNotBlank(activityPayPageRVO.getVoucher())){
int length = activityPayPageRVO.getVoucher().split(",").length;
activityPayPageRVO.setVoucherNum(length);
}else{
activityPayPageRVO.setVoucherNum(0);
}
});
return new PageResult<>(activityAwardsUserRespVOPage.getRecords(), activityAwardsUserRespVOPage.getTotal());
}
}