From a7d6d981a1092e25d4899477860e6d466a834a70 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 7 May 2025 10:59:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promoCode/PromoCodeController.java        | 45 ++++++++++---------
 .../model/dto/user/UserInfoQueryRequest.java  |  4 +-
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/greenorange/promotion/controller/promoCode/PromoCodeController.java b/src/main/java/com/greenorange/promotion/controller/promoCode/PromoCodeController.java
index a984771..b2350f9 100644
--- a/src/main/java/com/greenorange/promotion/controller/promoCode/PromoCodeController.java
+++ b/src/main/java/com/greenorange/promotion/controller/promoCode/PromoCodeController.java
@@ -1,5 +1,6 @@
 package com.greenorange.promotion.controller.promoCode;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.greenorange.promotion.annotation.RequiresPermission;
 import com.greenorange.promotion.annotation.SysLog;
@@ -13,6 +14,7 @@ import com.greenorange.promotion.model.dto.promoCode.PromoCodeAddRequest;
 import com.greenorange.promotion.model.dto.promoCode.PromoCodeQueryRequest;
 import com.greenorange.promotion.model.dto.promoCode.PromoCodeUpdateRequest;
 import com.greenorange.promotion.model.entity.PromoCode;
+import com.greenorange.promotion.model.entity.UserInfo;
 import com.greenorange.promotion.model.vo.promoCode.PromoCodeVO;
 import com.greenorange.promotion.service.common.CommonService;
 import com.greenorange.promotion.service.project.PromoCodeService;
@@ -123,26 +125,25 @@ public class PromoCodeController {
         return ResultUtils.success(promoCodeVO);
     }
 
-//    /**
-//     * Web端管理员分页查询推广码
-//     * @param promoCodeQueryRequest 推广码查询请求体
-//     * @return 推广码列表
-//     */
-//    @PostMapping("page")
-//    @Operation(summary = "Web端管理员分页查询推广码", description = "参数：推广码查询请求体，权限：管理员，方法名：listPromoCodeByPage")
-//    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
-//    @SysLog(title = "推广码管理", content = "Web端管理员分页查询推广码")
-//    public BaseResponse<Page<PromoCodeVO>> listPromoCodeByPage(@Valid @RequestBody PromoCodeQueryRequest promoCodeQueryRequest) {
-//        long current = promoCodeQueryRequest.getCurrent();
-//        long pageSize = promoCodeQueryRequest.getPageSize();
-//        QueryWrapper<PromoCode> queryWrapper = promoCodeService.getQueryWrapper(promoCodeQueryRequest);
-//        Page<PromoCode> page = promoCodeService.page(new Page<>(current, pageSize), queryWrapper);
-//        List<PromoCode> promoCodeList = page.getRecords();
-//        List<PromoCodeVO> promoCodeVOList = commonService.convertList(promoCodeList, PromoCodeVO.class);
-//        Page<PromoCodeVO> voPage = new Page<>(current, pageSize);
-//        voPage.setRecords(promoCodeVOList);
-//        voPage.setPages(page.getPages());
-//        voPage.setTotal(page.getTotal());
-//        return ResultUtils.success(voPage);
-//    }
+
+
+    /**
+     * web端管理员根据项目id查询推广码
+     * @param commonRequest 项目id
+     * @return 推广码信息
+     */
+    @PostMapping("queryByPid")
+    @Operation(summary = "web端管理员根据id查询推广码", description = "参数：项目id，权限：管理员，方法名：queryPromoCodeByPid")
+    @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE)
+    @SysLog(title = "推广码管理", content = "web端管理员根据项目id查询推广码")
+    public BaseResponse<List<PromoCodeVO>> queryPromoCodeByPid(@Valid @RequestBody CommonRequest commonRequest) {
+        Long id = commonRequest.getId();
+        LambdaQueryWrapper<PromoCode> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PromoCode::getProjectId, id);
+        List<PromoCode> promoCodeList = promoCodeService.list(lambdaQueryWrapper);
+        List<PromoCodeVO> promoCodeVOS = commonService.convertList(promoCodeList, PromoCodeVO.class);
+        return ResultUtils.success(promoCodeVOS);
+    }
+
+
 }
\ No newline at end of file
diff --git a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java
index 559acba..d5a126e 100644
--- a/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java
+++ b/src/main/java/com/greenorange/promotion/model/dto/user/UserInfoQueryRequest.java
@@ -19,7 +19,7 @@ public class UserInfoQueryRequest extends PageRequest implements Serializable {
     /**
      * 用户ID
      */
-    @NotNull(message = "用户ID不能为null")
+//    @NotNull(message = "用户ID不能为null")
     @Min(value = 1L, message = "用户ID不能小于1")
     @Schema(description = "用户ID", example = "1")
     private Long id;
@@ -27,7 +27,7 @@ public class UserInfoQueryRequest extends PageRequest implements Serializable {
     /**
      * 手机号
      */
-    @NotBlank(message = "手机号不能为空")
+//    @NotBlank(message = "手机号不能为空")
     @Schema(description = "手机号", example = "15888610253")
     private String phoneNumber;