init

2024-01-07 16:42:24 +08:00
parent 31af6fdc76
commit fad404fe58
52 changed files with 257 additions and 176 deletions
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SmsVerifyController.java
@@ -42,7 +42,7 @@ public class SmsVerifyController extends BaseController {
    @SaCheckPermission("cai:smsVerify:list")
    @GetMapping("/list")
    public TableDataInfo<SmsVerify> list(SmsVerify bo, PageQuery pageQuery) {
-        Page<SmsVerify> page = smsVerifyService.page(pageQuery.build(), Wrappers.lambdaQuery(bo));
+        Page<SmsVerify> page = smsVerifyService.page(pageQuery.build(), Wrappers.lambdaQuery(bo).orderByDesc(SmsVerify::getCreateTime));
        return TableDataInfo.build(page);
    }

--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java
@@ -2,13 +2,17 @@ package com.ruoyi.cai.controller.app;

 import cn.dev33.satoken.annotation.SaIgnore;
 import com.ruoyi.cai.auth.*;
+import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.enums.CodeEnum;
 import com.ruoyi.cai.manager.CodeManager;
 import com.ruoyi.cai.service.SmsVerifyService;
+import com.ruoyi.cai.service.UserService;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.exception.ServiceException;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,16 +25,19 @@ import java.util.Map;
@RequestMapping("/api/auth")
@SaIgnore
@Tag(name = "权限相关接口，免鉴权")
+@Validated
 public class AuthAppController {

    @Autowired
    private CaiLoginManager caiLoginManager;
    @Autowired
    private SmsVerifyService smsVerifyService;
+    @Autowired
+    private UserService userService;

    @PostMapping("/register")
    @Operation(summary = "注册")
-    public R<Map<String, Object>> register(@RequestBody CaiRegisterUser caiUser){
+    public R<Map<String, Object>> register(@Validated @RequestBody CaiRegisterUser caiUser){
        String token = caiLoginManager.register(caiUser);
        Map<String, Object> ajax = new HashMap<>();
        ajax.put("token",token);
@@ -39,21 +46,25 @@ public class AuthAppController {

    @PostMapping("/register/code")
    @Operation(summary = "获取注册验证码")
-    public R<Map<String,String>> registerCode(@RequestBody RegisterCode code){
+    public R<Map<String,String>> registerCode(@Validated @RequestBody RegisterCode code){
        smsVerifyService.put(CodeEnum.REGISTER,code.getMobile());
        return R.ok("发送成功");
    }

    @PostMapping("/resetPassword/code")
    @Operation(summary = "获取重置密码验证码")
-    public R<Map<String,String>> resetPasswordCode(@RequestBody RegisterCode code){
+    public R<Map<String,String>> resetPasswordCode(@Validated @RequestBody RegisterCode code){
+        User user = userService.getByUsername(code.getMobile());
+        if(user == null){
+            throw new ServiceException("用户不存在");
+        }
        smsVerifyService.put(CodeEnum.RESET_PASSWORD,code.getMobile());
        return R.ok("发送成功");
    }

    @PostMapping("/login")
    @Operation(summary = "登陆")
-    public R<Map<String,Object>> login(@RequestBody LoginCaiUser loginBody){
+    public R<Map<String,Object>> login(@Validated @RequestBody LoginCaiUser loginBody){
        Map<String, Object> ajax = new HashMap<>();
        String token = caiLoginManager.login(loginBody.getUsername(), loginBody.getPassword());
        ajax.put("token",token);
@@ -61,10 +72,10 @@ public class AuthAppController {
    }

    @PostMapping("/resetPassword")
-    @Operation(summary = "获取充值密码验证码")
+    @Operation(summary = "重置密码")
    public R<Boolean> resetPassword(@RequestBody ResetPasswordReq code){
        caiLoginManager.resetPassword(code);
-        return R.ok("发送成功");
+        return R.ok(true);
    }


--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java
@@ -28,8 +28,6 @@ public class SettingAppController {
    @Autowired
    private ReportCateService reportCateService;
    @Autowired
-    private CitysService citysService;
-    @Autowired
    private GiftService giftService;

    @GetMapping("/goods")
@@ -57,12 +55,6 @@ public class SettingAppController {
    }


-    @GetMapping("/city")
-    @Operation(summary = "城市")
-    public R<Map<Long,String>> city(){
-        return R.ok(citysService.all());
-    }
-
    @GetMapping("/gift")
    @Operation(summary = "礼物配置")
    public R<List<GiftVo>> gift(){
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java
@@ -12,6 +12,7 @@ import com.ruoyi.common.helper.LoginHelper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@@ -33,7 +34,7 @@ public class UserAppController {

    @PostMapping("/update")
    @Operation(summary = "修改当前用户信息")
-    public R<Boolean> userUpdate(@RequestBody UserUpdateReq res){
+    public R<Boolean> userUpdate(@Validated @RequestBody UserUpdateReq res){
        return R.ok(currentUserManager.userUpdate(res));
    }

--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserBlackAppController.java
@@ -29,7 +29,7 @@ public class UserBlackAppController {
    }

    @PostMapping("black")
-    @Operation(summary = "拉黑操作 如果已经给拉黑则放开")
+    @Operation(summary = "拉黑操作")
    public R<Boolean> black(@RequestBody BlackQuery query){
        Long userId = LoginHelper.getUserId();
        boolean b = userBlacklistService.black(userId,query.getBlackUserId(),query.getActionType());
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserGreetAppController.java
@@ -13,6 +13,7 @@ import com.ruoyi.common.utils.BeanConvertUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

 import java.util.List;
@@ -39,9 +40,10 @@ public class UserGreetAppController {
        return R.ok(BeanConvertUtil.convertListTo(userGreet,UserGreetVo::new));
    }

-    @GetMapping("/add")
+    @PostMapping("/add")
    @Operation(summary = "新增群打招呼")
-    public R<Void> add(@RequestBody UserGreetAddReq req){
+    public R<Void> add(@Validated @RequestBody UserGreetAddReq req){
+        req.setUserId(LoginHelper.getUserId());
        userGreetService.addUserGreet(req);
        return R.ok();
    }
--- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
+++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java
@@ -5,14 +5,16 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.AccountBankcard;
 import com.ruoyi.cai.domain.AccountCash;
 import com.ruoyi.cai.domain.AccountRecharge;
+import com.ruoyi.cai.domain.RechargeOrder;
 import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes;
 import com.ruoyi.cai.dto.app.query.WithdrawReq;
 import com.ruoyi.cai.dto.app.vo.AccountCashVo;
-import com.ruoyi.cai.dto.app.vo.AccountRechargeVo;
+import com.ruoyi.cai.dto.app.vo.RechargeOrderVo;
 import com.ruoyi.cai.dto.app.vo.user.UserAccountVo;
 import com.ruoyi.cai.manager.CurrentUserManager;
+import com.ruoyi.cai.pay.PayStatusEnum;
 import com.ruoyi.cai.service.AccountCashService;
-import com.ruoyi.cai.service.AccountRechargeService;
+import com.ruoyi.cai.service.RechargeOrderService;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
@@ -32,7 +34,7 @@ public class WalletController {
    @Autowired
    private AccountCashService accountCashService;
    @Autowired
-    private AccountRechargeService accountRechargeService;
+    private RechargeOrderService rechargeOrderService;

    @GetMapping("/account")
    @Operation(summary = "快速获取当前用户账号余额信息")
@@ -64,12 +66,14 @@ public class WalletController {

    @GetMapping("/recharge/log")
    @Operation(summary = "充值记录-分页")
-    public TableDataInfo<AccountRechargeVo> rechargeLog(PageQuery query){
+    public TableDataInfo<RechargeOrderVo> rechargeLog(PageQuery query){
        Long userId = LoginHelper.getUserId();
-        Page<AccountRecharge> page = accountRechargeService.page(query.build(), Wrappers.lambdaQuery(AccountRecharge.class)
-                .eq(AccountRecharge::getUserId, userId)
-                .orderByDesc(AccountRecharge::getCreateTime));
-        return TableDataInfo.build(page,AccountRechargeVo::new);
+        Page<RechargeOrder> page = rechargeOrderService.page(query.build(), Wrappers.lambdaQuery(RechargeOrder.class)
+                .eq(RechargeOrder::getUserId, userId)
+                .eq(RechargeOrder::getAdmin,false)
+                .eq(RechargeOrder::getPayStatus, PayStatusEnum.PAY.getCode())
+                .orderByDesc(RechargeOrder::getCreateTime));
+        return TableDataInfo.build(page, RechargeOrderVo::new);
    }

    @GetMapping("/cash/log")