From 279eca678810cbb31b57bc3646f5eab6a290d8a7 Mon Sep 17 00:00:00 2001 From: Cauchy Date: Wed, 11 Oct 2023 17:57:51 +0800 Subject: [PATCH 1/3] rename field --- .../book/controller/UserRecordController.java | 4 +-- .../modules/book/entity/UserRecordEntity.java | 34 ++++++++----------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/UserRecordController.java b/src/main/java/com/peanut/modules/book/controller/UserRecordController.java index 053e8814..d5813454 100644 --- a/src/main/java/com/peanut/modules/book/controller/UserRecordController.java +++ b/src/main/java/com/peanut/modules/book/controller/UserRecordController.java @@ -1,7 +1,6 @@ package com.peanut.modules.book.controller; import cn.com.marsoft.tool.ToolObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.google.gson.Gson; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.R; import com.peanut.modules.book.entity.*; @@ -9,7 +8,6 @@ import com.peanut.modules.book.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; -import java.util.stream.Collectors; import static com.peanut.common.utils.R.error; @RestController @@ -233,7 +231,7 @@ public class UserRecordController { recordEntity.setImages(imageStr); } recordEntity.setDelflag(0); - recordEntity.setOrderdid(orderId1); + recordEntity.setOrderdId(orderId1); userRecordService.saveOrUpdate(recordEntity); diff --git a/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java b/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java index 3a207679..4a6723ad 100644 --- a/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java @@ -4,13 +4,11 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.peanut.modules.book.to.UserRecordDto; import lombok.Data; + import javax.persistence.Temporal; import javax.persistence.TemporalType; -import java.util.ArrayList; import java.util.Date; -import java.util.List; @Data @TableName("user_record") @@ -26,39 +24,37 @@ public class UserRecordEntity { // 类型（商品评价01,听书评价02，观看电子书评价03） @TableField("type") - private String type ; + private String type; // 内容 @TableField("content") - private Object content ; + private Object content; //快递单号 @TableField("orderCode") - private String orderCode; + private String orderCode; @TableField("proudict_id") - private Integer proudictId; + private Integer proudictId; //订单号 @TableField("orderSn") private String orderSn; // 关联客户 @TableField("userid") - private Integer userid ; + private Integer userid; //逻辑删除：未删除0 -1删除 @TableField("delFlag") @TableLogic - private Integer delflag; + private Integer delflag; //关联图书id @TableField("bookid") - private Integer bookid ; - //图片url -// @TableField("images") -// private String[] images; + private Integer bookid; + @TableField("images") private Object images; //星级 1=一星，5=五星 @TableField("starLevel") - private String starLevel; + private String starLevel; /** * 表情存储 @@ -67,18 +63,18 @@ public class UserRecordEntity { private Object emoji; @TableField("name") - private Object name; + private Object name; @TableField("tag") - private Object tag; + private Object tag; @TableField("orderdid") - private Integer orderdid; + private Integer orderdId; @TableField(exist = false) - private Object avatar; + private Object avatar; @TableField(exist = false) - private Object nickname; + private Object nickname; } From 6bf8fd586c0e7b07d5370c0651b9b56524086df2 Mon Sep 17 00:00:00 2001 From: Cauchy Date: Thu, 12 Oct 2023 13:33:54 +0800 Subject: [PATCH 2/3] temp --- .../com/peanut/config/MyRedissonConfig.java | 9 +++- .../com/peanut/config/MybatisPlusConfig.java | 5 +- .../controller/BookClockForumController.java | 50 +++++++++++++++---- .../BookClockinCommentController.java | 4 +- .../controller/BookClockinController.java | 2 +- .../book/controller/BookTaskController.java | 2 +- .../controller/UserBookClockController.java | 20 ++++++-- .../book/entity/BookClockInChatEntity.java | 11 ++++ ...inService.java => BookClockInService.java} | 4 +- ...eImpl.java => BookClockInServiceImpl.java} | 10 ++-- .../modules/book/vo/ClockInCommentVo.java | 41 +++++++++++++++ src/main/resources/application-dev.yml | 9 ++-- src/main/resources/application-prod.yml | 5 +- 13 files changed, 138 insertions(+), 34 deletions(-) rename src/main/java/com/peanut/modules/book/service/{BookClockinService.java => BookClockInService.java} (84%) rename src/main/java/com/peanut/modules/book/service/impl/{BookClockinServiceImpl.java => BookClockInServiceImpl.java} (79%) create mode 100644 src/main/java/com/peanut/modules/book/vo/ClockInCommentVo.java diff --git a/src/main/java/com/peanut/config/MyRedissonConfig.java b/src/main/java/com/peanut/config/MyRedissonConfig.java index c1942f86..0a72f46a 100644 --- a/src/main/java/com/peanut/config/MyRedissonConfig.java +++ b/src/main/java/com/peanut/config/MyRedissonConfig.java @@ -3,16 +3,23 @@ package com.peanut.config; import org.redisson.Redisson; import org.redisson.api.RedissonClient; import org.redisson.config.Config; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class MyRedissonConfig { + @Value("${redisAddress}") + private String redisAddress; + + @Value("${redisPassword}") + private String redisPassword; + @Bean public RedissonClient redissonClient() { Config config = new Config(); - config.useSingleServer().setAddress("redis://59.110.212.44:6379").setPassword("Jgll2015"); + config.useSingleServer().setAddress(redisAddress).setPassword(redisPassword); RedissonClient redissonClient = Redisson.create(config); return redissonClient; } diff --git a/src/main/java/com/peanut/config/MybatisPlusConfig.java b/src/main/java/com/peanut/config/MybatisPlusConfig.java index 143baa69..85741f7e 100644 --- a/src/main/java/com/peanut/config/MybatisPlusConfig.java +++ b/src/main/java/com/peanut/config/MybatisPlusConfig.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2016-2019 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -27,5 +27,4 @@ public class MybatisPlusConfig { public PaginationInterceptor paginationInterceptor() { return new PaginationInterceptor(); } - } diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java b/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java index c8bea1c7..7cb769b8 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java @@ -1,14 +1,21 @@ package com.peanut.modules.book.controller; +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.peanut.common.utils.R; +import com.peanut.modules.app.service.UserService; +import com.peanut.modules.book.entity.BookClockEntryEntity; import com.peanut.modules.book.entity.BookClockInChatEntity; -import com.peanut.modules.book.entity.BookClockInEntity; +import com.peanut.modules.book.entity.UserEntity; import com.peanut.modules.book.service.BookClockEntryChatService; -import com.peanut.modules.book.service.BookClockinService; +import com.peanut.modules.book.service.BookClockEntryService; +import com.peanut.modules.book.vo.ClockInCommentVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -18,14 +25,18 @@ import java.util.Map; * @Author: Cauchy * @CreateTime: 2023/10/11 */ -@RestController("/book/clockForum") +@RestController +@RequestMapping("/book/clockInForum") public class BookClockForumController { @Autowired private BookClockEntryChatService bookClockEntryChatService; @Autowired - private BookClockinService bookClockinService; + private BookClockEntryService bookClockEntryService; + + @Autowired + private UserService userService; /** * 获取论坛内容 @@ -37,10 +48,10 @@ public class BookClockForumController { @RequestMapping(path = "/getPostingInfo", method = RequestMethod.GET) public R getPostingInfo(@RequestParam("bookId") Integer bookId, @RequestParam("day") Integer day) { - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("book_id", bookId); queryWrapper.eq("day", day); - BookClockInEntity entity = bookClockinService.getOne(queryWrapper); + BookClockEntryEntity entity = bookClockEntryService.getOne(queryWrapper); Map result = new HashMap<>(); result.put("result", entity); return R.ok(result); @@ -53,11 +64,27 @@ public class BookClockForumController { * @return */ @RequestMapping(path = "/getChatList", method = RequestMethod.GET) - public R getChatList(@RequestParam("entryId") Integer entryId) { + public R getChatList(@RequestParam("entryId") Integer entryId, + @RequestParam(value = "userId", required = false) Integer userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("entry_id", entryId); - queryWrapper.orderByAsc("f_id", "create_time"); - List resultList = bookClockEntryChatService.list(queryWrapper); + if (userId != null) { + queryWrapper.eq("user_id", userId); + } + queryWrapper.orderByAsc("fid", "create_time"); + List resultList = new ArrayList<>(); + List chatEntityList = bookClockEntryChatService.list(queryWrapper); + for (BookClockInChatEntity entity : chatEntityList) { + List imageList = JSON.parseObject(entity.getImages(), new TypeReference>() { + }); + entity.setImageList(imageList); + ClockInCommentVo vo = new ClockInCommentVo(); + BeanUtil.copyProperties(entity, vo); + UserEntity user = userService.getById(entity.getUserId()); + vo.setNickName(user.getNickname()); + vo.setAvatar(user.getAvatar()); + resultList.add(vo); + } Map result = new HashMap<>(); result.put("chatList", resultList); return R.ok(result); @@ -69,8 +96,11 @@ public class BookClockForumController { * @param chat * @return */ - @RequestMapping(path = "/addChat", method = RequestMethod.POST) + @PostMapping(path = "/addChat") public R addChat(@RequestBody BookClockInChatEntity chat) { + List imageList = chat.getImageList(); + String images = JSON.toJSON(imageList).toString(); + chat.setImages(images); bookClockEntryChatService.save(chat); return R.ok(); } diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java b/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java index 7cd8cf4c..ca8c33ee 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookClockinCommentController.java @@ -8,7 +8,7 @@ import com.peanut.modules.book.entity.BookClockInEntity; import com.peanut.modules.book.entity.BookClockinPunchEntity; import com.peanut.modules.book.service.BookClockinCommentService; import com.peanut.modules.book.service.BookClockinPunchService; -import com.peanut.modules.book.service.BookClockinService; +import com.peanut.modules.book.service.BookClockInService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Arrays; @@ -28,7 +28,7 @@ public class BookClockinCommentController { @Autowired private BookClockinPunchService bookClockinPunchService; @Autowired - private BookClockinService bookClockinService; + private BookClockInService bookClockinService; /** * 列表 倒叙 diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockinController.java b/src/main/java/com/peanut/modules/book/controller/BookClockinController.java index d30abd72..bb2953c9 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookClockinController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookClockinController.java @@ -15,7 +15,7 @@ import java.util.*; @RequestMapping("book/clockin") public class BookClockinController { @Autowired - private BookClockinService bookClockinService; + private BookClockInService bookClockinService; @Autowired private BookTaskService bookTaskService; @Autowired diff --git a/src/main/java/com/peanut/modules/book/controller/BookTaskController.java b/src/main/java/com/peanut/modules/book/controller/BookTaskController.java index 4e4666c8..ef9c9167 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookTaskController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookTaskController.java @@ -26,7 +26,7 @@ public class BookTaskController { @Autowired private BookService bookService; @Autowired - private BookClockinService bookClockinService; + private BookClockInService bookClockinService; @Autowired private MyUserService myUserService; @Autowired diff --git a/src/main/java/com/peanut/modules/book/controller/UserBookClockController.java b/src/main/java/com/peanut/modules/book/controller/UserBookClockController.java index 51a9eab0..9ab0528c 100644 --- a/src/main/java/com/peanut/modules/book/controller/UserBookClockController.java +++ b/src/main/java/com/peanut/modules/book/controller/UserBookClockController.java @@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.*; @@ -22,6 +23,7 @@ import java.util.*; * @CreateTime: 2023/10/11 */ @Slf4j +@RestController @RequestMapping("/book/userClockIn") public class UserBookClockController { @Autowired @@ -41,17 +43,23 @@ public class UserBookClockController { queryWrapper.eq("book_id", bookId); queryWrapper.eq("user_id", userId); UserBookClockEntity userBookClock = userBookClockService.getOne(queryWrapper); + Map result = new HashMap<>(); if (userBookClock == null) { - return R.error("未获取到该用户的打卡信息"); + result.put("beginDate", new Date()); + result.put("currentDay", 1); + result.put("clockInDayList", new ArrayList<>()); + return R.ok(result); } // 1. 获取打卡初始日期 Date beginDate = userBookClock.getBeginDate(); + Date today = new Date(); + long between = DateUtil.between(beginDate, today, DateUnit.DAY); // 2. 获取打卡天数列表 String clocksStr = userBookClock.getClocks(); List clockInDayList = JSON.parseObject(clocksStr, new TypeReference>() { }); - Map result = new HashMap<>(); result.put("beginDate", beginDate); + result.put("currentDay", between + 1); result.put("clockInDayList", clockInDayList); return R.ok(result); } @@ -64,7 +72,8 @@ public class UserBookClockController { * @return */ @RequestMapping(path = "/clockIn", method = RequestMethod.GET) - public R clockIn(@RequestParam("bookId") Integer bookId, @RequestParam("userId") Integer userId) { + public R clockIn(@RequestParam("bookId") Integer bookId, + @RequestParam("userId") Integer userId) { // 查询是否有该用户打卡记录，如果没有，说明是第一天打卡 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("book_id", bookId); @@ -90,7 +99,10 @@ public class UserBookClockController { Date beginDate = userBookClock.getBeginDate(); Date today = new Date(); long between = DateUtil.between(beginDate, today, DateUnit.DAY); - clockInDaysList.add((int) between); + if (clockInDaysList.contains((int) between + 1)) { + return R.error("今天打卡已完成,不可重复打卡!"); + } + clockInDaysList.add((int) (between + 1)); String clockInDaysListStr = JSON.toJSON(clockInDaysList).toString(); userBookClock.setClocks(clockInDaysListStr); userBookClockService.updateById(userBookClock); diff --git a/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java b/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java index 020ea5d8..4347cca0 100644 --- a/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java @@ -1,13 +1,17 @@ package com.peanut.modules.book.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; @Data +@TableName("book_clock_entry_chat") public class BookClockInChatEntity implements Serializable { private static final long serialVersionUID = 1L; @@ -24,8 +28,15 @@ public class BookClockInChatEntity implements Serializable { private String content; + private Integer pChatId; + private Date createTime; @TableLogic private Integer delFlag; + + @TableField(exist = false) + private List imageList; + + private String images; } diff --git a/src/main/java/com/peanut/modules/book/service/BookClockinService.java b/src/main/java/com/peanut/modules/book/service/BookClockInService.java similarity index 84% rename from src/main/java/com/peanut/modules/book/service/BookClockinService.java rename to src/main/java/com/peanut/modules/book/service/BookClockInService.java index 051b092f..688d8887 100644 --- a/src/main/java/com/peanut/modules/book/service/BookClockinService.java +++ b/src/main/java/com/peanut/modules/book/service/BookClockInService.java @@ -6,10 +6,8 @@ import com.peanut.modules.book.entity.BookClockInEntity; import java.util.Map; -public interface BookClockinService extends IService { +public interface BookClockInService extends IService { PageUtils queryPage(Map params); - - PageUtils queryPagemylist(Map params); } diff --git a/src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BookClockInServiceImpl.java similarity index 79% rename from src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java rename to src/main/java/com/peanut/modules/book/service/impl/BookClockInServiceImpl.java index b28426d3..b523cf85 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BookClockinServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BookClockInServiceImpl.java @@ -7,24 +7,24 @@ import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.Query; import com.peanut.modules.book.dao.BookClockinDao; import com.peanut.modules.book.entity.BookClockInEntity; -import com.peanut.modules.book.service.BookClockinService; +import com.peanut.modules.book.service.BookClockInService; import org.springframework.stereotype.Service; import java.util.Map; @Service -public class BookClockinServiceImpl extends ServiceImpl implements BookClockinService { +public class BookClockInServiceImpl extends ServiceImpl implements BookClockInService { @Override public PageUtils queryPage(Map params) { - Object book =params.get("bookid"); + Object book = params.get("bookid"); Object taskid = params.get("taskid"); IPage page = this.page( new Query().getPage(params), new QueryWrapper() - .eq("book_id",book) - .eq("task_id",taskid) + .eq("book_id", book) + .eq("task_id", taskid) .orderByDesc("create_time") ); diff --git a/src/main/java/com/peanut/modules/book/vo/ClockInCommentVo.java b/src/main/java/com/peanut/modules/book/vo/ClockInCommentVo.java new file mode 100644 index 00000000..489a90e2 --- /dev/null +++ b/src/main/java/com/peanut/modules/book/vo/ClockInCommentVo.java @@ -0,0 +1,41 @@ +package com.peanut.modules.book.vo; + +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Description: 用户评论信息 Vo + * @Author: Cauchy + * @CreateTime: 2023/10/12 + */ +@Data +public class ClockInCommentVo { + private Integer id; + + private Integer entryId; + + private Integer userId; + + private Integer fid; + + private Integer pUserId; + + private String content; + + private Integer pChatId; + + private Date createTime; + + private Integer delFlag; + + private List imageList; + + private String images; + + private String nickName; + + private String avatar; + +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 601b66fe..57dd3908 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,7 +3,7 @@ spring: redis: open: false # 是否开启redis缓存 true开启 false关闭 database: 0 - host: 39.106.36.183 + host: 59.110.212.44 port: 6379 password: Jgll2015 # 密码（默认为空） timeout: 6000000ms # 连接超时时长（毫秒） @@ -50,7 +50,7 @@ spring: initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci rabbitmq: - host: 39.106.36.183 + host: 59.110.212.44 port: 5672 username: admin password: 751019 @@ -70,4 +70,7 @@ aliyun: templateCode: SMS_248840040 server: - port: 9200 \ No newline at end of file + port: 9200 + +redisAddress: redis://59.110.212.44:6379 +redisPassword: Jgll2015 \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 28030565..d884117c 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -69,4 +69,7 @@ aliyun: templateCode: SMS_248840040 server: - port: 9100 \ No newline at end of file + port: 9100 + +redisAddress: redis://59.110.212.44:6379 +redisPassword: Jgll2015 \ No newline at end of file From 5c2cc8529b622b3ed1217791285caac718778932 Mon Sep 17 00:00:00 2001 From: Cauchy Date: Thu, 12 Oct 2023 16:38:30 +0800 Subject: [PATCH 3/3] bug fix --- .../controller/BookClockForumController.java | 27 +++++- .../controller/ShopProductController.java | 14 +-- .../book/controller/UserRecordController.java | 95 +++++++++---------- .../book/entity/BookClockInChatEntity.java | 6 +- .../modules/book/entity/OrderCartEntity.java | 2 +- .../book/entity/ShopProductToLabelEntity.java | 6 +- .../modules/book/entity/UserRecordEntity.java | 4 +- .../book/service/UserRecordService.java | 5 +- .../impl/ShopProductBookServiceImpl.java | 6 +- .../impl/ShopProductToLabelServiceImpl.java | 4 +- .../service/impl/UserRecordServiceImpl.java | 17 ++-- .../modules/book/vo/ClockInCommentVo.java | 6 ++ .../peanut/modules/book/vo/ShopCartVo.java | 3 +- .../controller/WeChatPayController.java | 4 +- src/main/resources/application-dev.yml | 2 +- .../resources/mapper/book/OrderCartDao.xml | 2 +- .../resources/mapper/book/UserRecordDao.xml | 2 +- 17 files changed, 106 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java b/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java index 7cb769b8..c01e6340 100644 --- a/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java +++ b/src/main/java/com/peanut/modules/book/controller/BookClockForumController.java @@ -47,7 +47,7 @@ public class BookClockForumController { */ @RequestMapping(path = "/getPostingInfo", method = RequestMethod.GET) public R getPostingInfo(@RequestParam("bookId") Integer bookId, - @RequestParam("day") Integer day) { + @RequestParam(value = "day") Integer day) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("book_id", bookId); queryWrapper.eq("day", day); @@ -68,6 +68,7 @@ public class BookClockForumController { @RequestParam(value = "userId", required = false) Integer userId) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("entry_id", entryId); + queryWrapper.eq("fid", 0); if (userId != null) { queryWrapper.eq("user_id", userId); } @@ -83,6 +84,22 @@ public class BookClockForumController { UserEntity user = userService.getById(entity.getUserId()); vo.setNickName(user.getNickname()); vo.setAvatar(user.getAvatar()); + QueryWrapper subQueryWrapper = new QueryWrapper<>(); + subQueryWrapper.eq("fid", entity.getId()); + List subClockInChatList = bookClockEntryChatService.list(subQueryWrapper); + List subCommentList = new ArrayList<>(); + for (BookClockInChatEntity subChat : subClockInChatList) { + ClockInCommentVo subVo = new ClockInCommentVo(); + BeanUtil.copyProperties(subChat, subVo); + UserEntity subChatUser = userService.getById(subChat.getUserId()); + UserEntity pUser = userService.getById(subChat.getPuserId()); + subVo.setPuserNickName(pUser.getNickname()); + subVo.setPuserAvatar(pUser.getAvatar()); + subVo.setAvatar(subChatUser.getAvatar()); + subVo.setNickName(subChatUser.getNickname()); + subCommentList.add(subVo); + } + vo.setSubCommentList(subCommentList); resultList.add(vo); } Map result = new HashMap<>(); @@ -96,11 +113,13 @@ public class BookClockForumController { * @param chat * @return */ - @PostMapping(path = "/addChat") + @RequestMapping(path = "/addChat", method = RequestMethod.POST) public R addChat(@RequestBody BookClockInChatEntity chat) { List imageList = chat.getImageList(); - String images = JSON.toJSON(imageList).toString(); - chat.setImages(images); + if (imageList != null) { + String images = JSON.toJSON(imageList).toString(); + chat.setImages(images); + } bookClockEntryChatService.save(chat); return R.ok(); } diff --git a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java index ff7a3691..c7629ca7 100644 --- a/src/main/java/com/peanut/modules/book/controller/ShopProductController.java +++ b/src/main/java/com/peanut/modules/book/controller/ShopProductController.java @@ -295,10 +295,10 @@ public class ShopProductController { */ @RequestMapping("/infobook/{productId}") public R infobook(@PathVariable("productId") Integer productId) { - List proudict = shopProductBookService.getBaseMapper().selectList(new QueryWrapper() + List product = shopProductBookService.getBaseMapper().selectList(new QueryWrapper() .eq("product_id", productId)); List list = new ArrayList<>(); - for (ShopProductBookEntity shopProductBookEntity : proudict) { + for (ShopProductBookEntity shopProductBookEntity : product) { Integer bookId = shopProductBookEntity.getBookId(); List bookIds = shopProductBookService.getBaseMapper().selectList(new QueryWrapper() @@ -336,11 +336,11 @@ public class ShopProductController { shopProductService.save(shopProduct); ShopProductBookEntity shopProductBookEntity = new ShopProductBookEntity(); for (String s : shopProduct.getBookids()) { - String bookidlist = s; - if (bookidlist != null) { - Integer proudict = shopProduct.getProductId(); - shopProductBookEntity.setProductId(proudict); - shopProductBookEntity.setBookId(Integer.valueOf(bookidlist)); + String bookIdList = s; + if (bookIdList != null) { + Integer product = shopProduct.getProductId(); + shopProductBookEntity.setProductId(product); + shopProductBookEntity.setBookId(Integer.valueOf(bookIdList)); shopProductBookService.save(shopProductBookEntity); } } diff --git a/src/main/java/com/peanut/modules/book/controller/UserRecordController.java b/src/main/java/com/peanut/modules/book/controller/UserRecordController.java index d5813454..e46ec249 100644 --- a/src/main/java/com/peanut/modules/book/controller/UserRecordController.java +++ b/src/main/java/com/peanut/modules/book/controller/UserRecordController.java @@ -1,4 +1,5 @@ package com.peanut.modules.book.controller; + import cn.com.marsoft.tool.ToolObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.peanut.common.utils.PageUtils; @@ -7,9 +8,11 @@ import com.peanut.modules.book.entity.*; import com.peanut.modules.book.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; + import java.util.*; import static com.peanut.common.utils.R.error; + @RestController @RequestMapping("buy/record") public class UserRecordController { @@ -29,7 +32,7 @@ public class UserRecordController { * 列表 */ @RequestMapping("/list") - public R list(@RequestParam Map params ){ + public R list(@RequestParam Map params) { PageUtils page = userRecordService.queryPage(params); return R.ok().put("page", page); @@ -37,22 +40,21 @@ public class UserRecordController { } /** - * 查看我的评价 + * 查看我的评价 */ @RequestMapping("/Allevaluations") - public R Allevaluations(@RequestBody UserRecordEntity userRecordEntity){ + public R Allevaluations(@RequestBody UserRecordEntity userRecordEntity) { List userid = userRecordService.getBaseMapper().selectList(new QueryWrapper().eq("userid", userRecordEntity.getUserid()).orderByDesc("create_date")); - return R.ok().put("Allevaluations",userid); + return R.ok().put("Allevaluations", userid); } /** - * 查看全部评价 + * 查看全部评价 */ @RequestMapping("/All") public R All(@RequestBody UserRecordEntity userRecordEntity) { - List list = new ArrayList<>(); //此处bookid实际传的是商品id List bookid = userRecordService.getBaseMapper().selectList(new QueryWrapper().eq("bookid", userRecordEntity.getBookid()).orderByDesc("create_date")); @@ -99,21 +101,19 @@ public class UserRecordController { list.add(map); - } return R.ok().put("list", list); } - return R.error("该商品暂无评论"); + return R.error("该商品暂无评论"); } - /** * 信息 */ @RequestMapping("/info/{id}") - public R info(@PathVariable("id") Integer id){ + public R info(@PathVariable("id") Integer id) { UserRecordEntity userRecordEntity = userRecordService.getById(id); return R.ok().put("bookChapterContent", userRecordEntity); } @@ -122,7 +122,7 @@ public class UserRecordController { * 保存 */ @RequestMapping("/save") - public R save(@RequestBody UserRecordEntity userRecordEntity){ + public R save(@RequestBody UserRecordEntity userRecordEntity) { userRecordService.save(userRecordEntity); return R.ok(); } @@ -131,7 +131,7 @@ public class UserRecordController { * 修改 */ @RequestMapping("/update") - public R update(@RequestBody UserRecordEntity userRecordEntity){ + public R update(@RequestBody UserRecordEntity userRecordEntity) { userRecordService.updateById(userRecordEntity); return R.ok(); } @@ -140,7 +140,7 @@ public class UserRecordController { * 删除 */ @RequestMapping("/delete") - public R delete(@RequestBody Integer[] ids){ + public R delete(@RequestBody Integer[] ids) { userRecordService.removeByIds(Arrays.asList(ids)); userRecordService.getBaseMapper().deleteBatchIds(Arrays.asList(ids)); return R.ok(); @@ -148,38 +148,34 @@ public class UserRecordController { /* - * test - * */ + * test + * */ @RequestMapping("/commodityComment") - public R commodityComment(String userid, String orderSn, String starLevel, String comment){ - userRecordService.commodityComment(userid, orderSn, starLevel, comment); - return R.ok(); -} - - - + public R commodityComment(String userid, String orderSn, String starLevel, String comment) { + userRecordService.commodityComment(userid, orderSn, starLevel, comment); + return R.ok(); + } /* - * 生成评论 - * */ + * 生成评论 + * */ @RequestMapping("/comment") - public Object commodityComments( Integer userid, String orderSn, Integer bookid, String comment) { + public Object commodityComments(Integer userid, String orderSn, Integer bookid, String comment) { - BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper() - .eq("order_sn",orderSn).last("LIMIT 1").eq("order_status","3") - //状态3为已收货 + BuyOrderEntity buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper() + .eq("order_sn", orderSn).last("LIMIT 1").eq("order_status", "3") + //状态3为已收货 // .eq("order_status","3") ); UserRecordEntity userRecordEntity = new UserRecordEntity(); - if (!ToolObject.isNullOrEmpty(buyOrderEntity)) - { + if (!ToolObject.isNullOrEmpty(buyOrderEntity)) { return error("您已评价过了，请勿重复评论"); // - }else { + } else { userRecordEntity.setId(buyOrderEntity.getOrderId()); userRecordEntity.setContent(comment); //商品评价 @@ -187,38 +183,35 @@ public class UserRecordController { userRecordEntity.setUserid(userid); userRecordEntity.setOrderSn(orderSn); userRecordEntity.setDelflag(0); - userRecordEntity.setProudictId(bookid); + userRecordEntity.setProductId(bookid); userRecordService.saveOrUpdate(userRecordEntity); - return R.ok("成功").put("userRecordEntity",userRecordEntity); + return R.ok("成功").put("userRecordEntity", userRecordEntity); } } - /** - * * @param recordEntity * @return 生成评论（上传图片，星级评价 - * */ @RequestMapping("/UserRecordcomment") - public R commodity(@RequestBody UserRecordEntity recordEntity ) { + public R commodity(@RequestBody UserRecordEntity recordEntity) { //todo 已收货限制字段，只可评价一次 - BuyOrderEntity buyOrderEntity =buyOrderService.getBaseMapper().selectOne(new QueryWrapper() - .eq("order_sn",recordEntity.getOrderSn()) + BuyOrderEntity buyOrderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper() + .eq("order_sn", recordEntity.getOrderSn()) ); Integer orderId = buyOrderEntity.getOrderId(); - BuyOrderDetailEntity detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper().eq("Order_id", orderId).eq("product_id",recordEntity.getBookid())); + BuyOrderDetailEntity detailEntity = buyOrderDetailService.getBaseMapper().selectOne(new QueryWrapper().eq("Order_id", orderId).eq("product_id", recordEntity.getBookid())); Integer orderId1 = detailEntity.getOrderId(); - UserRecordEntity userRecordEntity = userRecordService.getBaseMapper().selectOne(new QueryWrapper().eq("orderSn", recordEntity.getOrderSn()).eq("userid", recordEntity.getUserid()).eq("orderdid",orderId1).last("LIMIT 1")); + UserRecordEntity userRecordEntity = userRecordService.getBaseMapper().selectOne(new QueryWrapper().eq("orderSn", recordEntity.getOrderSn()).eq("userid", recordEntity.getUserid()).eq("orderdid", orderId1).last("LIMIT 1")); if (userRecordEntity != null) { - return R.error("您已评价过"); + return R.error("您已评价过"); } - if (recordEntity.getImages()!=null) { + if (recordEntity.getImages() != null) { List> imageList = (ArrayList>) recordEntity.getImages(); String imageStr = ""; for (Map m : imageList) { @@ -227,19 +220,17 @@ public class UserRecordController { } - recordEntity.setImages(imageStr); } - recordEntity.setDelflag(0); - recordEntity.setOrderdId(orderId1); - userRecordService.saveOrUpdate(recordEntity); + recordEntity.setDelflag(0); + recordEntity.setOrderdId(orderId1); + userRecordService.saveOrUpdate(recordEntity); - detailEntity.setRecordId(1); - buyOrderDetailService.saveOrUpdate(detailEntity); + detailEntity.setRecordId(1); + buyOrderDetailService.saveOrUpdate(detailEntity); - - return R.ok("成功").put("userRecordEntity",recordEntity); - } + return R.ok("成功").put("userRecordEntity", recordEntity); + } } diff --git a/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java b/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java index 4347cca0..3c9d6e24 100644 --- a/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/BookClockInChatEntity.java @@ -24,11 +24,13 @@ public class BookClockInChatEntity implements Serializable { //子对话开启的层数 private Integer fid; //回复于某人id - private Integer pUserId; + @TableField("p_user_id") + private Integer puserId; private String content; - private Integer pChatId; + @TableField("p_chat_id") + private Integer pchatId; private Date createTime; diff --git a/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java b/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java index 326527e7..203e0ae6 100644 --- a/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/OrderCartEntity.java @@ -35,7 +35,7 @@ public class OrderCartEntity implements Serializable { /** * 套装参数 */ - private Integer proudictBook; + private Integer productBook; /** * 商品数量 */ diff --git a/src/main/java/com/peanut/modules/book/entity/ShopProductToLabelEntity.java b/src/main/java/com/peanut/modules/book/entity/ShopProductToLabelEntity.java index b3f42276..02b416e2 100644 --- a/src/main/java/com/peanut/modules/book/entity/ShopProductToLabelEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/ShopProductToLabelEntity.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import java.util.ArrayList; -import java.util.Date; import java.util.List; @Data @@ -24,13 +22,13 @@ public class ShopProductToLabelEntity { @TableField("del_flag") @TableLogic - private Integer delFlag; + private Integer delFlag; /** * 不存入数据库，返回商品详情 */ @TableField(exist = false) - private List shopproudicts; + private List shopProducts; @TableField(exist = false) private List shopp; diff --git a/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java b/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java index 4a6723ad..484fba0b 100644 --- a/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java +++ b/src/main/java/com/peanut/modules/book/entity/UserRecordEntity.java @@ -33,8 +33,8 @@ public class UserRecordEntity { @TableField("orderCode") private String orderCode; - @TableField("proudict_id") - private Integer proudictId; + @TableField("product_id") + private Integer productId; //订单号 @TableField("orderSn") private String orderSn; diff --git a/src/main/java/com/peanut/modules/book/service/UserRecordService.java b/src/main/java/com/peanut/modules/book/service/UserRecordService.java index f549992f..bfc0de97 100644 --- a/src/main/java/com/peanut/modules/book/service/UserRecordService.java +++ b/src/main/java/com/peanut/modules/book/service/UserRecordService.java @@ -2,19 +2,16 @@ package com.peanut.modules.book.service; import com.baomidou.mybatisplus.extension.service.IService; import com.peanut.common.utils.PageUtils; -import com.peanut.modules.book.entity.BuyOrderEntity; import com.peanut.modules.book.entity.UserRecordEntity; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.multipart.MultipartFile; -import java.util.List; import java.util.Map; public interface UserRecordService extends IService { //todo 传参参数 用户id 购买订单id 星级评价 内容 - public Object commodityComment(String userid, String orderSn, String starLevel, String comment); + void commodityComment(String userid, String orderSn, String starLevel, String comment); PageUtils queryPage(Map params); diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookServiceImpl.java index 68a75c2c..75e6acc9 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductBookServiceImpl.java @@ -79,7 +79,7 @@ public class ShopProductBookServiceImpl extends ServiceImpl getBookIdsByProductId(Integer productId) { - List spbs = this.list(new QueryWrapper().eq("del_flag", 0).eq("proudict_id", productId)); + List spbs = this.list(new QueryWrapper().eq("del_flag", 0).eq("product_id", productId)); List ids = new ArrayList(); for (ShopProductBookEntity s : spbs) { ids.add(s.getBookId()); @@ -93,9 +93,9 @@ public class ShopProductBookServiceImpl extends ServiceImpl shopProudictBookEntities = this.getBaseMapper().selectList(wrapper); + List shopProductBookEntities = this.getBaseMapper().selectList(wrapper); List ids = new ArrayList(); - for (ShopProductBookEntity s : shopProudictBookEntities) { + for (ShopProductBookEntity s : shopProductBookEntities) { ids.add(s.getProductId()); } if (ids.size() == 0) { diff --git a/src/main/java/com/peanut/modules/book/service/impl/ShopProductToLabelServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/ShopProductToLabelServiceImpl.java index 7e49f459..afd2941f 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/ShopProductToLabelServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/ShopProductToLabelServiceImpl.java @@ -3,7 +3,6 @@ package com.peanut.modules.book.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.yulichang.base.MPJBaseServiceImpl; import com.peanut.common.utils.ExcludeEmptyQueryWrapper; import com.peanut.common.utils.PageUtils; import com.peanut.common.utils.Query; @@ -16,7 +15,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -52,7 +50,7 @@ public class ShopProductToLabelServiceImpl extends ServiceImpl implements UserRecordService { +public class UserRecordServiceImpl extends ServiceImpl implements UserRecordService { @Autowired private MyUserService myUserService; @Override - public Object commodityComment(String userid, String orderSn, String starLevel, String comment) { + public void commodityComment(String userid, String orderSn, String starLevel, String comment) { - - return R.ok("成功"); + R.ok("成功"); } @Override public PageUtils queryPage(Map params) { - String proudictid = (String) params.get("proudictId"); + String productId = (String) params.get("proudictId"); IPage page = page( new Query().getPage(params), new QueryWrapper() //订单号，开始时间 - .eq("bookid", proudictid).orderByDesc("create_date") + .eq("bookid", productId).orderByDesc("create_date") // .eq("") ); @@ -61,6 +59,7 @@ public class UserRecordServiceImpl extends ServiceImpl subCommentList; + } diff --git a/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java b/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java index 831cd688..68de0154 100644 --- a/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java +++ b/src/main/java/com/peanut/modules/book/vo/ShopCartVo.java @@ -1,7 +1,6 @@ package com.peanut.modules.book.vo; - import lombok.Data; import java.math.BigDecimal; @@ -36,7 +35,7 @@ public class ShopCartVo { /** * 商品活动单价 */ - private Integer proudictBook; + private Integer productBook; private String image; private String productName; diff --git a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java index 4daf6d9d..21c23283 100644 --- a/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java +++ b/src/main/java/com/peanut/modules/pay/weChatPay/controller/WeChatPayController.java @@ -53,7 +53,7 @@ public class WeChatPayController { private TransactionDetailsService transactionDetailsService; @Autowired - private ShopProductBookService shopProudictBookService; + private ShopProductBookService shopProductBookService; @Autowired private UserEbookBuyService userEbookBuyService; @@ -127,7 +127,7 @@ public class WeChatPayController { BuyOrderEntity orderEntity = buyOrderService.getBaseMapper().selectOne(new QueryWrapper().eq("order_sn", orderNo)); BigDecimal realMoney = orderEntity.getRealMoney(); // 查询订单的所有 book_id - List orderBookIdList = shopProudictBookService.getOrderBookId(order.getOrderSn()); + List orderBookIdList = shopProductBookService.getOrderBookId(order.getOrderSn()); // 去重 Set set = new HashSet<>(orderBookIdList); orderBookIdList.clear(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 57dd3908..a9458538 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -50,7 +50,7 @@ spring: initSQL: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci rabbitmq: - host: 59.110.212.44 + host: 39.106.36.183 port: 5672 username: admin password: 751019 diff --git a/src/main/resources/mapper/book/OrderCartDao.xml b/src/main/resources/mapper/book/OrderCartDao.xml index 69698a97..51061d11 100644 --- a/src/main/resources/mapper/book/OrderCartDao.xml +++ b/src/main/resources/mapper/book/OrderCartDao.xml @@ -13,7 +13,7 @@ - + diff --git a/src/main/resources/mapper/book/UserRecordDao.xml b/src/main/resources/mapper/book/UserRecordDao.xml index 8353a4a8..5a7a4961 100644 --- a/src/main/resources/mapper/book/UserRecordDao.xml +++ b/src/main/resources/mapper/book/UserRecordDao.xml @@ -14,7 +14,7 @@ - +