merge conflict origin/master

2022-02-11 15:33:28 +08:00
parent 6409d0dc2d da6a17cd61
commit 5c78711d8e
216 changed files with 1473 additions and 789 deletions
--- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionCashBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.distribution;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -49,6 +50,7 @@ public class DistributionCashBuyerController {
    private DistributionCashService distributorCashService;


+    @PreventDuplicateSubmissions
    @ApiOperation(value = "分销员提现")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "price", value = "申请金额", required = true, paramType = "query", dataType = "double")
--- a/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/distribution/DistributionGoodsBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.distribution;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -50,6 +51,7 @@ public class DistributionGoodsBuyerController {
        return ResultUtil.data(distributionGoodsService.goodsPage(distributionGoodsSearchParams));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "选择分销商品")
    @ApiImplicitParams({
        @ApiImplicitParam(name = "distributionGoodsId", value = "分销ID", required = true, dataType = "String", paramType = "path"),
--- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.member;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.common.security.context.UserContext;
@@ -37,10 +38,11 @@ public class MemberEvaluationBuyerController {
    @Autowired
    private MemberEvaluationService memberEvaluationService;

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "添加会员评价")
    @PostMapping
    public ResultMessage<MemberEvaluationDTO> save(@Valid MemberEvaluationDTO memberEvaluationDTO) {
-        return ResultUtil.data(memberEvaluationService.addMemberEvaluation(memberEvaluationDTO));
+        return ResultUtil.data(memberEvaluationService.addMemberEvaluation(memberEvaluationDTO, true));
    }

    @ApiOperation(value = "查看会员评价详情")
--- 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.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.member.entity.dos.MemberSign;
@@ -27,6 +28,8 @@ public class MemberSignBuyerController {
    @Autowired
    private MemberSignService memberSignService;

+
+    @PreventDuplicateSubmissions
    @PostMapping
    @ApiOperation(value = "会员签到")
    public ResultMessage<Boolean> memberSign() {
--- a/buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/AfterSaleBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.OperationalJudgment;
 import cn.lili.common.vo.ResultMessage;
@@ -77,6 +78,7 @@ public class AfterSaleBuyerController {
        return ResultUtil.data(afterSaleService.getAfterSaleVO(sn));
    }

+    @PreventDuplicateSubmissions
    @PostMapping(value = "/save/{orderItemSn}")
    @ApiImplicitParam(name = "orderItemSn", value = "订单货物编号", required = true, paramType = "query")
    @ApiOperation(value = "申请售后")
@@ -101,6 +103,7 @@ public class AfterSaleBuyerController {
        return ResultUtil.data(afterSaleService.buyerDelivery(afterSaleSn, logisticsNo, logisticsId, mDeliverTime));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "售后，取消售后")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, dataType = "String", paramType = "path")
--- a/buyer-api/src/main/java/cn/lili/controller/order/CartController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/CartController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -235,6 +236,7 @@ public class CartController {
    }


+    @PreventDuplicateSubmissions
    @ApiOperation(value = "创建交易")
    @PostMapping(value = "/create/trade", consumes = "application/json", produces = "application/json")
    public ResultMessage<Object> crateTrade(@RequestBody TradeParams tradeParams) {
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -62,6 +63,7 @@ public class OrderBuyerController {
        return ResultUtil.data(orderDetailVO);
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "确认收货")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, paramType = "path")
@@ -80,6 +82,7 @@ public class OrderBuyerController {
        return ResultUtil.success();
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "取消订单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path"),
@@ -91,6 +94,7 @@ public class OrderBuyerController {
        return ResultUtil.success();
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "删除订单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path")
@@ -113,6 +117,7 @@ public class OrderBuyerController {
    }


+    @PreventDuplicateSubmissions
    @ApiOperation(value = "开票")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path")
--- a/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/OrderComplaintBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.OperationalJudgment;
@@ -66,6 +67,7 @@ public class OrderComplaintBuyerController {

    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "添加交易投诉")
    @PostMapping
    public ResultMessage<OrderComplaint> add(@Valid OrderComplaintDTO orderComplaintDTO) {
@@ -85,6 +87,7 @@ public class OrderComplaintBuyerController {
        return ResultUtil.data(communicationVO);
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "取消售后")
    @ApiImplicitParam(name = "id", value = "投诉单ID", required = true, paramType = "path")
    @PutMapping(value = "/status/{id}")
--- a/buyer-api/src/main/java/cn/lili/controller/order/ReceiptBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/ReceiptBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.PageVO;
 import cn.lili.common.vo.ResultMessage;
@@ -41,6 +42,7 @@ public class ReceiptBuyerController {
        return ResultUtil.data(this.receiptService.getReceiptData(searchParams, pageVO));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "保存发票信息")
    @PostMapping
    public ResultMessage<Receipt> save(@Valid Receipt receipt) {
--- a/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/order/RechargeTradeBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.vo.ResultMessage;
 import cn.lili.modules.wallet.entity.dos.Recharge;
@@ -9,7 +10,6 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,12 +26,12 @@ import javax.validation.constraints.Min;
@RestController
@Api(tags = "买家端,预存款充值记录接口")
@RequestMapping("/buyer/trade/recharge")
-@Transactional(rollbackFor = Exception.class)
 public class RechargeTradeBuyerController {

    @Autowired
    private RechargeService rechargeService;

+    @PreventDuplicateSubmissions
    @PostMapping
    @ApiOperation(value = "创建余额充值订单")
    @ApiImplicitParams({
--- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.other;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.ResultMessage;
@@ -31,6 +32,7 @@ public class FeedbackBuyerController {
    @Autowired
    private FeedbackService feedbackService;

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "添加意见反馈")
    @PostMapping()
    public ResultMessage<Object> save(@Valid Feedback feedback) {
--- a/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/other/purchase/PurchaseBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.other.purchase;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
@@ -48,6 +49,8 @@ public class PurchaseBuyerController {
        return ResultUtil.data(goodsUnitService.page(PageUtil.initPage(pageVO)));
    }

+
+    @PreventDuplicateSubmissions
    @ApiOperation(value = "添加采购单")
    @PostMapping
    public ResultMessage<PurchaseOrderVO> addPurchaseOrderVO(@RequestBody PurchaseOrderVO purchaseOrderVO) {
@@ -74,6 +77,7 @@ public class PurchaseBuyerController {
        return ResultUtil.data(purchaseOrderService.page(purchaseOrderSearchParams));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "关闭采购单")
    @ApiImplicitParam(name = "id", value = "采购单ID", required = true, dataType = "Long", paramType = "path")
    @PutMapping("/{id}")
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberReceiptController.java
@@ -1,6 +1,7 @@
 package cn.lili.controller.wallet;


+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.vo.PageVO;
@@ -35,6 +36,7 @@ public class MemberReceiptController {
        return ResultUtil.data(memberReceiptService.getPage(memberReceiptVO, page));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "新增会员发票")
    @PostMapping
    public ResultMessage<Object> add(MemberReceiptAddVO memberReceiptAddVO) {
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWalletBuyerController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.wallet;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
 import cn.lili.common.exception.ServiceException;
@@ -120,6 +121,7 @@ public class MemberWalletBuyerController {
    }


+    @PreventDuplicateSubmissions
    @PostMapping(value = "/withdrawal")
    @ApiOperation(value = "会员中心余额提现")
    @ApiImplicitParams({
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/MemberWithdrawApplyBuyerController.java
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,8 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "买家端,余额提现记录接口")
-@RequestMapping("/buyer/wallet/withdrawApply")
-@Transactional(rollbackFor = Exception.class)
+@RequestMapping("/buyer/member/withdrawApply")
 public class MemberWithdrawApplyBuyerController {
    @Autowired
    private MemberWithdrawApplyService memberWithdrawApplyService;
--- a/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java
+++ b/buyer-api/src/main/java/cn/lili/controller/wallet/RechargeBuyerController.java
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -25,7 +24,6 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@Api(tags = "买家端,预存款充值记录接口")
@RequestMapping("/buyer/wallet/recharge")
-@Transactional(rollbackFor = Exception.class)
 public class RechargeBuyerController {

    @Autowired
--- a/buyer-api/src/main/resources/application.yml
+++ b/buyer-api/src/main/resources/application.yml
@@ -3,12 +3,19 @@ server:

  servlet:
    context-path: /
-
-  tomcat:
-    uri-encoding: UTF-8
-    threads:
-      min-spare: 50
-      max: 1000
+#
+#  tomcat:
+#    #最大链接数，默认不设置，默认是10000
+#    max-connections: 6500
+#    #最大等待队列长度，允许HTTP请求缓存到请求队列的最大个数，默认不限制
+#    accept-count: 1000
+#    threads:
+#      #最少闲置
+#      min-spare: 50
+#      #最大线程数  ，默认是200
+#      max: 800
+  netty:
+    connection-timeout:

 # 与Spring Boot 2一样，默认情况下，大多数端点都不通过http公开，我们公开了所有端点。对于生产，您应该仔细选择要公开的端点。
 management:
@@ -69,10 +76,10 @@ spring:
        url: jdbc:mysql://127.0.0.1:3306/lilishop?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
        username: root
        password: lilishop
-        maxActive: 20
-        initialSize: 5
+        maxActive: 50
+        initialSize: 10
        maxWait: 60000
-        minIdle: 5
+        minIdle: 10
        timeBetweenEvictionRunsMillis: 60000
        minEvictableIdleTimeMillis: 300000
        validationQuery: SELECT 1 FROM DUAL
@@ -110,7 +117,7 @@ spring:
    props:
      #是否打印逻辑SQL语句和实际SQL语句，建议调试时打印，在生产环境关闭
      sql:
-        show: true
+        show: false

 # 忽略TOKEN 鉴权 的url
 ignored:
@@ -176,8 +183,7 @@ logging:
  config: classpath:logback-spring.xml
  # 输出级别
  level:
-    cn.lili: debug
-    org.hibernate: debug
+    root: error
 #    org.springframework: debug
  file:
    # 指定路径