From 34fb667a107111583f444706b2a67d64ff306de5 Mon Sep 17 00:00:00 2001 From: xiaoqiantx223 <491437285@qq.com> Date: Thu, 18 Jul 2024 17:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E9=80=80=E5=87=BA=20=E5=85=85=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- maku-framework/src/main/resources/auth.yml | 9 +++----- .../maku/controller/TBookCollectionController.java | 5 +++++ .../net/maku/maku/controller/TUserController.java | 19 ++++++++++++++-- .../java/net/maku/maku/entity/TUserEntity.java | 2 +- .../maku/maku/service/TBookCollectionService.java | 5 ++--- .../service/impl/TBookCollectionServiceImpl.java | 25 ++++++++-------------- maku-server/src/main/resources/application-dev.yml | 2 +- 7 files changed, 38 insertions(+), 29 deletions(-) diff --git a/maku-framework/src/main/resources/auth.yml b/maku-framework/src/main/resources/auth.yml index 0066943..5de7615 100644 --- a/maku-framework/src/main/resources/auth.yml +++ b/maku-framework/src/main/resources/auth.yml @@ -8,13 +8,10 @@ auth: - /swagger-ui.html - /swagger-ui/** - /doc.html + - / - /maku/t_user/login - /maku/t_user/updateUser - /maku/t_user/register - /maku/t_user/logout - - /user/login - - /maku/t_book/list/search - - /maku/t_book/{id} - - /user/login - - /maku/t_shopping_trolley/aaa - + - /maku/t_user/info + - /maku/t_user/recharge \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java b/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java index 3c53878..ab2404e 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TBookCollectionController.java @@ -29,6 +29,11 @@ import java.util.List; @AllArgsConstructor public class TBookCollectionController { private final TBookCollectionService tBookCollectionService; + @GetMapping("/book/buy") + @Operation(summary = "购买书籍") + public Result> getBookCollectionByUserId(@PathVariable Long id) { + return Result.ok(tBookCollectionService.getPhoneByUseId(id)); + } @GetMapping("page") @Operation(summary = "分页") diff --git a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java index 7bb8fef..fec5bec 100644 --- a/maku-server/src/main/java/net/maku/maku/controller/TUserController.java +++ b/maku-server/src/main/java/net/maku/maku/controller/TUserController.java @@ -11,9 +11,11 @@ import net.maku.framework.common.cache.RedisCache; import net.maku.framework.common.utils.PageResult; import net.maku.framework.common.utils.Result; import net.maku.maku.convert.TUserConvert; +import net.maku.maku.entity.TBookCollectionEntity; import net.maku.maku.entity.TUserEntity; import net.maku.maku.service.TUserService; import net.maku.maku.query.TUserQuery; +import net.maku.maku.vo.TBookCollectionVO; import net.maku.maku.vo.TUserVO; import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.ResponseEntity; @@ -26,6 +28,8 @@ import java.time.Duration; import java.util.List; import java.util.UUID; +import static java.util.Collections.list; + /** * * @@ -56,7 +60,7 @@ public class TUserController { @PostMapping("/login") @Operation(summary = "登录") - public Result login(@RequestBody TUserEntity entity){ + public Result login(@RequestBody TUserEntity entity){ TUserEntity entity1 = tUserService.login(entity); if(ObjectUtils.isNotNull(entity1)){ String token = UUID.randomUUID()+""; @@ -78,12 +82,23 @@ public class TUserController { @GetMapping("/info") @Operation(summary = "用户中心") - public Result findByUsername(HttpServletRequest request){ + public Result findByUsername(HttpServletRequest request){ String token = request.getHeader("token"); TUserEntity entity = (TUserEntity) redisCache.get(token); return Result.ok(entity); } + @GetMapping("/recharge") + @Operation(summary = "充值") + public Result recharge(HttpServletRequest request,@RequestParam(value = "balance",required =false) int balance){ + String token = request.getHeader("token"); + TUserEntity entity = (TUserEntity) redisCache.get(token);; + int money=entity.getBalance(); + entity.setBalance(money+balance); + tUserService.updateById(entity); + return Result.ok(); + } + @PostMapping("/logout") @Operation(summary = "退出登录") diff --git a/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java b/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java index 0344b43..3c16d6a 100644 --- a/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java +++ b/maku-server/src/main/java/net/maku/maku/entity/TUserEntity.java @@ -24,7 +24,7 @@ public class TUserEntity { private String avatar; - private BigDecimal balance; + private int balance; private Integer status; diff --git a/maku-server/src/main/java/net/maku/maku/service/TBookCollectionService.java b/maku-server/src/main/java/net/maku/maku/service/TBookCollectionService.java index 4e6ef9a..4632e15 100644 --- a/maku-server/src/main/java/net/maku/maku/service/TBookCollectionService.java +++ b/maku-server/src/main/java/net/maku/maku/service/TBookCollectionService.java @@ -6,8 +6,6 @@ import net.maku.maku.vo.TBookCollectionVO; import net.maku.maku.query.TBookCollectionQuery; import net.maku.maku.entity.TBookCollectionEntity; -import java.time.LocalDateTime; -import java.util.Date; import java.util.List; /** @@ -26,5 +24,6 @@ public interface TBookCollectionService extends BaseService idList); - void save(Integer userId, Integer bookId, Date currentTime); + List getPhoneByUseId(Long id); + } \ No newline at end of file diff --git a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java index 0d9d1b0..0ad306a 100644 --- a/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java +++ b/maku-server/src/main/java/net/maku/maku/service/impl/TBookCollectionServiceImpl.java @@ -4,21 +4,23 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.servlet.http.HttpServletRequest; import lombok.AllArgsConstructor; -import lombok.Data; import net.maku.framework.common.utils.PageResult; import net.maku.framework.mybatis.service.impl.BaseServiceImpl; import net.maku.maku.convert.TBookCollectionConvert; import net.maku.maku.entity.TBookCollectionEntity; +import net.maku.maku.entity.TBookEntity; +import net.maku.maku.entity.TUserEntity; import net.maku.maku.query.TBookCollectionQuery; +import net.maku.maku.service.TUserService; import net.maku.maku.vo.TBookCollectionVO; import net.maku.maku.dao.TBookCollectionDao; import net.maku.maku.service.TBookCollectionService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.time.LocalDateTime; -import java.util.Date; +import java.util.ArrayList; import java.util.List; /** @@ -31,6 +33,7 @@ import java.util.List; @AllArgsConstructor public class TBookCollectionServiceImpl extends BaseServiceImpl implements TBookCollectionService { + @Override public PageResult page(TBookCollectionQuery query) { IPage page = baseMapper.selectPage(getPage(query), getWrapper(query)); @@ -66,19 +69,9 @@ public class TBookCollectionServiceImpl extends BaseServiceImpl getPhoneByUseId(Long id) { + return List.of(); } + } \ No newline at end of file diff --git a/maku-server/src/main/resources/application-dev.yml b/maku-server/src/main/resources/application-dev.yml index fa14e1b..845570e 100644 --- a/maku-server/src/main/resources/application-dev.yml +++ b/maku-server/src/main/resources/application-dev.yml @@ -4,7 +4,7 @@ spring: database: 0 host: localhost port: 6379 -# password: 123456 + password: 123456 #timeout: 6000ms # 连接超时时长（毫秒） datasource: dynamic: