Merge remote-tracking branch 'origin/dev' into dev

pz-admin/src/main/java/com/pz/web/controller/system/StoreGoodsCategoryController.java

@@ -49,7 +49,6 @@ public class StoreGoodsCategoryController extends BaseController {
     /**
      * 查询商品分类列表
      */
-    @SaCheckPermission("system:goodsCategory:list")
     @GetMapping("/list")
     public TableDataInfo<StoreGoodsCategoryVo> list(StoreGoodsCategoryBo bo, PageQuery pageQuery) {
         Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
@@ -60,7 +59,6 @@ public class StoreGoodsCategoryController extends BaseController {
     /**
      * 导出商品分类列表
      */
-    @SaCheckPermission("system:goodsCategory:export")
     @Log(title = "商品分类", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StoreGoodsCategoryBo bo, HttpServletResponse response) {
@@ -73,7 +71,6 @@ public class StoreGoodsCategoryController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:goodsCategory:query")
     @GetMapping("/{id}")
     public R<StoreGoodsCategoryVo> getInfo(@NotNull(message = "主键不能为空")
                                            @PathVariable Integer id) {
@@ -83,18 +80,18 @@ public class StoreGoodsCategoryController extends BaseController {
     /**
      * 新增商品分类
      */
-    @SaCheckPermission("system:goodsCategory:add")
     @Log(title = "商品分类", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreGoodsCategoryBo bo) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return toAjax(iStoreGoodsCategoryService.insertByBo(bo));
     }
 
     /**
      * 修改商品分类
      */
-    @SaCheckPermission("system:goodsCategory:edit")
     @Log(title = "商品分类", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -107,7 +104,6 @@ public class StoreGoodsCategoryController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:goodsCategory:remove")
     @Log(title = "商品分类", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

pz-admin/src/main/java/com/pz/web/controller/system/StoreGoodsController.java

@@ -45,7 +45,6 @@ public class StoreGoodsController extends BaseController {
     /**
      * 查询商品列表
      */
-    @SaCheckPermission("system:goods:list")
     @GetMapping("/list")
     public TableDataInfo<StoreGoodsVo> list(StoreGoodsBo bo, PageQuery pageQuery) {
         Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
@@ -56,7 +55,6 @@ public class StoreGoodsController extends BaseController {
     /**
      * 导出商品列表
      */
-    @SaCheckPermission("system:goods:export")
     @Log(title = "商品", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StoreGoodsBo bo, HttpServletResponse response) {
@@ -69,7 +67,6 @@ public class StoreGoodsController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:goods:query")
     @GetMapping("/{id}")
     public R<StoreGoodsVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
@@ -79,18 +76,18 @@ public class StoreGoodsController extends BaseController {
     /**
      * 新增商品
      */
-    @SaCheckPermission("system:goods:add")
     @Log(title = "商品", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreGoodsBo bo) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return toAjax(iStoreGoodsService.insertByBo(bo));
     }
 
     /**
      * 修改商品
      */
-    @SaCheckPermission("system:goods:edit")
     @Log(title = "商品", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -103,7 +100,6 @@ public class StoreGoodsController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:goods:remove")
     @Log(title = "商品", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

pz-admin/src/main/java/com/pz/web/controller/system/StoreGoodsTagController.java

@@ -45,7 +45,6 @@ public class StoreGoodsTagController extends BaseController {
     /**
      * 查询商品标签列表
      */
-    @SaCheckPermission("system:goodsTag:list")
     @GetMapping("/list")
     public TableDataInfo<StoreGoodsTagVo> list(StoreGoodsTagBo bo, PageQuery pageQuery) {
         Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
@@ -56,7 +55,6 @@ public class StoreGoodsTagController extends BaseController {
     /**
      * 导出商品标签列表
      */
-    @SaCheckPermission("system:goodsTag:export")
     @Log(title = "商品标签", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StoreGoodsTagBo bo, HttpServletResponse response) {
@@ -69,7 +67,6 @@ public class StoreGoodsTagController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:goodsTag:query")
     @GetMapping("/{id}")
     public R<StoreGoodsTagVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Integer id) {
@@ -79,18 +76,18 @@ public class StoreGoodsTagController extends BaseController {
     /**
      * 新增商品标签
      */
-    @SaCheckPermission("system:goodsTag:add")
     @Log(title = "商品标签", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody StoreGoodsTagBo bo) {
+        Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
+            .ifPresent(storeInfo -> bo.setStoreId(storeInfo.getId()));
         return toAjax(iStoreGoodsTagService.insertByBo(bo));
     }
 
     /**
      * 修改商品标签
      */
-    @SaCheckPermission("system:goodsTag:edit")
     @Log(title = "商品标签", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -103,7 +100,6 @@ public class StoreGoodsTagController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:goodsTag:remove")
     @Log(title = "商品标签", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

pz-admin/src/main/java/com/pz/web/controller/system/StoreIncomeController.java

@@ -48,7 +48,6 @@ public class StoreIncomeController extends BaseController {
     /**
      * 查询商城提现审批列表
      */
-    @SaCheckPermission("system:storeIncome:list")
     @GetMapping("/list")
     public TableDataInfo<StoreIncomeVo> list(StoreIncomeBo bo, PageQuery pageQuery) {
         Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
@@ -59,7 +58,6 @@ public class StoreIncomeController extends BaseController {
     /**
      * 导出商城提现审批列表
      */
-    @SaCheckPermission("system:storeIncome:export")
     @Log(title = "商城提现审批", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StoreIncomeBo bo, HttpServletResponse response) {
@@ -72,7 +70,6 @@ public class StoreIncomeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:storeIncome:query")
     @GetMapping("/{id}")
     public R<StoreIncomeVo> getInfo(@NotNull(message = "主键不能为空")
                                     @PathVariable Integer id) {
@@ -82,7 +79,6 @@ public class StoreIncomeController extends BaseController {
     /**
      * 新增商城提现审批
      */
-    @SaCheckPermission("system:storeIncome:add")
     @Log(title = "商城提现审批", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -95,7 +91,6 @@ public class StoreIncomeController extends BaseController {
     /**
      * 修改商城提现审批
      */
-    @SaCheckPermission("system:storeIncome:edit")
     @Log(title = "商城提现审批", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -108,7 +103,6 @@ public class StoreIncomeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:storeIncome:remove")
     @Log(title = "商城提现审批", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

pz-admin/src/main/java/com/pz/web/controller/system/StoreOrderController.java

@@ -49,7 +49,6 @@ public class StoreOrderController extends BaseController {
     /**
      * 查询商城订单列表
      */
-    @SaCheckPermission("system:storeOrder:list")
     @GetMapping("/list")
     public TableDataInfo<StoreAdminOrderVo> list(StoreOrderBo bo, PageQuery pageQuery) {
         Optional.ofNullable(storeInfoMapper.selectOne(Wrappers.<StoreInfo>lambdaQuery().eq(StoreInfo::getUid, getUserId())))
@@ -60,7 +59,6 @@ public class StoreOrderController extends BaseController {
     /**
      * 导出商城订单列表
      */
-    @SaCheckPermission("system:storeOrder:export")
     @Log(title = "商城订单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(StoreOrderBo bo, HttpServletResponse response) {
@@ -73,7 +71,6 @@ public class StoreOrderController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("system:storeOrder:query")
     @GetMapping("/{id}")
     public R<StoreOrderVo> getInfo(@NotNull(message = "主键不能为空")
                                    @PathVariable Integer id) {
@@ -83,7 +80,6 @@ public class StoreOrderController extends BaseController {
     /**
      * 新增商城订单
      */
-    @SaCheckPermission("system:storeOrder:add")
     @Log(title = "商城订单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -94,7 +90,6 @@ public class StoreOrderController extends BaseController {
     /**
      * 修改商城订单
      */
-    @SaCheckPermission("system:storeOrder:edit")
     @Log(title = "商城订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -107,7 +102,6 @@ public class StoreOrderController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("system:storeOrder:remove")
     @Log(title = "商城订单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")