Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-…

…cloud # Conflicts: # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java # yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/service/kefu/KeFuMessageServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/record/BrokerageRecordBaseVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserBaseVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserClearBrokerageUserReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageEnabledReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/user/BrokerageUserUpdateBrokerageUserReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawBaseVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/brokerage/vo/withdraw/BrokerageWithdrawRejectReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/DeliveryPickUpStoreController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreBaseVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreCreateReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/pickup/DeliveryPickUpStoreUpdateReqVO.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/order/TradeOrderController.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/brokerage/BrokerageWithdrawServiceImpl.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreService.java # yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/service/delivery/DeliveryPickUpStoreServiceImpl.java # yudao-module-pay/yudao-module-pay-api/src/main/java/cn/iocoder/yudao/module/pay/api/transfer/PayTransferApi.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/app/vo/PayAppBaseVO.java # yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/controller/admin/notify/PayNotifyController.java # yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/PayClientConfig.java # yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/order/PayOrderUnifiedReqDTO.java # yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/refund/PayRefundUnifiedReqDTO.java # yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/dto/transfer/PayTransferUnifiedReqDTO.java # yudao-module-pay/yudao-spring-boot-starter-biz-pay/src/main/java/cn/iocoder/yudao/framework/pay/core/client/impl/NonePayClientConfig.java
YunaiV · Nov 25, 2024 · 2b83340 · 2b83340
2 parents 18b63f4 + 50e4743
commit 2b83340
Show file tree

Hide file tree

Showing 98 changed files with 1,213 additions and 352 deletions.
diff --git a/...iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java b/...iocoder/yudao/module/product/controller/admin/history/ProductBrowseHistoryController.java
@@ -51,7 +51,8 @@ public CommonResult<PageResult<ProductBrowseHistoryRespVO>> getBrowseHistoryPage
                 convertSet(pageResult.getList(), ProductBrowseHistoryDO::getSpuId));
         return success(BeanUtils.toBean(pageResult, ProductBrowseHistoryRespVO.class,
                 vo -> Optional.ofNullable(spuMap.get(vo.getSpuId()))
-                        .ifPresent(spu -> vo.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setPrice(spu.getPrice()))));
+                        .ifPresent(spu -> vo.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setPrice(spu.getPrice())
+                                .setSalesCount(spu.getSalesCount()).setStock(spu.getStock()))));
     }
 
 }
diff --git a/.../iocoder/yudao/module/product/controller/admin/history/vo/ProductBrowseHistoryRespVO.java b/.../iocoder/yudao/module/product/controller/admin/history/vo/ProductBrowseHistoryRespVO.java
@@ -1,12 +1,9 @@
 package cn.iocoder.yudao.module.product.controller.admin.history.vo;
 
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 import static io.swagger.v3.oas.annotations.media.Schema.RequiredMode.REQUIRED;
 
 @Schema(description = "管理后台 - 商品浏览记录 Response VO")
@@ -31,4 +28,10 @@ public class ProductBrowseHistoryRespVO {
     @Schema(description = "商品单价", example = "100")
     private Integer price;
 
+    @Schema(description = "商品销量", example = "100")
+    private Integer salesCount;
+
+    @Schema(description = "库存", example = "100")
+    private Integer stock;
+
 }
diff --git a/...ocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java b/...ocoder/yudao/module/product/controller/app/history/AppProductBrowseHistoryController.java
@@ -67,7 +67,8 @@ public CommonResult<PageResult<AppProductBrowseHistoryRespVO>> getBrowseHistoryP
         Map<Long, ProductSpuDO> spuMap = convertMap(productSpuService.getSpuList(spuIds), ProductSpuDO::getId);
         return success(BeanUtils.toBean(pageResult, AppProductBrowseHistoryRespVO.class,
                 vo -> Optional.ofNullable(spuMap.get(vo.getSpuId()))
-                        .ifPresent(spu -> vo.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setPrice(spu.getPrice()))));
+                        .ifPresent(spu -> vo.setSpuName(spu.getName()).setPicUrl(spu.getPicUrl()).setPrice(spu.getPrice())
+                                .setSalesCount(spu.getSalesCount()).setStock(spu.getStock()))));
     }
 
 }
