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/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,8 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,分类绑定参数组管理接口")
-@RequestMapping("/store/goods/categoryParameters")
-@Transactional(rollbackFor = Exception.class)
+@RequestMapping("/store/goods/category/parameters")
 public class CategoryParameterGroupStoreController {


--- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java
@@ -6,7 +6,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 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.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,8 +21,7 @@ import java.util.List;
 */
@RestController
@Api(tags = "店铺端,商品分类规格接口")
-@RequestMapping("/store/goods/categorySpec")
-@Transactional(rollbackFor = Exception.class)
+@RequestMapping("/store/goods/category/spec")
 public class CategorySpecificationStoreController {
    @Autowired
    private CategorySpecificationService categorySpecificationService;
--- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java
@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cache.annotation.CacheConfig;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,7 +32,6 @@ import java.util.Objects;
@Api(tags = "店铺端,商品分类接口")
@RequestMapping("/store/goods/category")
@CacheConfig(cacheNames = "category")
-@Transactional(rollbackFor = Exception.class)
 public class CategoryStoreController {

    /**
--- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java
@@ -1,17 +1,16 @@
 package cn.lili.controller.goods;


-import cn.lili.mybatis.util.PageUtil;
 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.GoodsUnit;
 import cn.lili.modules.goods.service.GoodsUnitService;
+import cn.lili.mybatis.util.PageUtil;
 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;
@@ -24,8 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@Api(tags = "店铺端,商品计量单位接口")
-@RequestMapping("/store/goods/goodsUnit")
-@Transactional(rollbackFor = Exception.class)
+@RequestMapping("/store/goods/unit")
 public class GoodsUnitStoreController {
    @Autowired
    private GoodsUnitService goodsUnitService;
--- a/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/AfterSaleStoreController.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.security.context.UserContext;
@@ -60,6 +61,7 @@ public class AfterSaleStoreController {
        return ResultUtil.data(afterSaleService.exportAfterSaleOrder(searchParams));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "审核售后申请")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, paramType = "path"),
@@ -76,6 +78,7 @@ public class AfterSaleStoreController {
        return ResultUtil.data(afterSaleService.review(afterSaleSn, serviceStatus, remark,actualRefundPrice));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "卖家确认收货")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "afterSaleSn", value = "售后sn", required = true, paramType = "path"),
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderComplaintStoreController.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;
@@ -81,6 +82,7 @@ public class OrderComplaintStoreController {
        return ResultUtil.data(orderComplainVO);
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "申诉")
    @PutMapping("/appeal")
    public ResultMessage<OrderComplaintVO> appeal(StoreAppealVO storeAppealVO) {
@@ -88,6 +90,7 @@ public class OrderComplaintStoreController {
        return ResultUtil.data(orderComplaintService.getOrderComplainById(storeAppealVO.getOrderComplaintId()));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "修改状态")
    @PutMapping(value = "/status")
    public ResultMessage<Object> updateStatus(OrderComplaintOperationParams orderComplainVO) {
--- a/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/order/OrderStoreController.java
@@ -1,5 +1,6 @@
 package cn.lili.controller.order;

+import cn.lili.common.aop.annotation.PreventDuplicateSubmissions;
 import cn.lili.common.context.ThreadContextHolder;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.enums.ResultUtil;
@@ -86,6 +87,7 @@ public class OrderStoreController {
        return ResultUtil.data(orderService.updateConsignee(orderSn, memberAddressDTO));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "修改订单价格")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单sn", required = true, dataType = "String", paramType = "path"),
@@ -97,6 +99,7 @@ public class OrderStoreController {
        return ResultUtil.data(orderPriceService.updatePrice(orderSn, orderPrice));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "订单发货")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单sn", required = true, dataType = "String", paramType = "path"),
@@ -110,6 +113,7 @@ public class OrderStoreController {
        return ResultUtil.data(orderService.delivery(orderSn, logisticsNo, logisticsId));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "取消订单")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单编号", required = true, dataType = "String", paramType = "path"),
@@ -127,6 +131,7 @@ public class OrderStoreController {
        return ResultUtil.data(orderService.getOrderByVerificationCode(verificationCode));
    }

+    @PreventDuplicateSubmissions
    @ApiOperation(value = "订单核验")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "orderSn", value = "订单号", required = true, paramType = "path"),
--- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
+++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java
@@ -9,7 +9,6 @@ import cn.lili.modules.permission.service.SystemLogService;
 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.RequestParam;
@@ -25,7 +24,6 @@ import java.util.Objects;
 * @since 2020/11/22 14:23
 */
@RestController
-@Transactional(rollbackFor = Exception.class)
@Api(tags = "店铺端,日志管理接口")
@RequestMapping("/store/settings/log")
 public class LogStoreController {