Ver Fonte

格式化

yangyb há 1 mês atrás
pai
commit
c06beba7ef

+ 12 - 27
mall-service/src/main/java/com/txz/mall/controller/CategoryController.java

@@ -35,17 +35,14 @@ public class CategoryController {
     private CategoryService categoryService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "类目新增", httpMethod = "POST")
-    public Result add(@RequestBody Category category, Long userId) {
+    @ApiOperation(value = "类目新增")
+    public Result add(@RequestBody Category category) {
         if (category == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             category.setCreateTime(new Date());
-            category.setCreateUserId(userId);
+//            category.setCreateUserId(userId);
             categoryService.save(category);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -55,14 +52,11 @@ public class CategoryController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "类目删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "类目删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             categoryService.delete(id);
         } catch (Exception e) {
@@ -73,20 +67,17 @@ public class CategoryController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "类目更新", httpMethod = "POST")
-    public Result update(@RequestBody Category category, Long userId) {
+    @ApiOperation(value = "类目更新")
+    public Result update(@RequestBody Category category) {
         if (category == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (category.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             category.setUpdateTime(new Date());
-            category.setUpdateUserId(userId);
+//            category.setUpdateUserId(userId);
             categoryService.update(category);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -96,14 +87,11 @@ public class CategoryController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "类目获取详情", httpMethod = "POST")
-    public Result<Category> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "类目获取详情")
+    public Result<Category> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         Category category = null;
         try {
             category = categoryService.findById(id);
@@ -115,11 +103,8 @@ public class CategoryController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "类目获取列表", httpMethod = "POST")
-    public Result<List<Category>> list(@RequestBody Category category, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "类目获取列表")
+    public Result<List<Category>> list(@RequestBody Category category, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(category.getClass());

+ 13 - 27
mall-service/src/main/java/com/txz/mall/controller/StoreCombinationController.java

@@ -32,17 +32,14 @@ public class StoreCombinationController {
     private StoreCombinationService storeCombinationService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "拼团商品表新增", httpMethod = "POST")
-    public Result add(@RequestBody StoreCombination storeCombination, Long userId) {
+    @ApiOperation(value = "拼团商品表新增")
+    public Result add(@RequestBody StoreCombination storeCombination) {
         if (storeCombination == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             storeCombination.setCreateTime(new Date());
-            storeCombination.setCreateUserId(userId);
+//            storeCombination.setCreateUserId(userId);
             storeCombinationService.save(storeCombination);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -52,14 +49,11 @@ public class StoreCombinationController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "拼团商品表删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "拼团商品表删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             StoreCombination storeCombination = new StoreCombination();
             storeCombination.setId(id);
@@ -73,20 +67,17 @@ public class StoreCombinationController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "拼团商品表更新", httpMethod = "POST")
-    public Result update(@RequestBody StoreCombination storeCombination, Long userId) {
+    @ApiOperation(value = "拼团商品表更新")
+    public Result update(@RequestBody StoreCombination storeCombination) {
         if (storeCombination == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (storeCombination.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             storeCombination.setUpdateTime(new Date());
-            storeCombination.setUpdateUserId(userId);
+//            storeCombination.setUpdateUserId(userId);
             storeCombinationService.update(storeCombination);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -96,14 +87,12 @@ public class StoreCombinationController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "拼团商品表获取详情", httpMethod = "POST")
-    public Result<StoreCombination> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "拼团商品表获取详情")
+    public Result<StoreCombination> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         StoreCombination storeCombination = null;
         try {
             storeCombination = storeCombinationService.findById(id);
@@ -115,11 +104,8 @@ public class StoreCombinationController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "拼团商品表获取列表", httpMethod = "POST")
-    public Result<List<StoreCombination>> list(@RequestBody StoreCombination storeCombination, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "拼团商品表获取列表")
+    public Result<List<StoreCombination>> list(@RequestBody StoreCombination storeCombination, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeCombination.getClass());

+ 12 - 26
mall-service/src/main/java/com/txz/mall/controller/StoreFlashActivityController.java

@@ -32,16 +32,13 @@ public class StoreFlashActivityController {
 
     @PostMapping("/add")
     @ApiOperation(value = "限时活动新增")
-    public Result add(@RequestBody StoreFlashActivity storeFlashActivity, Long userId) {
+    public Result add(@RequestBody StoreFlashActivity storeFlashActivity) {
         if (storeFlashActivity == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             storeFlashActivity.setCreateTime(new Date());
-            storeFlashActivity.setCreateUserId(userId);
+//            storeFlashActivity.setCreateUserId(userId);
             storeFlashActivityService.save(storeFlashActivity);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -51,14 +48,12 @@ public class StoreFlashActivityController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "限时活动删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "限时活动删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             StoreFlashActivity storeFlashActivity = new StoreFlashActivity();
             storeFlashActivity.setId(id);
@@ -72,20 +67,17 @@ public class StoreFlashActivityController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "限时活动更新", httpMethod = "POST")
-    public Result update(@RequestBody StoreFlashActivity storeFlashActivity, Long userId) {
+    @ApiOperation(value = "限时活动更新")
+    public Result update(@RequestBody StoreFlashActivity storeFlashActivity) {
         if (storeFlashActivity == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (storeFlashActivity.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         try {
             storeFlashActivity.setUpdateTime(new Date());
-            storeFlashActivity.setUpdateUserId(userId);
+//            storeFlashActivity.setUpdateUserId(userId);
             storeFlashActivityService.update(storeFlashActivity);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -95,14 +87,11 @@ public class StoreFlashActivityController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "限时活动获取详情", httpMethod = "POST")
-    public Result<StoreFlashActivity> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "限时活动获取详情")
+    public Result<StoreFlashActivity> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
         StoreFlashActivity storeFlashActivity = null;
         try {
             storeFlashActivity = storeFlashActivityService.findById(id);
@@ -114,11 +103,8 @@ public class StoreFlashActivityController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "限时活动获取列表", httpMethod = "POST")
-    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivity storeFlashActivity, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "限时活动获取列表")
+    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivity storeFlashActivity, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeFlashActivity.getClass());

+ 17 - 27
mall-service/src/main/java/com/txz/mall/controller/StoreProductAttrResultController.java

@@ -31,17 +31,15 @@ public class StoreProductAttrResultController {
     private StoreProductAttrResultService storeProductAttrResultService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "商品属性新增", httpMethod = "POST")
-    public Result add(@RequestBody StoreProductAttrResult storeProductAttrResult, Long userId) {
+    @ApiOperation(value = "商品属性新增")
+    public Result add(@RequestBody StoreProductAttrResult storeProductAttrResult) {
         if (storeProductAttrResult == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             storeProductAttrResult.setCreateTime(new Date());
-            storeProductAttrResult.setCreateUserId(userId);
+//            storeProductAttrResult.setCreateUserId(userId);
             storeProductAttrResultService.save(storeProductAttrResult);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -51,14 +49,12 @@ public class StoreProductAttrResultController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "商品属性删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "商品属性删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             StoreProductAttrResult storeProductAttrResult = new StoreProductAttrResult();
             storeProductAttrResult.setId(id);
@@ -72,20 +68,18 @@ public class StoreProductAttrResultController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "商品属性更新", httpMethod = "POST")
-    public Result update(@RequestBody StoreProductAttrResult storeProductAttrResult, Long userId) {
+    @ApiOperation(value = "商品属性更新")
+    public Result update(@RequestBody StoreProductAttrResult storeProductAttrResult) {
         if (storeProductAttrResult == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (storeProductAttrResult.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             storeProductAttrResult.setUpdateTime(new Date());
-            storeProductAttrResult.setUpdateUserId(userId);
+//            storeProductAttrResult.setUpdateUserId(userId);
             storeProductAttrResultService.update(storeProductAttrResult);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -95,14 +89,12 @@ public class StoreProductAttrResultController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "商品属性获取详情", httpMethod = "POST")
-    public Result<StoreProductAttrResult> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "商品属性获取详情")
+    public Result<StoreProductAttrResult> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         StoreProductAttrResult storeProductAttrResult = null;
         try {
             storeProductAttrResult = storeProductAttrResultService.findById(id);
@@ -114,11 +106,9 @@ public class StoreProductAttrResultController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "商品属性获取列表", httpMethod = "POST")
-    public Result<List<StoreProductAttrResult>> list(@RequestBody StoreProductAttrResult storeProductAttrResult, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "商品属性获取列表")
+    public Result<List<StoreProductAttrResult>> list(@RequestBody StoreProductAttrResult storeProductAttrResult, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+       
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeProductAttrResult.getClass());

+ 21 - 33
mall-service/src/main/java/com/txz/mall/controller/StoreProductController.java

@@ -35,17 +35,15 @@ public class StoreProductController {
     private StoreProductService storeProductService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "商品新增", httpMethod = "POST")
-    public Result add(@RequestBody StoreProduct storeProduct, Long userId) {
+    @ApiOperation(value = "商品新增")
+    public Result add(@RequestBody StoreProduct storeProduct) {
         if (storeProduct == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             storeProduct.setCreateTime(new Date());
-            storeProduct.setCreateUserId(userId);
+//            storeProduct.setCreateUserId(userId);
             // 生成货号
             String itemNumber = generateItemNumber(storeProduct.getCateId());
             storeProduct.setItemNumber(itemNumber);
@@ -82,14 +80,12 @@ public class StoreProductController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "商品删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "商品删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             StoreProduct storeProduct = new StoreProduct();
             storeProduct.setId(id);
@@ -103,20 +99,18 @@ public class StoreProductController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "商品更新", httpMethod = "POST")
-    public Result update(@RequestBody StoreProduct storeProduct, Long userId) {
+    @ApiOperation(value = "商品更新")
+    public Result update(@RequestBody StoreProduct storeProduct) {
         if (storeProduct == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (storeProduct.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             storeProduct.setUpdateTime(new Date());
-            storeProduct.setUpdateUserId(userId);
+//            storeProduct.setUpdateUserId(userId);
             storeProductService.update(storeProduct);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -126,21 +120,19 @@ public class StoreProductController {
     }
 
     @PostMapping("/updateShowStatus")
-    @ApiOperation(value = "商品上下架", httpMethod = "POST")
-    public Result updateShowStatus(@RequestParam Long id, @RequestParam Integer ShowStatus, Long userId) {
+    @ApiOperation(value = "商品上下架")
+    public Result updateShowStatus(@RequestParam Long id, @RequestParam Integer ShowStatus) {
         if (ShowStatus == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             StoreProduct storeProduct = new StoreProduct();
             storeProduct.setUpdateTime(new Date());
-            storeProduct.setUpdateUserId(userId);
+//            storeProduct.setUpdateUserId(userId);
             storeProduct.setIsShow(ShowStatus);
             storeProductService.update(storeProduct);
         } catch (Exception e) {
@@ -151,14 +143,12 @@ public class StoreProductController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "商品获取详情", httpMethod = "POST")
-    public Result<StoreProduct> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "商品获取详情")
+    public Result<StoreProduct> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         StoreProduct storeProduct = null;
         try {
             storeProduct = storeProductService.findById(id);
@@ -170,11 +160,9 @@ public class StoreProductController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "商品获取列表", httpMethod = "POST")
-    public Result<List<StoreProduct>> list(@RequestBody StoreProduct storeProduct, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "商品获取列表")
+    public Result<List<StoreProduct>> list(@RequestBody StoreProduct storeProduct, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+       
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeProduct.getClass());

+ 18 - 28
mall-service/src/main/java/com/txz/mall/controller/StoreProductRuleController.java

@@ -20,7 +20,7 @@ import java.util.List;
 /**
  * Created by CodeGenerator on 2025/07/11.
  */
-@Api(tags = "[后台]商品管理")
+@Api(tags = "[后台]商品规则管理")
 @RestController
 @RequestMapping("/store/product/rule")
 public class StoreProductRuleController {
@@ -31,17 +31,15 @@ public class StoreProductRuleController {
     private StoreProductRuleService storeProductRuleService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "商品规则新增", httpMethod = "POST")
-    public Result add(@RequestBody StoreProductRule storeProductRule, Long userId) {
+    @ApiOperation(value = "商品规则新增")
+    public Result add(@RequestBody StoreProductRule storeProductRule) {
         if (storeProductRule == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             storeProductRule.setCreateTime(new Date());
-            storeProductRule.setCreateUserId(userId);
+//            storeProductRule.setCreateUserId(userId);
             storeProductRuleService.saveRule(storeProductRule);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -51,14 +49,12 @@ public class StoreProductRuleController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "商品规则删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "商品规则删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             StoreProductRule storeProductRule = new StoreProductRule();
             storeProductRule.setId(id);
@@ -72,20 +68,18 @@ public class StoreProductRuleController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "商品规则更新", httpMethod = "POST")
-    public Result update(@RequestBody StoreProductRule storeProductRule, Long userId) {
+    @ApiOperation(value = "商品规则更新")
+    public Result update(@RequestBody StoreProductRule storeProductRule) {
         if (storeProductRule == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (storeProductRule.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             storeProductRule.setUpdateTime(new Date());
-            storeProductRule.setUpdateUserId(userId);
+//            storeProductRule.setUpdateUserId(userId);
             storeProductRuleService.update(storeProductRule);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -95,14 +89,12 @@ public class StoreProductRuleController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "商品规则获取详情", httpMethod = "POST")
-    public Result<StoreProductRule> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "商品规则获取详情")
+    public Result<StoreProductRule> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         StoreProductRule storeProductRule = null;
         try {
             storeProductRule = storeProductRuleService.findById(id);
@@ -114,11 +106,9 @@ public class StoreProductRuleController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "商品规则获取列表", httpMethod = "POST")
-    public Result<List<StoreProductRule>> list(@RequestBody StoreProductRule storeProductRule, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "商品规则获取列表")
+    public Result<List<StoreProductRule>> list(@RequestBody StoreProductRule storeProductRule, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+        
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(storeProductRule.getClass());

+ 17 - 27
mall-service/src/main/java/com/txz/mall/controller/SystemDictDataController.java

@@ -32,17 +32,15 @@ public class SystemDictDataController {
     private SystemDictDataService systemDictDataService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "字典数据新增", httpMethod = "POST")
-    public Result add(@RequestBody SystemDictData systemDictData, Long userId) {
+    @ApiOperation(value = "字典数据新增")
+    public Result add(@RequestBody SystemDictData systemDictData) {
         if (systemDictData == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemDictData.setCreateTime(new Date());
-            systemDictData.setCreateUserId(userId);
+//            systemDictData.setCreateUserId(userId);
             systemDictDataService.save(systemDictData);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -52,14 +50,12 @@ public class SystemDictDataController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "字典数据删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "字典数据删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             SystemDictData systemDictData = new SystemDictData();
             systemDictData.setDictCode(id);
@@ -73,20 +69,18 @@ public class SystemDictDataController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "字典数据更新", httpMethod = "POST")
-    public Result update(@RequestBody SystemDictData systemDictData, Long userId) {
+    @ApiOperation(value = "字典数据更新")
+    public Result update(@RequestBody SystemDictData systemDictData) {
         if (systemDictData == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (systemDictData.getDictCode() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemDictData.setUpdateTime(new Date());
-            systemDictData.setUpdateUserId(userId);
+//            systemDictData.setUpdateUserId(userId);
             systemDictDataService.update(systemDictData);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -96,14 +90,12 @@ public class SystemDictDataController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "字典数据获取详情", httpMethod = "POST")
-    public Result<SystemDictData> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "字典数据获取详情")
+    public Result<SystemDictData> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         SystemDictData systemDictData = null;
         try {
             systemDictData = systemDictDataService.findById(id);
@@ -115,11 +107,9 @@ public class SystemDictDataController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "字典数据获取列表", httpMethod = "POST")
-    public Result<List<SystemDictData>> list(@RequestBody SystemDictData systemDictData, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "字典数据获取列表")
+    public Result<List<SystemDictData>> list(@RequestBody SystemDictData systemDictData, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+       
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(systemDictData.getClass());

+ 17 - 27
mall-service/src/main/java/com/txz/mall/controller/SystemDictTypeController.java

@@ -31,17 +31,15 @@ public class SystemDictTypeController {
     private SystemDictTypeService systemDictTypeService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "字典类型新增", httpMethod = "POST")
-    public Result add(@RequestBody SystemDictType systemDictType, Long userId) {
+    @ApiOperation(value = "字典类型新增")
+    public Result add(@RequestBody SystemDictType systemDictType) {
         if (systemDictType == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemDictType.setCreateTime(new Date());
-            systemDictType.setCreateUserId(userId);
+//            systemDictType.setCreateUserId(userId);
             systemDictTypeService.save(systemDictType);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -51,14 +49,12 @@ public class SystemDictTypeController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "字典类型删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "字典类型删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             SystemDictType systemDictType = new SystemDictType();
             systemDictType.setDictId(id);
@@ -72,20 +68,18 @@ public class SystemDictTypeController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "字典类型更新", httpMethod = "POST")
-    public Result update(@RequestBody SystemDictType systemDictType, Long userId) {
+    @ApiOperation(value = "字典类型更新")
+    public Result update(@RequestBody SystemDictType systemDictType) {
         if (systemDictType == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (systemDictType.getDictId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemDictType.setUpdateTime(new Date());
-            systemDictType.setUpdateUserId(userId);
+//            systemDictType.setUpdateUserId(userId);
             systemDictTypeService.update(systemDictType);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -95,14 +89,12 @@ public class SystemDictTypeController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "字典类型获取详情", httpMethod = "POST")
-    public Result<SystemDictType> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "字典类型获取详情")
+    public Result<SystemDictType> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         SystemDictType systemDictType = null;
         try {
             systemDictType = systemDictTypeService.findById(id);
@@ -114,11 +106,9 @@ public class SystemDictTypeController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "字典类型获取列表", httpMethod = "POST")
-    public Result<List<SystemDictType>> list(@RequestBody SystemDictType systemDictType, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "字典类型获取列表")
+    public Result<List<SystemDictType>> list(@RequestBody SystemDictType systemDictType, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+        
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(systemDictType.getClass());

+ 21 - 31
mall-service/src/main/java/com/txz/mall/controller/SystemFormTempController.java

@@ -31,17 +31,15 @@ public class SystemFormTempController {
     private SystemFormTempService systemFormTempService;
 
     @PostMapping("/add")
-	@ApiOperation(value = "表单新增", httpMethod = "POST")
-	public Result add(@RequestBody SystemFormTemp systemFormTemp, Long userId) {
+    @ApiOperation(value = "表单新增")
+    public Result add(@RequestBody SystemFormTemp systemFormTemp) {
 		if (systemFormTemp == null) {
 			return Result.fail(ResultCode.OBJECT_IS_NULL);
 		}
-		if (userId == null) {
-			return Result.fail(ResultCode.USERID_IS_NULL);
-		}
-		try {
+
+        try {
 			systemFormTemp.setCreateTime(new Date());
-			systemFormTemp.setCreateUserId(userId);
+//			systemFormTemp.setCreateUserId(userId);
 			systemFormTempService.save(systemFormTemp);
 		} catch (Exception e) {
 			log.error("新增对象操作异常e:{}", e);
@@ -51,15 +49,13 @@ public class SystemFormTempController {
     }
 
     @PostMapping("/delete")
-	@ApiOperation(value = "表单删除", httpMethod = "POST")
-	public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "表单删除")
+    public Result delete(@RequestParam Long id) {
 		if (id == null) {
 			return Result.fail(ResultCode.ID_IS_NULL);
 		}
-		if (userId == null) {
-			return Result.fail(ResultCode.USERID_IS_NULL);
-		}
-		try {
+
+        try {
             SystemFormTemp systemFormTemp = new SystemFormTemp();
 			systemFormTemp.setId(id);
 			systemFormTemp.setIsDelete(1);
@@ -72,20 +68,18 @@ public class SystemFormTempController {
     }
 
     @PostMapping("/update")
-	@ApiOperation(value = "表单更新", httpMethod = "POST")
-	public Result update(@RequestBody SystemFormTemp systemFormTemp, Long userId) {
+    @ApiOperation(value = "表单更新")
+    public Result update(@RequestBody SystemFormTemp systemFormTemp) {
 		if (systemFormTemp == null) {
 			return Result.fail(ResultCode.OBJECT_IS_NULL);
 		}
 		if (systemFormTemp.getId() == null) {
 			return Result.fail(ResultCode.ID_IS_NULL);
 		}
-		if (userId == null) {
-			return Result.fail(ResultCode.USERID_IS_NULL);
-		}
-		try {
+
+        try {
 			systemFormTemp.setUpdateTime(new Date());
-			systemFormTemp.setUpdateUserId(userId);
+//			systemFormTemp.setUpdateUserId(userId);
 			systemFormTempService.update(systemFormTemp);
 		} catch (Exception e) {
 			log.error("更新对象操作异常e:{}", e);
@@ -95,15 +89,13 @@ public class SystemFormTempController {
     }
 
     @PostMapping("/detail")
-	@ApiOperation(value = "表单获取详情", httpMethod = "POST")
-	public Result<SystemFormTemp> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "表单获取详情")
+    public Result<SystemFormTemp> detail(@RequestParam Long id) {
 		if (id == null) {
 			return Result.fail(ResultCode.ID_IS_NULL);
 		}
-		if (userId == null) {
-			return Result.fail(ResultCode.USERID_IS_NULL);
-		}
-		SystemFormTemp systemFormTemp = null;
+
+        SystemFormTemp systemFormTemp = null;
 		try {
 			systemFormTemp = systemFormTempService.findById(id);
 		} catch (Exception e) {
@@ -114,11 +106,9 @@ public class SystemFormTempController {
     }
 
     @PostMapping("/list")
-	@ApiOperation(value = "表单获取列表", httpMethod = "POST")
-	public Result<List<SystemFormTemp>> list(@RequestBody SystemFormTemp systemFormTemp, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-		if (userId == null) {
-			return Result.fail(ResultCode.USERID_IS_NULL);
-		}
+    @ApiOperation(value = "表单获取列表")
+    public Result<List<SystemFormTemp>> list(@RequestBody SystemFormTemp systemFormTemp, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+		
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(systemFormTemp.getClass());

+ 17 - 27
mall-service/src/main/java/com/txz/mall/controller/SystemGroupController.java

@@ -31,17 +31,15 @@ public class SystemGroupController {
     private SystemGroupService systemGroupService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "配置表新增", httpMethod = "POST")
-    public Result add(@RequestBody SystemGroup systemGroup, Long userId) {
+    @ApiOperation(value = "配置表新增")
+    public Result add(@RequestBody SystemGroup systemGroup) {
         if (systemGroup == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemGroup.setCreateTime(new Date());
-            systemGroup.setCreateUserId(userId);
+//            systemGroup.setCreateUserId(userId);
             systemGroupService.save(systemGroup);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -51,14 +49,12 @@ public class SystemGroupController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "配置表删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "配置表删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             SystemGroup systemGroup = new SystemGroup();
             systemGroup.setId(id);
@@ -72,20 +68,18 @@ public class SystemGroupController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "配置表更新", httpMethod = "POST")
-    public Result update(@RequestBody SystemGroup systemGroup, Long userId) {
+    @ApiOperation(value = "配置表更新")
+    public Result update(@RequestBody SystemGroup systemGroup) {
         if (systemGroup == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (systemGroup.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemGroup.setUpdateTime(new Date());
-            systemGroup.setUpdateUserId(userId);
+//            systemGroup.setUpdateUserId(userId);
             systemGroupService.update(systemGroup);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -95,14 +89,12 @@ public class SystemGroupController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "配置表获取详情", httpMethod = "POST")
-    public Result<SystemGroup> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "配置表获取详情")
+    public Result<SystemGroup> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         SystemGroup systemGroup = null;
         try {
             systemGroup = systemGroupService.findById(id);
@@ -114,11 +106,9 @@ public class SystemGroupController {
     }
 
     @PostMapping("/list")
-    @ApiOperation(value = "配置表获取列表", httpMethod = "POST")
-    public Result<List<SystemGroup>> list(@RequestBody SystemGroup systemGroup, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    @ApiOperation(value = "配置表获取列表")
+    public Result<List<SystemGroup>> list(@RequestBody SystemGroup systemGroup, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+        
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(systemGroup.getClass());

+ 16 - 26
mall-service/src/main/java/com/txz/mall/controller/SystemGroupDataController.java

@@ -31,17 +31,15 @@ public class SystemGroupDataController {
     private SystemGroupDataService systemGroupDataService;
 
     @PostMapping("/add")
-    @ApiOperation(value = "配置详情表新增", httpMethod = "POST")
-    public Result add(@RequestBody SystemGroupData systemGroupData, Long userId) {
+    @ApiOperation(value = "配置详情表新增")
+    public Result add(@RequestBody SystemGroupData systemGroupData) {
         if (systemGroupData == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemGroupData.setCreateTime(new Date());
-            systemGroupData.setCreateUserId(userId);
+//            systemGroupData.setCreateUserId(userId);
             systemGroupDataService.save(systemGroupData);
         } catch (Exception e) {
             log.error("新增对象操作异常e:{}", e);
@@ -51,14 +49,12 @@ public class SystemGroupDataController {
     }
 
     @PostMapping("/delete")
-    @ApiOperation(value = "配置详情表删除", httpMethod = "POST")
-    public Result delete(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "配置详情表删除")
+    public Result delete(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             SystemGroupData systemGroupData = new SystemGroupData();
             systemGroupData.setId(id);
@@ -72,20 +68,18 @@ public class SystemGroupDataController {
     }
 
     @PostMapping("/update")
-    @ApiOperation(value = "配置详情表更新", httpMethod = "POST")
-    public Result update(@RequestBody SystemGroupData systemGroupData, Long userId) {
+    @ApiOperation(value = "配置详情表更新")
+    public Result update(@RequestBody SystemGroupData systemGroupData) {
         if (systemGroupData == null) {
             return Result.fail(ResultCode.OBJECT_IS_NULL);
         }
         if (systemGroupData.getId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         try {
             systemGroupData.setUpdateTime(new Date());
-            systemGroupData.setUpdateUserId(userId);
+//            systemGroupData.setUpdateUserId(userId);
             systemGroupDataService.update(systemGroupData);
         } catch (Exception e) {
             log.error("更新对象操作异常e:{}", e);
@@ -95,14 +89,12 @@ public class SystemGroupDataController {
     }
 
     @PostMapping("/detail")
-    @ApiOperation(value = "配置详情表获取详情", httpMethod = "POST")
-    public Result<SystemGroupData> detail(@RequestParam Long id, Long userId) {
+    @ApiOperation(value = "配置详情表获取详情")
+    public Result<SystemGroupData> detail(@RequestParam Long id) {
         if (id == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+
         SystemGroupData systemGroupData = null;
         try {
             systemGroupData = systemGroupDataService.findById(id);
@@ -115,10 +107,8 @@ public class SystemGroupDataController {
 
     @PostMapping("/list")
     @ApiOperation(value = "配置详情表获取列表")
-    public Result<List<SystemGroupData>> list(@RequestBody SystemGroupData systemGroupData, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size, Long userId) {
-        if (userId == null) {
-            return Result.fail(ResultCode.USERID_IS_NULL);
-        }
+    public Result<List<SystemGroupData>> list(@RequestBody SystemGroupData systemGroupData, @RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "0") Integer size) {
+       
         PageHelper.startPage(page, size);
 
         Condition condition = new Condition(systemGroupData.getClass());