订单app端管理端接口分离，app端用户认证，新订单状态机

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppBannerController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.Banner;
 import com.txz.mall.service.BannerService;
+import com.txz.mall.web.param.BannerParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public class AppBannerController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "轮播图删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -66,7 +67,7 @@ public class AppBannerController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "轮播图更新")
     public Result update(@RequestBody Banner banner) {
         if (banner == null) {
@@ -86,7 +87,7 @@ public class AppBannerController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "轮播图获取详情")
     public Result<Banner> detail(@RequestParam Long id) {
         if (id == null) {
@@ -104,10 +105,10 @@ public class AppBannerController {
 
     @PostMapping("/list")
     @ApiOperation(value = "轮播图获取列表")
-    public Result<List<Banner>> list(@RequestBody Banner banner, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<Banner>> list(@RequestBody BannerParam banner) {
+        PageHelper.startPage(banner.getPage(), banner.getSize());
 
-        Condition condition = new Condition(banner.getClass());
+        Condition condition = new Condition(Banner.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppCategoryController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.Category;
 import com.txz.mall.service.CategoryService;
+import com.txz.mall.web.param.CategoryParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -53,7 +54,7 @@ public class AppCategoryController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "类目删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -63,7 +64,7 @@ public class AppCategoryController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "类目更新")
     public Result update(@RequestBody Category category) {
         if (category == null) {
@@ -83,7 +84,7 @@ public class AppCategoryController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "类目获取详情")
     public Result<Category> detail(@RequestParam Long id) {
         if (id == null) {
@@ -101,9 +102,9 @@ public class AppCategoryController {
 
     @PostMapping("/list")
     @ApiOperation(value = "类目获取列表")
-    public Result<List<Category>> list(@RequestBody Category category, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<Category>> list(@RequestBody CategoryParam category) {
 
-        Condition condition = new Condition(category.getClass());
+        Condition condition = new Condition(Category.class);
         Example.Criteria criteria = condition.createCriteria();
         if (StringUtils.isNotBlank(category.getName())) {
             criteria.andLike("name", "%" + category.getName() + "%");
@@ -112,7 +113,7 @@ public class AppCategoryController {
         condition.setOrderByClause("sort DESC, create_time DESC");
         PageInfo pageInfo = null;
         try {
-            PageHelper.startPage(page, size);
+            PageHelper.startPage(category.getPage(), category.getSize());
             List<Category> list = categoryService.findByCondition(condition);
             pageInfo = new PageInfo(list);
         } catch (Exception e) {
@@ -144,9 +145,9 @@ public class AppCategoryController {
     }
 
     @ApiOperation(value = "更改分类状态")
-    @GetMapping(value = "/updateStatus/{id}")
+    @PutMapping(value = "/updateStatus")
     @ApiImplicitParam(name = "id", value = "分类id")
-    public Result getByIds(@Validated @PathVariable(name = "id") Long id) {
+    public Result getByIds(@Validated @RequestParam(name = "id") Long id) {
         if (categoryService.updateStatus(id)) {
             return Result.success("修改成功");
         } else {

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppCombinationController.java

@@ -10,6 +10,7 @@ import com.txz.mall.core.ServiceException;
 import com.txz.mall.model.StoreCombination;
 import com.txz.mall.service.StoreCombinationService;
 import com.txz.mall.service.StoreOrderService;
+import com.txz.mall.web.param.addparam.StoreCombinationAddParam;
 import dto.GoPinkDTO;
 import dto.StoreProductDTO;
 import io.swagger.annotations.Api;
@@ -61,7 +62,7 @@ public class AppCombinationController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "拼团商品表删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -87,7 +88,7 @@ public class AppCombinationController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "拼团商品表更新")
     public Result update(@RequestBody StoreCombination storeCombination) {
         if (storeCombination == null) {
@@ -107,7 +108,7 @@ public class AppCombinationController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "拼团商品表获取详情")
     public Result<StoreCombination> detail(@RequestParam Long id) {
         if (id == null) {
@@ -126,8 +127,8 @@ public class AppCombinationController {
 
     @PostMapping("/app/list")
     @ApiOperation(value = "拼团商品表获取列表")
-    public Result<List<StoreCombination>> list(@RequestBody StoreProductDTO dto, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<StoreCombination>> list(@RequestBody StoreProductDTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getSize());
 
         Condition condition = new Condition(StoreCombination.class);
         Example.Criteria criteria = condition.createCriteria();
@@ -174,18 +175,18 @@ public class AppCombinationController {
 
     @PostMapping("/addActivityProduct")
     @ApiOperation(value = "添加活动商品")
-    public Result addActivityProduct(@RequestBody List<StoreCombination> list, @RequestParam("activityId") Long activityId) {
-        if (CollectionUtils.isEmpty(list)) {
+    public Result addActivityProduct(@RequestBody StoreCombinationAddParam storeCombinationAddParam) {
+        if (CollectionUtils.isEmpty(storeCombinationAddParam.getList())) {
             throw new ServiceException("添加商品不能为空");
         }
-        if (activityId == null) {
+        if (storeCombinationAddParam.getActivityId() == null) {
             return Result.fail(ResultCode.ID_IS_NULL);
         }
-        storeCombinationService.addActivityProduct(list, activityId);
+        storeCombinationService.addActivityProduct(storeCombinationAddParam.getList(), storeCombinationAddParam.getActivityId());
         return Result.success();
     }
 
-    @PostMapping("/getActivityProductIds")
+    @GetMapping("/getActivityProductIds")
     @ApiOperation(value = "获取活动商品ids")
     public Result<List<Long>> getActivityProductIds(@RequestParam("activityId") Long activityId) {
         Condition condition = new Condition(StoreCombination.class);

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppCommonController.java

@@ -6,10 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import vo.EnumBo;
 
 import java.util.ArrayList;
@@ -28,7 +25,7 @@ public class AppCommonController {
     private static Logger log = LoggerFactory.getLogger(AppCommonController.class);
 
     @ApiOperation(value = "枚举 1-订单状态")
-    @PostMapping(value = "/getEnum")
+    @GetMapping(value = "/getEnum")
     public Result getEnum(@RequestParam Integer id) {
         if (id == null) {
             id = 1;

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppFlashActivityController.java

@@ -1,11 +1,13 @@
 package com.txz.mall.controller.appcontroller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreFlashActivity;
 import com.txz.mall.service.StoreFlashActivityService;
+import com.txz.mall.web.param.StoreFlashActivityParam;
 import dto.StoreFlashActivityDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -51,7 +53,7 @@ public class AppFlashActivityController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "限时活动删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -70,7 +72,7 @@ public class AppFlashActivityController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "限时活动更新")
     public Result update(@RequestBody StoreFlashActivityDTO dto) {
         if (dto == null) {
@@ -93,7 +95,7 @@ public class AppFlashActivityController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "限时活动获取详情")
     public Result<StoreFlashActivity> detail(@RequestParam Long id) {
         if (id == null) {
@@ -111,9 +113,11 @@ public class AppFlashActivityController {
 
     @PostMapping("/list")
     @ApiOperation(value = "限时活动获取列表")
-    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivity storeFlashActivity, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<StoreFlashActivity>> list(@RequestBody StoreFlashActivityParam storeFlashActivityParam) {
+        StoreFlashActivity  storeFlashActivity= BeanUtil.toBean(storeFlashActivityParam, StoreFlashActivity.class);
+
         PageInfo pageInfo = null;
-        List<StoreFlashActivity> arrayList = storeFlashActivityService.activityList(storeFlashActivity, page, size);
+        List<StoreFlashActivity> arrayList = storeFlashActivityService.activityList(storeFlashActivity, storeFlashActivityParam.getPage(), storeFlashActivityParam.getSize());
         pageInfo = new PageInfo(arrayList);
         return Result.success(pageInfo);
     }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderController.java

@@ -55,7 +55,7 @@ public class AppOrderController {
         return Result.success(record);
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "订单删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -73,7 +73,7 @@ public class AppOrderController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "订单更新")
     public Result update(@RequestBody StoreOrder storeOrder) {
         if (storeOrder == null) {
@@ -93,7 +93,7 @@ public class AppOrderController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "订单获取详情")
     public Result<StoreOrderVO> detail(@RequestParam Long id) {
         if (id == null) {
@@ -105,8 +105,8 @@ public class AppOrderController {
 
     @PostMapping("/list")
     @ApiOperation(value = "订单获取列表")
-    public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto) {
+        PageHelper.startPage(dto.getPage(), dto.getSize());
         PageInfo pageInfo = null;
         try {
             List<StoreOrderVO> arrayList = storeOrderService.orderList(dto);
@@ -120,11 +120,11 @@ public class AppOrderController {
 
     @PostMapping("/app/list")
     @ApiOperation(value = "订单获取列表")
-    public Result<List<StoreOrderVO>> appList(@RequestBody StoreOrderAppDTO dto, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<StoreOrderVO>> appList(@RequestBody StoreOrderAppDTO dto) {
 
         Long tokenUserId = AuthService.getTokenUserId(null);
         dto.setUserId(tokenUserId);
-        PageHelper.startPage(page, size);
+        PageHelper.startPage(dto.getPage(), dto.getSize());
         PageInfo pageInfo = null;
         try {
             List<StoreOrderVO> arrayList = storeOrderService.appList(dto);
@@ -137,7 +137,7 @@ public class AppOrderController {
     }
 
     @ApiOperation(value = "获取订单各状态数量")
-    @PostMapping(value = "/status/num")
+    @GetMapping(value = "/status/num")
     public Result<StoreOrderCountItemVO> getOrderStatusNum() {
         return Result.success(storeOrderService.getOrderStatusNum());
     }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderInfoController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreOrderInfo;
 import com.txz.mall.service.StoreOrderInfoService;
+import com.txz.mall.web.param.StoreOrderInfoParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public class AppOrderInfoController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "订单内容删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -66,7 +67,7 @@ public class AppOrderInfoController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "订单内容更新")
     public Result update(@RequestBody StoreOrderInfo storeOrderInfo) {
         if (storeOrderInfo == null) {
@@ -86,7 +87,7 @@ public class AppOrderInfoController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "订单内容获取详情")
     public Result<StoreOrderInfo> detail(@RequestParam Long id) {
         if (id == null) {
@@ -104,10 +105,10 @@ public class AppOrderInfoController {
 
     @PostMapping("/list")
     @ApiOperation(value = "订单内容获取列表")
-    public Result<List<StoreOrderInfo>> list(@RequestBody StoreOrderInfo storeOrderInfo, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<StoreOrderInfo>> list(@RequestBody StoreOrderInfoParam storeOrderInfo) {
+        PageHelper.startPage(storeOrderInfo.getPage(), storeOrderInfo.getSize());
 
-        Condition condition = new Condition(storeOrderInfo.getClass());
+        Condition condition = new Condition(StoreOrderInfo.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppOrderStatusController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreOrderStatus;
 import com.txz.mall.service.StoreOrderStatusService;
+import com.txz.mall.web.param.StoreOrderStatusParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public class AppOrderStatusController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "订单状态删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -65,7 +66,7 @@ public class AppOrderStatusController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "订单状态更新")
     public Result update(@RequestBody StoreOrderStatus storeOrderStatus) {
         if (storeOrderStatus == null) {
@@ -84,7 +85,7 @@ public class AppOrderStatusController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping ("/detail")
     @ApiOperation(value = "订单状态获取详情")
     public Result<StoreOrderStatus> detail(@RequestParam Long id) {
         if (id == null) {
@@ -102,10 +103,10 @@ public class AppOrderStatusController {
 
     @PostMapping("/list")
     @ApiOperation(value = "订单状态获取列表")
-    public Result<List<StoreOrderStatus>> list(@RequestBody StoreOrderStatus storeOrderStatus, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<StoreOrderStatus>> list(@RequestBody StoreOrderStatusParam storeOrderStatus) {
+        PageHelper.startPage(storeOrderStatus.getPage(), storeOrderStatus.getSize());
 
-        Condition condition = new Condition(storeOrderStatus.getClass());
+        Condition condition = new Condition(StoreOrderStatus.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppPinkController.java

@@ -1,5 +1,6 @@
 package com.txz.mall.controller.appcontroller;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.txz.mall.business.PinkServiceBusiness;
@@ -7,6 +8,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StorePink;
 import com.txz.mall.service.StorePinkService;
+import com.txz.mall.web.param.StorePinkParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -54,7 +56,7 @@ public class AppPinkController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "拼团删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -72,7 +74,7 @@ public class AppPinkController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "拼团更新")
     public Result update(@RequestBody StorePink storePink) {
         if (storePink == null) {
@@ -92,7 +94,7 @@ public class AppPinkController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "拼团获取详情")
     public Result<StorePink> detail(@RequestParam Long id) {
         if (id == null) {
@@ -110,10 +112,10 @@ public class AppPinkController {
 
     @PostMapping("/list")
     @ApiOperation(value = "拼团获取列表")
-    public Result<List<StorePink>> list(@RequestBody StorePink storePink, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<StorePink>> list(@RequestBody StorePinkParam storePink) {
+        PageHelper.startPage(storePink.getPage(), storePink.getSize());
 
-        Condition condition = new Condition(storePink.getClass());
+        Condition condition = new Condition(StorePink.class);
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         criteria.andEqualTo("orderId", storePink.getOrderId());
@@ -135,8 +137,10 @@ public class AppPinkController {
 
     @ApiOperation(value = "已存在的拼团列表")
     @PostMapping(value = "/ongoing/list")
-    public Result<List<StorePinkOngoingVO>> ongoingList(@RequestBody StorePink storePink, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<StorePinkOngoingVO>> ongoingList(@RequestBody StorePinkParam storePinkParam) {
+        PageHelper.startPage(storePinkParam.getPage(), storePinkParam.getSize());
+
+        StorePink storePink = BeanUtil.toBean(storePinkParam, StorePink.class);
         List<StorePinkOngoingVO> list = storePinkService.ongoingList(storePink);
         PageInfo pageInfo = new PageInfo(list);
         return Result.success(pageInfo);
@@ -146,8 +150,8 @@ public class AppPinkController {
      * 拼团订单列表
      */
     @ApiOperation(value = "拼团订单列表")
-    @GetMapping(value = "/orderPink/{id}")
-    public Result<List<StorePinkDetailVO>> getPinkList(@PathVariable(value = "id") Integer id) {
+    @GetMapping(value = "/orderPink")
+    public Result<List<StorePinkDetailVO>> getPinkList(@RequestParam("id") Integer id) {
         return Result.success(pinkServiceBusiness.getAdminList(id));
     }
 

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppProductAttrController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.ProductAttr;
 import com.txz.mall.service.ProductAttrService;
+import com.txz.mall.web.param.ProductAttrParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public class AppProductAttrController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "商品属性删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -66,7 +67,7 @@ public class AppProductAttrController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "商品属性更新")
     public Result update(@RequestBody ProductAttr productAttr) {
         if (productAttr == null) {
@@ -86,7 +87,7 @@ public class AppProductAttrController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "商品属性获取详情")
     public Result<ProductAttr> detail(@RequestParam Long id) {
         if (id == null) {
@@ -104,10 +105,10 @@ public class AppProductAttrController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品属性获取列表")
-    public Result<List<ProductAttr>> list(@RequestBody ProductAttr productAttr, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<ProductAttr>> list(@RequestBody ProductAttrParam productAttr) {
+        PageHelper.startPage(productAttr.getPage(), productAttr.getSize());
 
-        Condition condition = new Condition(productAttr.getClass());
+        Condition condition = new Condition(ProductAttr.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppProductAttrResultController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreProductAttrResult;
 import com.txz.mall.service.StoreProductAttrResultService;
+import com.txz.mall.web.param.StoreProductAttrResultParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -49,7 +50,7 @@ public class AppProductAttrResultController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "商品属性详情删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -68,7 +69,7 @@ public class AppProductAttrResultController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "商品属性详情更新")
     public Result update(@RequestBody StoreProductAttrResult storeProductAttrResult) {
         if (storeProductAttrResult == null) {
@@ -89,7 +90,7 @@ public class AppProductAttrResultController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "商品属性详情获取详情")
     public Result<StoreProductAttrResult> detail(@RequestParam Long id) {
         if (id == null) {
@@ -108,11 +109,11 @@ public class AppProductAttrResultController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品属性详情获取列表")
-    public Result<List<StoreProductAttrResult>> list(@RequestBody StoreProductAttrResult storeProductAttrResult, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<StoreProductAttrResult>> list(@RequestBody StoreProductAttrResultParam storeProductAttrResult) {
        
-        PageHelper.startPage(page, size);
+        PageHelper.startPage(storeProductAttrResult.getPage(), storeProductAttrResult.getSize());
 
-        Condition condition = new Condition(storeProductAttrResult.getClass());
+        Condition condition = new Condition(StoreProductAttrResult.class);
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppProductAttrValueController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.ProductAttrValue;
 import com.txz.mall.service.ProductAttrValueService;
+import com.txz.mall.web.param.ProductAttrValueParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -48,7 +49,7 @@ public class AppProductAttrValueController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "SKU删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -66,7 +67,7 @@ public class AppProductAttrValueController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "SKU更新")
     public Result update(@RequestBody ProductAttrValue productAttrValue) {
         if (productAttrValue == null) {
@@ -86,7 +87,7 @@ public class AppProductAttrValueController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "SKU获取详情")
     public Result<ProductAttrValue> detail(@RequestParam Long id) {
         if (id == null) {
@@ -104,10 +105,10 @@ public class AppProductAttrValueController {
 
     @PostMapping("/list")
     @ApiOperation(value = "SKU获取列表")
-    public Result<List<ProductAttrValue>> list(@RequestBody ProductAttrValue productAttrValue, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
-        PageHelper.startPage(page, size);
+    public Result<List<ProductAttrValue>> list(@RequestBody ProductAttrValueParam productAttrValue) {
+        PageHelper.startPage(productAttrValue.getPage(), productAttrValue.getSize());
 
-        Condition condition = new Condition(productAttrValue.getClass());
+        Condition condition = new Condition(ProductAttrValue.class);
         Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppProductController.java

@@ -41,7 +41,7 @@ public class AppProductController {
     @Resource
     private StoreProductService storeProductService;
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "商品删除")
     public Result delete(@RequestParam("ids") List<Long> ids) {
         if (CollectionUtils.isEmpty(ids)) {
@@ -63,7 +63,7 @@ public class AppProductController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "商品更新")
     public Result update(@RequestBody @Validated StoreProductAddRequest request) {
         if (request == null) {
@@ -102,9 +102,9 @@ public class AppProductController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品获取列表")
-    public Result<List<StoreProduct>> list(@RequestBody StoreProductDTO dto, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<StoreProduct>> list(@RequestBody StoreProductDTO dto) {
 
-        PageHelper.startPage(page, size);
+        PageHelper.startPage(dto.getPage(), dto.getSize());
 
         Condition condition = new Condition(StoreProduct.class);
         Criteria criteria = condition.createCriteria();
@@ -154,7 +154,7 @@ public class AppProductController {
     }
 
     @ApiOperation(value = "商品详情")
-    @PostMapping(value = "/detail")
+    @GetMapping(value = "/detail")
     public Result<StoreProductInfoVO> info(@RequestParam Long id) {
         return Result.success(storeProductService.getInfo(id));
     }

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppProductRuleController.java

@@ -6,6 +6,7 @@ import com.txz.mall.core.Result;
 import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.StoreProductRule;
 import com.txz.mall.service.StoreProductRuleService;
+import com.txz.mall.web.param.StoreProductRuleParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -44,7 +45,7 @@ public class AppProductRuleController {
         return Result.success();
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "商品规则删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -63,7 +64,7 @@ public class AppProductRuleController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "商品规则更新")
     public Result update(@RequestBody StoreProductRule storeProductRule) {
         if (storeProductRule == null) {
@@ -84,7 +85,7 @@ public class AppProductRuleController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "商品规则获取详情")
     public Result<StoreProductRule> detail(@RequestParam Long id) {
         if (id == null) {
@@ -103,11 +104,11 @@ public class AppProductRuleController {
 
     @PostMapping("/list")
     @ApiOperation(value = "商品规则获取列表")
-    public Result<List<StoreProductRule>> list(@RequestBody StoreProductRule storeProductRule, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<StoreProductRule>> list(@RequestBody StoreProductRuleParam storeProductRule) {
 
-        PageHelper.startPage(page, size);
+        PageHelper.startPage(storeProductRule.getPage(), storeProductRule.getSize());
 
-        Condition condition = new Condition(storeProductRule.getClass());
+        Condition condition = new Condition(StoreProductRule.class);
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppUserAddressController.java

@@ -8,6 +8,7 @@ import com.txz.mall.core.ResultCode;
 import com.txz.mall.model.UserAddress;
 import com.txz.mall.service.StoreOrderService;
 import com.txz.mall.service.UserAddressService;
+import com.txz.mall.web.param.UserAddressParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -58,7 +59,7 @@ public class AppUserAddressController {
         return Result.success(userAddress.getId());
     }
 
-    @PostMapping("/delete")
+    @DeleteMapping("/delete")
     @ApiOperation(value = "收获地址删除")
     public Result delete(@RequestParam Long id) {
         if (id == null) {
@@ -76,7 +77,7 @@ public class AppUserAddressController {
         return Result.success();
     }
 
-    @PostMapping("/update")
+    @PutMapping("/update")
     @ApiOperation(value = "收获地址更新")
     public Result update(@RequestBody UserAddress userAddress) {
         Long tokenUserId = AuthService.getTokenUserId(null);
@@ -101,7 +102,7 @@ public class AppUserAddressController {
         return Result.success();
     }
 
-    @PostMapping("/detail")
+    @GetMapping("/detail")
     @ApiOperation(value = "收获地址获取详情")
     public Result<UserAddress> detail(@RequestParam Long id) {
         if (id == null) {
@@ -119,13 +120,13 @@ public class AppUserAddressController {
 
     @PostMapping("/list")
     @ApiOperation(value = "收获地址获取列表")
-    public Result<List<UserAddress>> list(@RequestBody UserAddress userAddress, @RequestParam(defaultValue = "1") Integer page, @RequestParam(defaultValue = "10") Integer size) {
+    public Result<List<UserAddress>> list(@RequestBody UserAddressParam userAddress) {
 
         Long tokenUserId = AuthService.getTokenUserId(null);
         userAddress.setUid(tokenUserId);
-        PageHelper.startPage(page, size);
+        PageHelper.startPage(userAddress.getPage(), userAddress.getSize());
 
-        Condition condition = new Condition(userAddress.getClass());
+        Condition condition = new Condition(UserAddress.class);
         Example.Criteria criteria = condition.createCriteria();
         criteria.andEqualTo("isDelete", 0);
         condition.setOrderByClause("create_time DESC");
@@ -143,7 +144,7 @@ public class AppUserAddressController {
         return Result.success(pageInfo);
     }
 
-    @PostMapping("/default")
+    @PutMapping("/default")
     @ApiOperation(value = "设置默认地址")
     public Result defaultAddress(@RequestParam("id") Long id) {
         if (id == null) {
@@ -169,7 +170,7 @@ public class AppUserAddressController {
         return Result.success();
     }
 
-    @PostMapping("/getDefault")
+    @GetMapping("/getDefault")
     @ApiOperation(value = "获取默认地址")
     public Result<UserAddress> getDefault(@RequestParam("uid") Long uid) {
         if (uid == null) {

mall-service/src/main/java/com/txz/mall/controller/appcontroller/AppUserSignController.java

@@ -7,10 +7,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import vo.UserSignDetailVO;
 
 import javax.annotation.Resource;
@@ -39,7 +36,7 @@ public class AppUserSignController {
     }
 
     @ApiOperation(value = "今日记录详情")
-    @PostMapping(value = "/todayDetail")
+    @GetMapping(value = "/todayDetail")
     public Result<UserSignDetailVO> todayDetail() {
 
         Long tokenUserId = AuthService.getTokenUserId(null);

mall-service/src/main/java/com/txz/mall/core/GlobalExceptionHandler.java

@@ -0,0 +1,25 @@
+package com.txz.mall.core;
+
+import org.springframework.validation.FieldError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.HashMap;
+import java.util.Map;
+//@RestControllerAdvice
+//public class GlobalExceptionHandler {
+//
+//    // 处理参数校验失败异常
+//    @ExceptionHandler(MethodArgumentNotValidException.class)
+//    public Map<String, String> handleValidationExceptions(MethodArgumentNotValidException ex) {
+//        Map<String, String> errors = new HashMap<>();
+//        // 获取所有校验失败的字段和消息
+//        ex.getBindingResult().getAllErrors().forEach((error) -> {
+//            String fieldName = ((FieldError) error).getField();
+//            String errorMessage = error.getDefaultMessage();
+//            errors.put(fieldName, errorMessage);
+//        });
+//        return errors;
+//    }
+//}

mall-service/src/main/java/com/txz/mall/web/param/BannerParam.java

@@ -0,0 +1,80 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+@Data
+@NoArgsConstructor
+public class BannerParam extends BasePageParam{
+
+    /**
+     * 组合数据ID
+     */
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 名称
+     */
+    @ApiModelProperty(value = "名称")
+    private String title;
+
+    /**
+     * 图片地址
+     */
+    @ApiModelProperty(value = "图片地址")
+    private String image;
+
+    /**
+     * 0-内链,1-外链
+     */
+    @ApiModelProperty(value = "0-内链,1-外链")
+    private Integer linkType;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(name = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(name = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(name = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(name = "是否删除")
+    private Integer isDelete;
+
+    /**
+     * 跳转地址
+     */
+    @ApiModelProperty(value = "跳转地址")
+    private String link;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer seq;
+
+}

mall-service/src/main/java/com/txz/mall/web/param/BasePageParam.java

@@ -0,0 +1,33 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.validator.constraints.Range;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+@Data
+@ApiModel("分页查询参数")
+@NoArgsConstructor
+public class BasePageParam implements Serializable {
+
+
+    @ApiModelProperty(value = "页码，默认1", example = "1")
+    @Min(value = 1, message = "页码不能小于1")
+    private Integer page = 1;
+
+    @ApiModelProperty(value = "每页条数，默认10，最大100", example = "10")
+    @Range(min = 1, max = 100, message = "每页条数必须在1-100之间")
+    private Integer size = 10;
+
+    @ApiModelProperty(value = "排序字段", example = "createTime")
+    private String sortField;
+
+    @ApiModelProperty(value = "排序方向（ASC/DESC）", example = "DESC")
+    private String sortOrder;
+
+}

mall-service/src/main/java/com/txz/mall/web/param/CategoryParam.java

@@ -0,0 +1,102 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class CategoryParam extends BasePageParam{
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 父级ID
+     */
+    @ApiModelProperty(value = "父级ID")
+    private Long pid;
+
+    /**
+     * 路径
+     */
+    @ApiModelProperty(value = "路径")
+    private String path;
+
+    /**
+     * 分类名称
+     */
+    @ApiModelProperty(value = "分类名称")
+    private String name;
+
+    /**
+     * 类型，1 产品分类，2 附件分类，3 文章分类， 4 设置分类， 5 菜单分类，6 配置分类， 7 秒杀配置
+     */
+    @ApiModelProperty(value = "类型，1 产品分类，2 附件分类，3 文章分类， 4 配置分类， 5 菜单分类，6 配置分类， 7 秒杀配置")
+    private Integer type;
+
+    /**
+     * 地址
+     */
+    @ApiModelProperty(value = "地址")
+    private String url;
+
+    /**
+     * 状态, 1正常，0失效
+     */
+    @ApiModelProperty(value = "状态, 1正常，0失效")
+    private Integer status;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 创建时间
+     */
+
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 扩展字段 Jsos格式
+     */
+
+    @ApiModelProperty(value = "扩展字段 Jsos格式")
+    private String extra;
+
+    /**
+     * 创建人id
+     */
+
+    @ApiModelProperty(value = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(value = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
+}

mall-service/src/main/java/com/txz/mall/web/param/ProductAttrParam.java

@@ -0,0 +1,80 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class ProductAttrParam extends BasePageParam{
+    /**
+     * 主键
+     */
+    @ApiModelProperty(value = "商品ID")
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+
+    @ApiModelProperty(value = "商品ID")
+    private Long productId;
+
+    /**
+     * 属性名
+     */
+
+    @ApiModelProperty(value = "属性名")
+    private String attrName;
+
+    /**
+     * 属性值
+     */
+
+    @ApiModelProperty(value = "属性值")
+    private String attrValues;
+
+
+    @ApiModelProperty(value = "属性值")
+    private String attrImgValues;
+
+    /**
+     * 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
+     */
+    @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团")
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+
+    private Integer isDelete;
+
+}

mall-service/src/main/java/com/txz/mall/web/param/ProductAttrValueParam.java

@@ -0,0 +1,162 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class ProductAttrValueParam extends BasePageParam{
+
+    /**
+     * 主键
+     */
+
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+
+    @ApiModelProperty(value = "商品ID")
+    private Long productId;
+
+    /**
+     * SKU编号
+     */
+
+    @ApiModelProperty(value = "SKU编号")
+    private String skuCode;
+
+    /**
+     * 商品属性索引值 (attr_value|attr_value[|....])
+     */
+    @ApiModelProperty(value = "商品属性索引值 (attr_value|attr_value[|....])")
+    private String suk;
+
+    /**
+     * 属性对应的库存
+     */
+    @ApiModelProperty(value = "属性对应的库存")
+    private Integer stock;
+
+    /**
+     * 库存预警值
+     */
+    @ApiModelProperty(value = "库存预警值")
+    private Integer stockThreshold;
+
+    /**
+     * 销量
+     */
+    @ApiModelProperty(value = "销量")
+    private Integer sales;
+
+    /**
+     * 属性金额
+     */
+    @ApiModelProperty(value = "属性金额")
+    private BigDecimal price;
+
+    /**
+     * 图片
+     */
+    @ApiModelProperty(value = "图片")
+    private String image;
+
+    /**
+     * 成本价
+     */
+    @ApiModelProperty(value = "成本价")
+    private BigDecimal cost;
+
+    /**
+     * 原价
+     */
+    @ApiModelProperty(value = "原价")
+    private BigDecimal otPrice;
+
+    /**
+     * 重量
+     */
+    @ApiModelProperty(value = "重量")
+    private BigDecimal weight;
+
+    /**
+     * 体积
+     */
+    @ApiModelProperty(value = "体积")
+    private BigDecimal volume;
+
+//    /**
+//     * 一级返佣
+//     */
+//    private BigDecimal brokerage;
+//
+//    /**
+//     * 二级返佣
+//     */
+//    @Column(name = "brokerage_two")
+//    private BigDecimal brokerageTwo;
+
+    /**
+     * 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
+     */
+    @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团")
+    private Integer type;
+
+    /**
+     * 活动限购数量
+     */
+    @ApiModelProperty(value = "活动限购数量")
+    private Integer quota;
+
+    /**
+     * 活动限购数量显示
+     */
+    @ApiModelProperty(value = "活动限购数量显示")
+    private Integer quotaShow;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(value = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
+    /**
+     * attr_values 创建更新时的属性对应
+     */
+
+    @ApiModelProperty(value = "attr_values 创建更新时的属性对应")
+    private String attrValue;
+
+
+}

mall-service/src/main/java/com/txz/mall/web/param/StoreFlashActivityParam.java

@@ -0,0 +1,112 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class StoreFlashActivityParam extends BasePageParam {
+
+
+    private Long id;
+
+    /**
+     * 活动名称
+     */
+    @ApiModelProperty(value = "活动名称")
+    private String name;
+
+    /**
+     * 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
+     */
+    @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团")
+    private Integer type;
+
+    /**
+     * 活动开始时间段
+     */
+
+    @ApiModelProperty(value = "活动开始时间段")
+    private Date startTime;
+
+    /**
+     * 活动结束时间段
+     */
+
+    @ApiModelProperty(value = "活动结束时间段")
+    private Date endTime;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
+    /**
+     * 状态 0=关闭 1=开启
+     */
+    @ApiModelProperty(value = "状态 0=关闭 1=开启")
+    private Integer status;
+
+    /**
+     * 活动状态 0待开始  1进行中  2已结束
+     */
+    @ApiModelProperty(value = "活动状态 0待开始  1进行中  2已结束")
+    private Integer activeState;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(value = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
+    /**
+     * 主图
+     */
+    @ApiModelProperty(value = "主图")
+    private String img;
+
+    /**
+     * 轮播图
+     */
+
+    @ApiModelProperty(value = "轮播图")
+    private String sliderImg;
+
+    /**
+     * 内容
+     */
+    @ApiModelProperty(value = "内容")
+    private String content;
+
+
+
+}

mall-service/src/main/java/com/txz/mall/web/param/StoreOrderInfoParam.java

@@ -0,0 +1,148 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class StoreOrderInfoParam extends BasePageParam{
+
+    /**
+     * 主键
+     */
+
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long orderId;
+
+    /**
+     * 商品ID
+     */
+    @ApiModelProperty(value = "商品ID")
+    private Long productId;
+
+    /**
+     * 唯一id
+     */
+//    private String unique;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 订单号
+     */
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
+
+    /**
+     * 商品名称
+     */
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+
+    /**
+     * 规格属性值id
+     */
+    @ApiModelProperty(value = "规格属性值id")
+    private Long attrValueId;
+
+    /**
+     * 商品图片
+     */
+    @ApiModelProperty(value = "商品图片")
+    private String image;
+
+    /**
+     * 商品sku
+     */
+    @ApiModelProperty(value = "商品sku")
+    private String sku;
+
+    /**
+     * 商品价格
+     */
+    @ApiModelProperty(value = "商品价格")
+    private BigDecimal price;
+
+    /**
+     * 购买数量
+     */
+    @ApiModelProperty(value = "购买数量")
+    private Integer payNum;
+
+    /**
+     * 重量
+     */
+    @ApiModelProperty(value = "重量")
+    private BigDecimal weight;
+
+    /**
+     * 体积
+     */
+    @ApiModelProperty(value = "体积")
+    private BigDecimal volume;
+
+    /**
+     * 赠送积分
+     */
+    @ApiModelProperty(value = "赠送积分")
+    private Integer giveIntegral;
+
+    /**
+     * 是否评价，0-未评价，1-已评价
+     */
+    @ApiModelProperty(value = "是否评价")
+    private Integer isReply;
+
+    /**
+     * 是否单独分佣,0-否，1-是
+     */
+    @ApiModelProperty(value = "是否单独分佣")
+    private Integer isSub;
+
+    /**
+     * 会员价
+     */
+    @ApiModelProperty(value = "会员价")
+    private BigDecimal vipPrice;
+
+    /**
+     * 商品类型:0-普通，1-秒杀，2-砍价，3-拼团，4-视频号
+     */
+    @ApiModelProperty(value = "商品类型")
+    private Integer productType;
+
+    /**
+     * 购买东西的详细信息
+     */
+    @ApiModelProperty(value = "购买东西的详细信息")
+    private String info;
+
+    @ApiModelProperty(value = "isDelete")
+    private Integer isDelete;
+
+
+}

mall-service/src/main/java/com/txz/mall/web/param/StoreOrderStatusParam.java

@@ -0,0 +1,45 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class StoreOrderStatusParam extends BasePageParam{
+
+
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long oid;
+
+    /**
+     * 操作类型
+     */
+    @ApiModelProperty(value = "操作类型")
+    private String changeType;
+
+    /**
+     * 操作备注
+     */
+    @ApiModelProperty(value = "操作备注")
+    private String changeMessage;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+
+}

mall-service/src/main/java/com/txz/mall/web/param/StorePinkParam.java

@@ -0,0 +1,168 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class StorePinkParam extends BasePageParam{
+    /**
+     * 拼团ID
+     */
+
+    @ApiModelProperty(value = "拼团ID")
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long uid;
+
+    /**
+     * 订单id 生成
+     */
+    @ApiModelProperty(value = "订单id 生成")
+    private String orderId;
+
+    /**
+     * 订单id  数据库
+     */
+    @ApiModelProperty(value = "订单id  数据库")
+    private Long orderIdKey;
+
+    /**
+     * 购买商品个数
+     */
+    @ApiModelProperty(value = "购买商品个数")
+    private Integer totalNum;
+
+    /**
+     * 购买总金额
+     */
+    @ApiModelProperty(value = "购买总金额")
+    private BigDecimal totalPrice;
+
+    /**
+     * 拼团商品id
+     */
+    @ApiModelProperty(value = "拼团商品id")
+    private Long cid;
+
+    /**
+     * 商品id
+     */
+    @ApiModelProperty(value = "商品id")
+    private Long pid;
+
+    /**
+     * 拼图总人数
+     */
+    @ApiModelProperty(value = "拼图总人数")
+    private Integer people;
+
+    /**
+     * 拼团商品单价
+     */
+    @ApiModelProperty(value = "拼团商品单价")
+    private BigDecimal price;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(value = "开始时间")
+    private Date addTime;
+
+    /**
+     * 结束时间
+     */
+    @ApiModelProperty(value = "结束时间")
+    private Date stopTime;
+
+    /**
+     * 团长id 0为团长
+     */
+    @ApiModelProperty(value = "团长id 0为团长 1不是")
+    private Long kId;
+
+    @ApiModelProperty(value = "幸运儿 默认0  1为幸运儿   (//团长不能是天选)")
+    private Integer lId;
+
+//    /**
+//     * 是否发送模板消息0未发送1已发送
+//     */
+//    @ApiModelProperty(value = "是否发送模板消息 0未发送 1已发送")
+//    @Column(name = "is_tpl")
+//    private Integer isTpl;
+
+    /**
+     * 是否退款 0未退款 1已退款
+     */
+    @ApiModelProperty(value = "是否退款 0未退款 1已退款")
+    private Integer isRefund;
+
+    /**
+     * 状态1进行中2已完成3未完成
+     */
+    @ApiModelProperty(value = "状态 1进行中 2已完成 3未完成")
+    private Integer status;
+
+//    /**
+//     * 是否虚拟拼团
+//     */
+//    @ApiModelProperty(value = "是否虚拟拼团")
+//    @Column(name = "is_virtual")
+//    private Integer isVirtual;
+
+    /**
+     * 用户昵称
+     */
+    @ApiModelProperty(value = "用户昵称")
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    @ApiModelProperty(value = "用户头像")
+    private String avatar;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(value = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
+
+}

mall-service/src/main/java/com/txz/mall/web/param/StoreProductAttrResultParam.java

@@ -0,0 +1,69 @@
+package com.txz.mall.web.param;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class StoreProductAttrResultParam extends BasePageParam{
+
+    /**
+     * 主键
+     */
+
+    private Long id;
+
+    /**
+     * 商品ID
+     */
+    @ApiModelProperty(value = "商品ID")
+    private Long productId;
+
+    /**
+     * 活动类型 0=商品，1=秒杀，2=砍价，3=拼团
+     */
+    @ApiModelProperty(value = "活动类型 0=商品，1=秒杀，2=砍价，3=拼团")
+    private Integer type;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(value = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
+    /**
+     * 商品属性参数
+     */
+    @ApiModelProperty(value = "商品属性参数")
+    private String result;
+
+}

mall-service/src/main/java/com/txz/mall/web/param/StoreProductRuleParam.java

@@ -0,0 +1,61 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class StoreProductRuleParam extends BasePageParam{
+
+
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /**
+     * 规格名称
+     */
+    @ApiModelProperty(value = "规格名称")
+    private String ruleName;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+    @ApiModelProperty(value = "创建人id")
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+    @ApiModelProperty(value = "更新人id")
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(value = "是否删除")
+    private Integer isDelete;
+
+    /**
+     * 规格值
+     */
+    @ApiModelProperty(value = "规格值")
+    private String ruleValue;
+}

mall-service/src/main/java/com/txz/mall/web/param/UserAddressParam.java

@@ -0,0 +1,126 @@
+package com.txz.mall.web.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+public class UserAddressParam extends BasePageParam{
+
+    /**
+     * 用户地址id
+     */
+
+    private Long id;
+
+    /**
+     * 用户id
+     */
+    @ApiModelProperty(value = "用户id")
+    private Long uid;
+
+    /**
+     * 收货人姓名
+     */
+    @ApiModelProperty(value = "收货人姓名")
+    private String realName;
+
+    /**
+     * 收货人电话
+     */
+    @ApiModelProperty(value = "收货人电话")
+    private String phone;
+
+    /**
+     * 收货人所在省
+     */
+    @ApiModelProperty(value = "收货人所在省")
+    private String province;
+
+    /**
+     * 收货人所在市
+     */
+    @ApiModelProperty(value = "收货人所在市")
+    private String city;
+
+    /**
+     * 收货人所在区
+     */
+    @ApiModelProperty(value = "收货人所在区")
+    private String district;
+
+    /**
+     * 街道
+     */
+    @ApiModelProperty(value = "街道")
+    private String street;
+
+    /**
+     * 收货人详细地址
+     */
+    @ApiModelProperty(value = "收货人详细地址")
+    private String detail;
+
+    /**
+     * 邮编
+     */
+    @ApiModelProperty(value = "邮编")
+    private String postCode;
+
+    /**
+     * 经度
+     */
+    @ApiModelProperty(value = "经度")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    @ApiModelProperty(value = "纬度")
+    private String latitude;
+
+    /**
+     * 是否默认
+     */
+    @ApiModelProperty(value = "是否默认")
+    private Integer isDefault;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+
+    private Date updateTime;
+
+    /**
+     * 创建人id
+     */
+
+    private Long createUserId;
+
+    /**
+     * 更新人id
+     */
+
+    private Long updateUserId;
+
+    /**
+     * 是否删除
+     */
+
+    private Integer isDelete;
+
+
+}

mall-service/src/main/java/com/txz/mall/web/param/addparam/StoreCombinationAddParam.java

@@ -0,0 +1,16 @@
+package com.txz.mall.web.param.addparam;
+
+import com.txz.mall.model.StoreCombination;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+@Data
+public class StoreCombinationAddParam implements Serializable {
+
+    private Long activityId;
+
+    private List<StoreCombination> list;
+
+
+}

mall-service/src/main/java/dto/PreOrderRequest.java

@@ -12,15 +12,6 @@ import java.util.List;
 
 /**
  * 预下单请求对象
- * +----------------------------------------------------------------------
- * | CRMEB [ CRMEB赋能开发者，助力企业发展 ]
- * +----------------------------------------------------------------------
- * | Copyright (c) 2016~2022 https://www.crmeb.com All rights reserved.
- * +----------------------------------------------------------------------
- * | Licensed CRMEB并不是自由软件，未经许可不能去掉CRMEB相关版权
- * +----------------------------------------------------------------------
- * | Author: CRMEB Team <admin@crmeb.com>
- * +----------------------------------------------------------------------
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

mall-service/src/main/java/dto/StoreOrderAppDTO.java

@@ -6,13 +6,14 @@
  */
 package dto;
 
+import com.txz.mall.web.param.BasePageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
-public class StoreOrderAppDTO implements Serializable {
+public class StoreOrderAppDTO extends BasePageParam {
 
     @ApiModelProperty(value = "类型 0-全部all  1-待支付topay 2-拼团成功success 3-拼团失败failed 4-拼团奖励reward")
     private Integer type;

mall-service/src/main/java/dto/StoreOrderDTO.java

@@ -6,6 +6,7 @@
  */
 package dto;
 
+import com.txz.mall.web.param.BasePageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +15,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-public class StoreOrderDTO implements Serializable {
+public class StoreOrderDTO extends BasePageParam {
 
     private Long id;
 

mall-service/src/main/java/dto/StoreProductDTO.java

@@ -6,6 +6,7 @@
  */
 package dto;
 
+import com.txz.mall.web.param.BasePageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -14,7 +15,7 @@ import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
-public class StoreProductDTO implements Serializable {
+public class StoreProductDTO extends BasePageParam {
     /**
      * 商品id
      */