diff --git a/...iocoder/yudao/module/product/controller/app/history/vo/AppProductBrowseHistoryRespVO.java b/...iocoder/yudao/module/product/controller/app/history/vo/AppProductBrowseHistoryRespVO.java
@@ -17,13 +17,19 @@ public class AppProductBrowseHistoryRespVO {
 
     // ========== 商品相关字段 ==========
 
-    @Schema(description = "商品 SPU 名称", example = "赵六")
+    @Schema(description = "商品 SPU 名称", requiredMode = REQUIRED, example = "赵六")
     private String spuName;
 
-    @Schema(description = "商品封面图", example = "https://domain/pic.png")
+    @Schema(description = "商品封面图", requiredMode = REQUIRED, example = "https://www.iocoder.cn/pic.png")
     private String picUrl;
 
-    @Schema(description = "商品单价", example = "100")
+    @Schema(description = "商品单价", requiredMode = REQUIRED, example = "50")
     private Integer price;
 
+    @Schema(description = "商品销量", requiredMode = REQUIRED, example = "60")
+    private Integer salesCount;
+
+    @Schema(description = "库存", requiredMode = REQUIRED, example = "80")
+    private Integer stock;
+
 }
diff --git a/...a/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuConversationController.java b/...a/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuConversationController.java
@@ -6,6 +6,7 @@
 import cn.iocoder.yudao.module.member.api.user.dto.MemberUserRespDTO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.conversation.KeFuConversationRespVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.conversation.KeFuConversationUpdatePinnedReqVO;
