添加商品分页分支

src/main/java/com/sqx/modules/goods/controller/GoodsShopController.java

@@ -122,7 +122,7 @@ public class GoodsShopController {
         return goodsShopService.selectGoodsShop(phone,msg);
     }
 
-        @ApiOperation("修改商户信息")
+    @ApiOperation("修改商户信息")
     @PostMapping("/updateGoodsShop")
     public Result updateGoodsShop(@RequestBody GoodsShop goodsShop){
         if (ObjectUtils.isEmpty(goodsShop.getShopTypeId())) {

src/main/java/com/sqx/modules/goods/controller/app/AppGoodsController.java

@@ -34,9 +34,9 @@ public class AppGoodsController {
 
     @ApiOperation("根据商铺id查看商品列表")
     @GetMapping(value = "/selectGoodsList")
-    public Result selectGoodsList(Long shopId, Double lng, Double lat){
+    public Result selectGoodsList(Long shopId, Double lng, Double lat,Integer page, Integer limit){
 
-        return goodsService.selectGoodsList(shopId, lng, lat);
+        return goodsService.selectGoodsList(shopId, lng, lat,page,limit);
     }
 
     @ApiOperation("查看商品详情")

src/main/java/com/sqx/modules/goods/dao/GoodsDao.java

@@ -26,7 +26,7 @@ public interface GoodsDao extends BaseMapper<Goods> {
 
     int shopAddGoods(@Param("shopId") Long shopId,@Param("goodsIdList") List goodsIdList);
 
-    List<Goods> selectGoodsByClassify(@Param("classifyId") Integer classifyId, @Param("shopId") Long shopId);
+    List<Goods>  selectGoodsByClassify(@Param("classifyId") Integer classifyId, @Param("shopId") Long shopId);
 
     List<Goods> selectGoodsBySales(Long shopId);
 

src/main/java/com/sqx/modules/goods/service/GoodsService.java

@@ -16,7 +16,7 @@ public interface GoodsService extends IService<Goods> {
 
     Result selectGoodsById(Long goodsId);
 
-    Result selectGoodsList(Long shopId, Double lng, Double lat);
+    Result selectGoodsList(Long shopId, Double lng, Double lat,Integer page, Integer limit);
 
     Result updateGoods(Goods goods);
 

src/main/java/com/sqx/modules/goods/service/impl/GoodsServiceImpl.java

@@ -170,10 +170,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
 
 
     @Override
-    public Result selectGoodsList(Long shopId, Double lng, Double lat) {
+    public Result selectGoodsList(Long shopId, Double lng, Double lat,Integer page, Integer limit) {
         GoodsShop goodsShop = goodsShopDao.selectGoodsList(shopId, lng, lat);
         //List<Goods> goodsList = goodsDao.selectGoodsClassifyList(shopId);
-        List<GoodsClassify> goodsClassifies = goodsDao.selectAllClassifyList(null, shopId);
+        Page<GoodsClassify> pages = new Page<>(page,limit);
+        IPage<GoodsClassify> goodsClassifyIPage = goodsDao.selectAllClassify(pages,null, shopId);
+//        List<GoodsClassify> goodsClassifyIPage = goodsDao.selectAllClassifyList(null, shopId);
+
+        List<GoodsClassify> goodsClassifies = goodsClassifyIPage.getRecords();
         List<Map<String, Object>> list = new ArrayList<>();
         for (int i = 0; i < goodsClassifies.size(); i++) {
             Map<String, Object> hashMap = new HashMap<>();
@@ -197,6 +201,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
         Map<String, Object> result = new HashMap<>();
         result.put("goodsShop", goodsShop);
         result.put("list", list);
+        result.put("pages", goodsClassifyIPage.getPages());
+        result.put("current", goodsClassifyIPage.getCurrent());
+        result.put("size", goodsClassifyIPage.getSize());
+        result.put("total", goodsClassifyIPage.getTotal());
         return Result.success().put("data", result);
     }
 

src/main/java/com/sqx/modules/goods/vo/GoodsShopVo.java

@@ -33,7 +33,7 @@ public class GoodsShopVo implements Serializable {
 
 
     @ApiModelProperty("商铺类型id")
-    private Long shopTypeId;
+    private String shopTypeId;
 
 
     @ApiModelProperty("商铺标签")

src/main/resources/application.yml

@@ -21,7 +21,7 @@ spring:
     allow-circular-references: true
   # 环境 dev|test|prod
   profiles:
-    active: dev
+    active: prod
   # jackson时间格式化
   jackson:
     time-zone: GMT+8