zwhui 1 år sedan
förälder
incheckning
b83dbf115a

+ 1 - 0
wholesale/src/main/java/com/yhlxj/dao/model/entity/WholesaleUser.java

@@ -3,6 +3,7 @@ package com.yhlxj.dao.model.entity;
 import com.yhlxj.dao.model.BaseEntity;
 import lombok.Data;
 
+import javax.validation.constraints.Email;
 import java.util.Date;
 
 /**

+ 1 - 1
wholesale/src/main/java/com/yhlxj/web/controller/code/exchange/ExchangeCodeController.java

@@ -27,7 +27,7 @@ public class ExchangeCodeController {
 	private final ExchangeCodeService exchangeCodeService;
 
 	/**
-	 * 兑换车票
+	 * 兑换 兑换码
 	 */
 	@PostMapping("/exchange")
 	public Result<String> exchangeCode(@RequestBody ExchangeCodeTicket exchangeCodeTicket) throws Exception {

+ 5 - 0
wholesale/src/main/java/com/yhlxj/web/controller/login/WholesaleUserController.java

@@ -1,5 +1,6 @@
 package com.yhlxj.web.controller.login;
 
+import cn.hutool.core.lang.Validator;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.yhlxj.dao.model.entity.WholesaleUser;
 import com.yhlxj.service.wholesale.WholesaleUserService;
@@ -17,6 +18,7 @@ import javax.validation.constraints.NotNull;
 /**
  * @author zwhui
  * @date 2025/6/9 15:42
+ * 用户登录
  */
 @Slf4j
 @RequiredArgsConstructor
@@ -62,6 +64,9 @@ public class WholesaleUserController {
      */
     @PostMapping("/register")
     public WholesaleUser register(@RequestBody @NotNull WholesaleUser wholesaleUser) throws Exception {
+        if (wholesaleUser.getUsername() == null || !Validator.isEmail(wholesaleUser.getUsername())) {
+            throw BusinessRuntimeException.getInstance("请输入正确邮箱");
+        }
          WholesaleUser login = wholesaleUserService.register(wholesaleUser.getUsername(), wholesaleUser.getPassword());
 
         //写回登陆信息

+ 16 - 0
wholesale/src/main/java/com/yhlxj/web/controller/manage/WholesaleController.java

@@ -1,10 +1,14 @@
 package com.yhlxj.web.controller.manage;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cyksj.common.exception.BusinessRuntimeException;
 import com.yhlxj.dao.model.dto.Result;
 import com.yhlxj.dao.model.entity.WebInfo;
+import com.yhlxj.dao.model.entity.WholesaleUser;
 import com.yhlxj.dao.model.enums.GatewayResponse;
 import com.yhlxj.service.wholesale.WebInfoService;
+import com.yhlxj.service.wholesale.WholesaleUserService;
 import com.yhlxj.web.util.StpUserUtil;
 import com.yhlxj.web.util.StpWholesaleUtil;
 import lombok.RequiredArgsConstructor;
@@ -17,6 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.NotNull;
 
 /**
+ * 个人网站
  * @author zwhui
  * @date 2025/6/3 17:12
  */
@@ -29,6 +34,8 @@ public class WholesaleController {
 
     private final HttpServletResponse response;
 
+    private final WholesaleUserService wholesaleUserService;
+
 
     /**
      * 检查前缀是否存在
@@ -116,4 +123,13 @@ public class WholesaleController {
     }
 
 
+    /**
+     * 查询批发网站用户列表
+     */
+    @GetMapping("/user/list")
+    public Result<Page<WholesaleUser>> listUser(String username, @RequestParam(defaultValue = "1") Integer start, @RequestParam(defaultValue = "10") Integer limit) {
+        return GatewayResponse.SUCCESS.newBuilder().toResult(wholesaleUserService.page(new Page<>(start, limit),
+                Wrappers.lambdaQuery(WholesaleUser.class).like(WholesaleUser::getUsername, username)));
+    }
+
 }

+ 1 - 0
wholesale/src/main/java/com/yhlxj/web/controller/manage/WholesaleNoticeController.java

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
 /**
+ * 公告管理
  * @author zwhui
  * @date 2025/6/9 14:30
  */