Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk

Conflicts: DB/version4.2.3toMASTER.sql common-api/src/main/java/cn/lili/controller/common/SiteController.java common-api/src/main/java/cn/lili/controller/common/UploadController.java config/application.yml framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
2022-08-09 18:54:19 +08:00
parent 70b41ab8a8 72c58059bd
commit 26dd8ed13a
237 changed files with 4985 additions and 2159 deletions
--- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java
@@ -14,6 +14,7 @@ import cn.lili.modules.search.entity.dos.EsGoodsIndex;
 import cn.lili.modules.search.entity.dos.EsGoodsRelatedInfo;
 import cn.lili.modules.search.entity.dto.EsGoodsSearchDTO;
 import cn.lili.modules.search.service.EsGoodsSearchService;
+import cn.lili.modules.search.service.HotWordsService;
 import cn.lili.modules.statistics.aop.PageViewPoint;
 import cn.lili.modules.statistics.aop.enums.PageViewEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -62,6 +63,9 @@ public class GoodsBuyerController {
    @Autowired
    private EsGoodsSearchService goodsSearchService;

+    @Autowired
+    private HotWordsService hotWordsService;
+
    @ApiOperation(value = "通过id获取商品信息")
    @ApiImplicitParam(name = "goodsId", value = "商品ID", required = true, paramType = "path", dataType = "Long")
    @GetMapping(value = "/get/{goodsId}")
@@ -117,7 +121,7 @@ public class GoodsBuyerController {
    @ApiOperation(value = "获取搜索热词")
    @GetMapping("/hot-words")
    public ResultMessage<List<String>> getGoodsHotWords(Integer count) {
-        List<String> hotWords = goodsSearchService.getHotWords(count);
+        List<String> hotWords = hotWordsService.getHotWords(count);
        return ResultUtil.data(hotWords);
    }

--- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java
@@ -5,6 +5,7 @@ import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.service.FootprintService;
 import cn.lili.modules.search.entity.dos.EsGoodsIndex;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
@@ -34,7 +35,7 @@ public class FootprintController {

    @ApiOperation(value = "分页获取")
    @GetMapping
-    public ResultMessage<List<EsGoodsIndex>> getByPage(PageVO page) {
+    public ResultMessage<IPage<EsGoodsIndex>> getByPage(PageVO page) {
        return ResultUtil.data(footprintService.footPrintPage(page));
    }

--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
@@ -48,7 +48,7 @@ public class MemberEvaluationBuyerController {
    @ApiOperation(value = "查看会员评价详情")
    @ApiImplicitParam(name = "id", value = "评价ID", required = true, paramType = "path")
    @GetMapping(value = "/get/{id}")
-    public ResultMessage<MemberEvaluationVO> save(@NotNull(message = "评价ID不能为空") @PathVariable("id") String id) {
+    public ResultMessage<MemberEvaluationVO> get(@NotNull(message = "评价ID不能为空") @PathVariable("id") String id) {
        return ResultUtil.data(memberEvaluationService.queryById(id));

    }
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.member;

+import cn.lili.cache.limit.annotation.LimitPoint;
 import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
@@ -82,7 +82,7 @@ public class OrderComplaintBuyerController {
    @PostMapping("/communication")
    public ResultMessage<OrderComplaintCommunicationVO> addCommunication(@RequestParam String complainId, @RequestParam String content) {
        AuthUser currentUser = Objects.requireNonNull(UserContext.getCurrentUser());
-        OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.BUYER.name(), currentUser.getId(), currentUser.getNickName());
+        OrderComplaintCommunicationVO communicationVO = new OrderComplaintCommunicationVO(complainId, content, CommunicationOwnerEnum.BUYER.name(), currentUser.getNickName(), currentUser.getId());
        orderComplaintCommunicationService.addCommunication(communicationVO);
        return ResultUtil.data(communicationVO);
    }
--- a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java
@@ -3,7 +3,7 @@ package cn.lili.controller.other.broadcast;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
-import cn.lili.modules.goods.entity.dos.Studio;
+import cn.lili.modules.goods.entity.vos.StudioVO;
 import cn.lili.modules.goods.service.StudioService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
@@ -35,7 +35,7 @@ public class StudioController {
            @ApiImplicitParam(name = "status", value = "直播间状态", paramType = "query", dataType = "String")
    })
    @GetMapping
-    public ResultMessage<IPage<Studio>> page(PageVO pageVO, Integer recommend, String status) {
+    public ResultMessage<IPage<StudioVO>> page(PageVO pageVO, Integer recommend, String status) {
        return ResultUtil.data(studioService.studioList(pageVO, recommend, status));
    }

--- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java
@@ -146,7 +146,6 @@ public class MemberBuyerController {

    @ApiOperation(value = "修改密码")
    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mobile", value = "手机号", required = true, paramType = "query"),
            @ApiImplicitParam(name = "password", value = "是否保存登录", required = true, paramType = "query")
    })
    @PostMapping("/resetPassword")
@@ -177,6 +176,34 @@ public class MemberBuyerController {
        return ResultUtil.data(memberService.modifyPass(tokenUser.getId(), password, newPassword));
    }

+    @ApiOperation(value = "初始设置密码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "newPassword", value = "新密码", required = true, paramType = "query")
+    })
+    @PutMapping("/canInitPassword")
+    public ResultMessage<Object> canInitPassword() {
+        return ResultUtil.data(memberService.canInitPass());
+    }
+
+    @ApiOperation(value = "初始设置密码")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "newPassword", value = "新密码", required = true, paramType = "query")
+    })
+    @PutMapping("/initPassword")
+    public ResultMessage<Object> initPassword(@NotNull(message = "密码不能为空") @RequestParam String password) {
+        memberService.initPass(password);
+        return ResultUtil.success();
+    }
+
+    @ApiOperation(value = "注销账号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "password", value = "密码", required = true, paramType = "query")
+    })
+    @PutMapping("/cancellation")
+    public ResultMessage<Member> cancellation(@NotNull(message = "密码不能为空") @RequestParam String password) {
+        memberService.cancellation(password);
+        return ResultUtil.success();
+    }

    @ApiOperation(value = "刷新token")
    @GetMapping("/refresh/{refreshToken}")