+import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuConversationDO;
 import cn.iocoder.yudao.module.promotion.service.kefu.KeFuConversationService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -34,6 +35,25 @@ public class KeFuConversationController {
     @Resource
     private MemberUserApi memberUserApi;
 
+    @GetMapping("/get")
+    @Operation(summary = "获得客服会话")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('promotion:kefu-conversation:query')")
+    public CommonResult<KeFuConversationRespVO> getConversation(@RequestParam("id") Long id) {
+        KeFuConversationDO conversation = conversationService.getConversation(id);
+        if (conversation == null) {
+            return success(null);
+        }
+
+        // 拼接数据
+        KeFuConversationRespVO result = BeanUtils.toBean(conversation, KeFuConversationRespVO.class);
+        MemberUserRespDTO memberUser = memberUserApi.getUser(conversation.getUserId()).getCheckedData();
+        if (memberUser != null) {
+            result.setUserAvatar(memberUser.getAvatar()).setUserNickname(memberUser.getNickname());
+        }
+        return success(result);
+    }
+
     @PutMapping("/update-conversation-pinned")
     @Operation(summary = "置顶/取消置顶客服会话")
     @PreAuthorize("@ss.hasPermission('promotion:kefu-conversation:update')")

diff --git a/...n/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java b/...n/java/cn/iocoder/yudao/module/promotion/controller/admin/kefu/KeFuMessageController.java
@@ -2,9 +2,8 @@
 
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessagePageReqVO;
+import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageListReqVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageRespVO;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageSendReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
@@ -14,12 +13,13 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import java.util.List;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -56,19 +56,18 @@ public CommonResult<Boolean> updateKeFuMessageReadStatus(@RequestParam("conversa
         return success(true);
     }
 
-    @GetMapping("/page")
-    @Operation(summary = "获得客服消息分页")
+    @GetMapping("/list")
+    @Operation(summary = "获得客服消息列表")
     @PreAuthorize("@ss.hasPermission('promotion:kefu-message:query')")
-    public CommonResult<PageResult<KeFuMessageRespVO>> getKeFuMessagePage(@Valid KeFuMessagePageReqVO pageReqVO) {
+    public CommonResult<List<KeFuMessageRespVO>> getKeFuMessageList(@Valid KeFuMessageListReqVO pageReqVO) {
         // 获得数据
-        PageResult<KeFuMessageDO> pageResult = messageService.getKeFuMessagePage(pageReqVO);
+        List<KeFuMessageDO> list = messageService.getKeFuMessageList(pageReqVO);
 
         // 拼接数据
-        PageResult<KeFuMessageRespVO> result = BeanUtils.toBean(pageResult, KeFuMessageRespVO.class);
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(filterList(result.getList(),
+        List<KeFuMessageRespVO> result = BeanUtils.toBean(list, KeFuMessageRespVO.class);
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(filterList(result,
                 item -> UserTypeEnum.ADMIN.getValue().equals(item.getSenderType())), KeFuMessageRespVO::getSenderId));
-        result.getList().forEach(item-> findAndThen(userMap, item.getSenderId(),
-                user -> item.setSenderAvatar(user.getAvatar())));
+        result.forEach(item -> findAndThen(userMap, item.getSenderId(), user -> item.setSenderAvatar(user.getAvatar())));
         return success(result);
     }
 

diff --git a/...iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageListReqVO.java b/...iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessageListReqVO.java
@@ -0,0 +1,34 @@
+package cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 客服消息列表 Request VO")
+@Data
+public class KeFuMessageListReqVO {
+
+    private static final Integer LIMIT = 10;
+
+    @Schema(description = "会话编号", example = "12580")
+    @NotNull(message = "会话编号不能为空")
+    private Long conversationId;
+
+    @Schema(description = "发送时间", example = "2024-03-27 12:00:00")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTime;
+
+    @Schema(description = "每次查询条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @NotNull(message = "每次查询条数不能为空")
+    @Min(value = 1, message = "每次查询条数最小值为 1")
+    @Max(value = 100, message = "每次查询最大值为 100")
+    private Integer limit = LIMIT;
+
+}
diff --git a/...iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessagePageReqVO.java b/...iocoder/yudao/module/promotion/controller/admin/kefu/vo/message/KeFuMessagePageReqVO.java
diff --git a/...der/yudao/module/promotion/controller/admin/point/vo/activity/PointActivityPageReqVO.java b/...der/yudao/module/promotion/controller/admin/point/vo/activity/PointActivityPageReqVO.java
@@ -5,32 +5,14 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDateTime;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 @Schema(description = "管理后台 - 积分商城活动分页 Request VO")
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class PointActivityPageReqVO extends PageParam {
 
-    @Schema(description = "积分商城活动商品", example = "19509")
-    private Long spuId;
-
     @Schema(description = "活动状态", example = "2")
     private Integer status;
 
-    @Schema(description = "备注", example = "你说的对")
-    private String remark;
-
-    @Schema(description = "排序")
-    private Integer sort;
-
-    @Schema(description = "创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime[] createTime;
-
 }
diff --git a/.../java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java b/.../java/cn/iocoder/yudao/module/promotion/controller/app/kefu/AppKeFuMessageController.java
@@ -2,23 +2,29 @@
 
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.promotion.controller.admin.kefu.vo.message.KeFuMessageRespVO;
 import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessagePageReqVO;
 import cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message.AppKeFuMessageSendReqVO;
 import cn.iocoder.yudao.module.promotion.dal.dataobject.kefu.KeFuMessageDO;
 import cn.iocoder.yudao.module.promotion.service.kefu.KeFuMessageService;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.annotation.Resource;
-import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
+import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 @Tag(name = "用户 APP - 客服消息")
@@ -30,6 +36,9 @@ public class AppKeFuMessageController {
     @Resource
     private KeFuMessageService kefuMessageService;
 
+    @Resource
+    private AdminUserApi adminUserApi;
+
     @PostMapping("/send")
     @Operation(summary = "发送客服消息")
     public CommonResult<Long> sendKefuMessage(@Valid @RequestBody AppKeFuMessageSendReqVO sendReqVO) {
@@ -45,11 +54,17 @@ public CommonResult<Boolean> updateKefuMessageReadStatus(@RequestParam("conversa
         return success(true);
     }
 
-    @GetMapping("/page")
-    @Operation(summary = "获得客服消息分页")
-    public CommonResult<PageResult<KeFuMessageRespVO>> getKefuMessagePage(@Valid AppKeFuMessagePageReqVO pageReqVO) {
-        PageResult<KeFuMessageDO> pageResult = kefuMessageService.getKeFuMessagePage(pageReqVO, getLoginUserId());
-        return success(BeanUtils.toBean(pageResult, KeFuMessageRespVO.class));
+    @GetMapping("/list")
+    @Operation(summary = "获得客服消息列表")
+    public CommonResult<List<KeFuMessageRespVO>> getKefuMessageList(@Valid AppKeFuMessagePageReqVO pageReqVO) {
+        List<KeFuMessageDO> list = kefuMessageService.getKeFuMessageList(pageReqVO, getLoginUserId());
+
+        // 拼接数据
+        List<KeFuMessageRespVO> result = BeanUtils.toBean(list, KeFuMessageRespVO.class);
+        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(convertSet(filterList(result,
+                item -> UserTypeEnum.ADMIN.getValue().equals(item.getSenderType())), KeFuMessageRespVO::getSenderId));
+        result.forEach(item -> findAndThen(userMap, item.getSenderId(), user -> item.setSenderAvatar(user.getAvatar())));
+        return success(result);
     }
 
 }
diff --git a/...ocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessagePageReqVO.java b/...ocoder/yudao/module/promotion/controller/app/kefu/vo/message/AppKeFuMessagePageReqVO.java
@@ -1,16 +1,33 @@
 package cn.iocoder.yudao.module.promotion.controller.app.kefu.vo.message;
 
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
-import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
 
-@Schema(description = "用户 App - 客服消息分页 Request VO")
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "用户 App - 客服消息 Request VO")
 @Data
-@ToString(callSuper = true)
-public class AppKeFuMessagePageReqVO extends PageParam {
+public class AppKeFuMessagePageReqVO {
+
+    private static final Integer LIMIT = 10;
 
     @Schema(description = "会话编号", example = "12580")
     private Long conversationId;
 
+    @Schema(description = "发送时间", example = "2024-03-27 12:00:00")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime createTime;
+
+    @Schema(description = "每次查询条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
+    @NotNull(message = "每次查询条数不能为空")
+    @Min(value = 1, message = "每次查询条数最小值为 1")
+    @Max(value = 100, message = "每次查询最大值为 100")
+    private Integer limit = LIMIT;
+
 }
diff --git a/...ava/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityRespVO.java b/...ava/cn/iocoder/yudao/module/promotion/controller/app/point/vo/AppPointActivityRespVO.java
@@ -4,8 +4,6 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
-import java.time.LocalDateTime;
-
 @Schema(description = "用户 App - 积分商城活动 Response VO")
 @Data
 public class AppPointActivityRespVO {
@@ -30,20 +28,6 @@ public class AppPointActivityRespVO {
     @ExcelProperty("积分商城活动总库存")
     private Integer totalStock;
 
-    // TODO @puhui999：只返回必要的字段，例如说 remark、sort、createTime 应该是不需要的呢。也可以看看别的也不需要哈。
-
-    @Schema(description = "备注", example = "你说的对")
-    @ExcelProperty("备注")
-    private String remark;
-
-    @Schema(description = "排序", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("排序")
-    private Integer sort;
-
-    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
     // ========== 商品字段 ==========
 
     @Schema(description = "商品名称", requiredMode = Schema.RequiredMode.REQUIRED, // 从 SPU 的 name 读取

diff --git a/...ava/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java b/...ava/cn/iocoder/yudao/module/promotion/convert/combination/CombinationActivityConvert.java
@@ -217,14 +217,15 @@ default List<CombinationRecordDO> convertVirtualRecordList(CombinationRecordDO h
         List<CombinationRecordDO> createRecords = new ArrayList<>(count);
         for (int i = 0; i < count; i++) {
             // 基础信息和团长保持一致
-            CombinationRecordDO newRecord = BeanUtils.toBean(headRecord, CombinationRecordDO.class)
-                    .setId(null).setHeadId(headRecord.getHeadId());
+            CombinationRecordDO newRecord = convert5(headRecord).setHeadId(headRecord.getId());
             // 虚拟信息
             newRecord.setCount(0) // 会单独更新下，在后续的 Service 逻辑里
                     .setUserId(0L).setNickname("").setAvatar("").setOrderId(0L);
             createRecords.add(newRecord);
         }
         return createRecords;
     }
+    @Mapping(target = "id", ignore = true)
+    CombinationRecordDO convert5(CombinationRecordDO headRecord);
 
 }