From da74c383a79c6686566adbdba5cc5276a5448c7d Mon Sep 17 00:00:00 2001 From: dute7liang <383200134@qq.com> Date: Sat, 30 Dec 2023 19:32:31 +0800 Subject: [PATCH] init --- ...ntroller.java => AnchorAppController.java} | 2 +- ...Controller.java => AuthAppController.java} | 2 +- ...Controller.java => ConsumeController.java} | 2 +- ...exController.java => IndexController.java} | 2 +- ...erController.java => OtherController.java} | 2 +- ...troller.java => SettingAppController.java} | 2 +- ...Controller.java => UserAppController.java} | 25 +--------- ...ler.java => UserDynamicAppController.java} | 2 +- ...oller.java => UserStartAppController.java} | 2 +- ...ler.java => UserVisitorAppController.java} | 2 +- .../cai/controller/app/WalletController.java | 47 +++++++++++++++++++ 11 files changed, 57 insertions(+), 33 deletions(-) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiAnchorAppController.java => AnchorAppController.java} (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiAuthAppController.java => AuthAppController.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiConsumeController.java => ConsumeController.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiIndexController.java => IndexController.java} (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiOtherController.java => OtherController.java} (96%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiSettingAppController.java => SettingAppController.java} (98%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiUserAppController.java => UserAppController.java} (82%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiUserDynamicAppController.java => UserDynamicAppController.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiUserStartAppController.java => UserStartAppController.java} (97%) rename ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/{CaiUserVisitorAppController.java => UserVisitorAppController.java} (97%) create mode 100644 ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java index 8bb85a93..479c61a9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAnchorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AnchorAppController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/anchor") @Tag(name = "主播相关接口") -public class CaiAnchorAppController { +public class AnchorAppController { @Autowired private CurrentUserManager currentUserManager; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAuthAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAuthAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java index 3e076dfc..de46fc4e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiAuthAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/AuthAppController.java @@ -20,7 +20,7 @@ import java.util.Map; @RequestMapping("/api/auth") @SaIgnore @Tag(name = "权限相关接口，免鉴权") -public class CaiAuthAppController { +public class AuthAppController { @Autowired private CaiLoginManager caiLoginManager; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiConsumeController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiConsumeController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java index 16e0ded0..cc9c9e1b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiConsumeController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/ConsumeController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/consume") @Tag(name = "消费相关的接口") -public class CaiConsumeController { +public class ConsumeController { @Autowired private CaiGuardTotalService guardTotalService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiIndexController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiIndexController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java index 8963f173..fe669493 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiIndexController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/IndexController.java @@ -28,7 +28,7 @@ import java.util.List; @RestController @RequestMapping("/api/index") @Tag(name = "首页展示相关接口") -public class CaiIndexController { +public class IndexController { @Autowired private CaiAnchorService anchorService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiOtherController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java similarity index 96% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiOtherController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java index d6eeabc8..3c178d0d 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiOtherController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/OtherController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/api/other") @Tag(name = "其他接口") -public class CaiOtherController { +public class OtherController { @Autowired private CaiReportService reportService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiSettingAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java similarity index 98% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiSettingAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java index 5c6bebe3..5857cd2a 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiSettingAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/SettingAppController.java @@ -19,7 +19,7 @@ import java.util.Map; @RestController @RequestMapping("/api/setting") @Tag(name = "获取设置相关接口") -public class CaiSettingAppController { +public class SettingAppController { @Autowired private CaiGoodsService goodsService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java similarity index 82% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java index a6587a44..0d500279 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserAppController.java @@ -2,7 +2,6 @@ package com.ruoyi.cai.controller.app; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.cai.domain.CaiAccountBankcard; import com.ruoyi.cai.domain.CaiAccountCash; import com.ruoyi.cai.domain.CaiAccountRecharge; import com.ruoyi.cai.dto.app.query.*; @@ -28,7 +27,7 @@ import java.util.List; @RestController @RequestMapping("/api/user") @Tag(name = "用户相关接口") -public class CaiUserAppController { +public class UserAppController { @Autowired private CurrentUserManager currentUserManager; @Autowired @@ -38,28 +37,6 @@ public class CaiUserAppController { @Autowired private CaiUserAlbumService userAlbumService; - @GetMapping("/aliInfo") - @Operation(summary = "获取绑定支付宝信息") - public R aliInfo(){ - CaiAccountBankcard accountBankcard = currentUserManager.aliInfo(); - return R.ok(accountBankcard); - } - - @PostMapping("/save-or-update/ali") - @Operation(summary = "支付宝信息的新增和修改") - public R updateAli(@RequestBody AccountAliBankCardRes res){ - currentUserManager.saveOrUpdateAliInfo(res); - return R.ok(true); - } - - @PostMapping("/withdraw/ali") - @Operation(summary = "支付宝提现接口") - public R withdraw(@RequestBody WithdrawReq res){ - res.setUserId(LoginHelper.getUserId()); - accountCashService.withdraw(res); - return R.ok(true); - } - @GetMapping("/info") @Operation(summary = "当前用户信息") public R currentInfo(){ diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java index 995cbb08..72a3af30 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserDynamicAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserDynamicAppController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/dynamic") @Tag(name = "广场动态相关接口") -public class CaiUserDynamicAppController { +public class UserDynamicAppController { @Autowired private CaiDynamicService dynamicService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java index 5779a69e..e7073dd9 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserStartAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserStartAppController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("/api/user/star") @Tag(name = "关注相关接口") -public class CaiUserStartAppController { +public class UserStartAppController { @Autowired private CaiUserFollowService userFollowService; diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java similarity index 97% rename from ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java rename to ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java index 633f27ed..ad37aa36 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/CaiUserVisitorAppController.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/UserVisitorAppController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/api/user/visitor") @Slf4j @Tag(name = "访问记录相关接口") -public class CaiUserVisitorAppController { +public class UserVisitorAppController { @Autowired private CaiUserVisitorService userVisitorService; diff --git 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 new file mode 100644 index 00000000..e31f12ee --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/app/WalletController.java @@ -0,0 +1,47 @@ +package com.ruoyi.cai.controller.app; + +import com.ruoyi.cai.domain.CaiAccountBankcard; +import com.ruoyi.cai.dto.app.query.AccountAliBankCardRes; +import com.ruoyi.cai.dto.app.query.WithdrawReq; +import com.ruoyi.cai.manager.CurrentUserManager; +import com.ruoyi.cai.service.CaiAccountCashService; +import com.ruoyi.common.core.domain.R; +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.web.bind.annotation.*; + +@RestController +@RequestMapping("/api/wallet") +@Tag(name = "钱包操作相关的接口") +public class WalletController { + + @Autowired + private CurrentUserManager currentUserManager; + @Autowired + private CaiAccountCashService accountCashService; + + @GetMapping("/aliInfo") + @Operation(summary = "获取绑定支付宝信息") + public R aliInfo(){ + CaiAccountBankcard accountBankcard = currentUserManager.aliInfo(); + return R.ok(accountBankcard); + } + + @PostMapping("/save-or-update/ali") + @Operation(summary = "支付宝信息的新增和修改") + public R updateAli(@RequestBody AccountAliBankCardRes res){ + currentUserManager.saveOrUpdateAliInfo(res); + return R.ok(true); + } + + @PostMapping("/withdraw/ali") + @Operation(summary = "支付宝提现接口") + public R withdraw(@RequestBody WithdrawReq res){ + res.setUserId(LoginHelper.getUserId()); + accountCashService.withdraw(res); + return R.ok(true); + } + +}