优化

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/activitypay/ActivityApi.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.member.api.activitypay;
 
 import cn.iocoder.yudao.module.member.api.activitypay.dto.ActivityPayDTO;
+import cn.iocoder.yudao.module.member.api.activitypay.dto.ActivityPayRespDTO;
 
 /**
  * 用户收件地址 API 接口
@@ -12,4 +13,6 @@ public interface ActivityApi {
 
     void createActivityPay(ActivityPayDTO createReqVO);
 
+    ActivityPayRespDTO getActivityPay(Long  id);
+
 }

yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/activitypay/dto/ActivityPayRespDTO.java

@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.member.api.activitypay.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+
+@Data
+
+public class ActivityPayRespDTO {
+
+
+    private Long id;
+
+
+    private Long activityId;
+
+
+    private String serialNumbers;
+
+
+    private BigDecimal price;
+
+
+    private Long userId;
+
+
+    private String mobile;
+
+    private String transactionId;
+
+    private String openid;
+
+    private LocalDateTime createTime;
+
+}

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

@@ -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);
+    }
 }

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

@@ -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;
+
+
 }

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

@@ -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());
     }
 }