--- a/buyer-api/src/main/java/cn/lili/init/EsGoodsIndexInitRunner.java
+++ b/buyer-api/src/main/java/cn/lili/init/EsGoodsIndexInitRunner.java
@@ -0,0 +1,30 @@
+package cn.lili.init;
+
+import cn.lili.modules.search.service.EsGoodsIndexService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author paulG
+ * @since 2022/6/9
+ **/
+@Component
+@Slf4j
+public class EsGoodsIndexInitRunner implements ApplicationRunner {
+
+    @Autowired
+    private EsGoodsIndexService esGoodsIndexService;
+
+
+    @Override
+    public void run(ApplicationArguments args) {
+        try {
+            esGoodsIndexService.initIndex();
+        } catch (Exception e) {
+            log.error("检测ES商品索引失败", e);
+        }
+    }
+}
--- a/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java
+++ b/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java
@@ -1,7 +1,7 @@
 package cn.lili.buyer.test.cart;


-import cn.lili.modules.file.plugin.FileManagerPlugin;
+import cn.lili.modules.file.plugin.FilePlugin;
 import cn.lili.modules.goods.entity.dos.Brand;
 import cn.lili.modules.goods.service.BrandService;
 import com.xkcoding.http.util.StringUtil;
@@ -27,7 +27,7 @@ class FileTest {


    @Autowired
-    private FileManagerPlugin fileManagerPlugin;
+    private FilePlugin fileManagerPlugin;

    @Autowired
    private BrandService brandService;