|
@@ -82,7 +82,7 @@ public class ProductPageApi {
|
|
@ApiImplicitParam(required = false, name = "userId", value = "用户id"),
|
|
@ApiImplicitParam(required = false, name = "userId", value = "用户id"),
|
|
@ApiImplicitParam(required = false, name = "source", value = "来源:1网站,2小程序")
|
|
@ApiImplicitParam(required = false, name = "source", value = "来源:1网站,2小程序")
|
|
})
|
|
})
|
|
- @IpSave(saveName = "首页楼层",saveParams = true)
|
|
|
|
|
|
+ @IpSave(saveName = "首页楼层", saveParams = true)
|
|
@GetMapping("/home/floor")
|
|
@GetMapping("/home/floor")
|
|
public ResponseJson<Map<String, Object>> getHomeData(Integer userId, Integer source) {
|
|
public ResponseJson<Map<String, Object>> getHomeData(Integer userId, Integer source) {
|
|
return pageService.getHomeData(userId, source);
|
|
return pageService.getHomeData(userId, source);
|
|
@@ -101,20 +101,20 @@ public class ProductPageApi {
|
|
|
|
|
|
})
|
|
})
|
|
@ApiOperation("新品橱窗列表")
|
|
@ApiOperation("新品橱窗列表")
|
|
- @IpSave(saveName = "新品橱窗商品列表",saveParams = false)
|
|
|
|
|
|
+ @IpSave(saveName = "新品橱窗商品列表", saveParams = false)
|
|
@GetMapping("/home/NewFloorList")
|
|
@GetMapping("/home/NewFloorList")
|
|
public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer source,
|
|
public ResponseJson<PaginationVo<ProductItemVo>> getNewFloorList(Integer source,
|
|
Integer userId,
|
|
Integer userId,
|
|
- @RequestParam(value = "brandID",required=false)List<String> brandID,
|
|
|
|
|
|
+ @RequestParam(value = "brandID", required = false) List<String> brandID,
|
|
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
|
|
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
|
|
@RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
|
|
@RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
|
|
|
|
|
|
- return pageService.getNewFloorList(source,userId,brandID,pageNum,pageSize);
|
|
|
|
|
|
+ return pageService.getNewFloorList(source, userId, brandID, pageNum, pageSize);
|
|
}
|
|
}
|
|
|
|
|
|
@ApiOperation("新品橱窗品牌查询")
|
|
@ApiOperation("新品橱窗品牌查询")
|
|
@GetMapping("/home/BrandName")
|
|
@GetMapping("/home/BrandName")
|
|
- public ResponseJson <List<BrandVo>>getNewFloorBrand() {
|
|
|
|
|
|
+ public ResponseJson<List<BrandVo>> getNewFloorBrand() {
|
|
|
|
|
|
return pageService.getNewFloorBrand();
|
|
return pageService.getNewFloorBrand();
|
|
}
|
|
}
|
|
@@ -130,6 +130,7 @@ public class ProductPageApi {
|
|
public ResponseJson<Map<String, Object>> getHomeInit(Integer source) {
|
|
public ResponseJson<Map<String, Object>> getHomeInit(Integer source) {
|
|
return pageService.getHomeInit(source);
|
|
return pageService.getHomeInit(source);
|
|
}
|
|
}
|
|
|
|
+
|
|
@ApiOperation("公告展示列表")
|
|
@ApiOperation("公告展示列表")
|
|
@ApiImplicitParam(required = false, name = "source", value = "来源:1网站,2小程序")
|
|
@ApiImplicitParam(required = false, name = "source", value = "来源:1网站,2小程序")
|
|
@GetMapping("/home/title")
|
|
@GetMapping("/home/title")
|
|
@@ -141,7 +142,7 @@ public class ProductPageApi {
|
|
@ApiOperation("公告展示内容页面")
|
|
@ApiOperation("公告展示内容页面")
|
|
@GetMapping("/home/capacity")
|
|
@GetMapping("/home/capacity")
|
|
public ResponseJson<AnnouncementPo> getcapacity(Integer id) {
|
|
public ResponseJson<AnnouncementPo> getcapacity(Integer id) {
|
|
- if (id == null || id==0) {
|
|
|
|
|
|
+ if (id == null || id == 0) {
|
|
return ResponseJson.error("参数异常", null);
|
|
return ResponseJson.error("参数异常", null);
|
|
}
|
|
}
|
|
return pageService.getcapacity(id);
|
|
return pageService.getcapacity(id);
|
|
@@ -150,15 +151,13 @@ public class ProductPageApi {
|
|
@ApiOperation("根据id查自由页")
|
|
@ApiOperation("根据id查自由页")
|
|
@GetMapping("/home/free")
|
|
@GetMapping("/home/free")
|
|
public ResponseJson<CmPageVo> getFree(Integer id) {
|
|
public ResponseJson<CmPageVo> getFree(Integer id) {
|
|
- if (id == null || id==0) {
|
|
|
|
|
|
+ if (id == null || id == 0) {
|
|
return ResponseJson.error("参数异常", null);
|
|
return ResponseJson.error("参数异常", null);
|
|
}
|
|
}
|
|
return pageService.getFree(id);
|
|
return pageService.getFree(id);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 首页侧边栏数据(小程序)
|
|
* 首页侧边栏数据(小程序)
|
|
*
|
|
*
|
|
@@ -255,14 +254,14 @@ public class ProductPageApi {
|
|
*
|
|
*
|
|
* @param productId 商品Id
|
|
* @param productId 商品Id
|
|
* @param userId 用户Id
|
|
* @param userId 用户Id
|
|
- * Statistics统计存入Redis的hash => prefix + ":" + field + ":" + date("yyyyMMdd");
|
|
|
|
|
|
+ * Statistics统计存入Redis的hash => prefix + ":" + field + ":" + date("yyyyMMdd");
|
|
*/
|
|
*/
|
|
@ApiOperation("商品详情页(旧:/product/details)")
|
|
@ApiOperation("商品详情页(旧:/product/details)")
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParams({
|
|
@ApiImplicitParam(required = false, name = "userId", value = "用户id"),
|
|
@ApiImplicitParam(required = false, name = "userId", value = "用户id"),
|
|
@ApiImplicitParam(required = false, name = "productId", value = "商品Id")
|
|
@ApiImplicitParam(required = false, name = "productId", value = "商品Id")
|
|
})
|
|
})
|
|
- @IpSave(saveName = "商品详情",saveParams = true)
|
|
|
|
|
|
+ @IpSave(saveName = "商品详情", saveParams = true)
|
|
@Statistics(prefix = "statistics_details", field = "productId")
|
|
@Statistics(prefix = "statistics_details", field = "productId")
|
|
@GetMapping("/product/details")
|
|
@GetMapping("/product/details")
|
|
public ResponseJson<ProductDetailVo> getProductDetails(Integer productId, Integer userId) {
|
|
public ResponseJson<ProductDetailVo> getProductDetails(Integer productId, Integer userId) {
|
|
@@ -368,6 +367,7 @@ public class ProductPageApi {
|
|
@ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
|
|
@ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
|
|
@ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
|
|
@ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
|
|
})
|
|
})
|
|
|
|
+ @IpSave(saveName = "美业资料搜索", saveParams = true)
|
|
@GetMapping("/product/archive")
|
|
@GetMapping("/product/archive")
|
|
public ResponseJson<PaginationVo<ArchiveVo>> getProductArchive(String keyword, Integer productType,
|
|
public ResponseJson<PaginationVo<ArchiveVo>> getProductArchive(String keyword, Integer productType,
|
|
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
|
|
@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
|
|
@@ -447,7 +447,7 @@ public class ProductPageApi {
|
|
@ApiOperation("采美百科产品仪器页面数据")
|
|
@ApiOperation("采美百科产品仪器页面数据")
|
|
@ApiImplicitParam(required = true, name = "commodityType", value = "商品类型:1产品,2仪器")
|
|
@ApiImplicitParam(required = true, name = "commodityType", value = "商品类型:1产品,2仪器")
|
|
@GetMapping("/baike/page")
|
|
@GetMapping("/baike/page")
|
|
- public ResponseJson<List<BaikeTypeVo>> getBaikePageData(Integer commodityType){
|
|
|
|
|
|
+ public ResponseJson<List<BaikeTypeVo>> getBaikePageData(Integer commodityType) {
|
|
if (null == commodityType) {
|
|
if (null == commodityType) {
|
|
return ResponseJson.error("参数异常", null);
|
|
return ResponseJson.error("参数异常", null);
|
|
}
|
|
}
|
|
@@ -465,8 +465,8 @@ public class ProductPageApi {
|
|
})
|
|
})
|
|
@GetMapping("/baike/type")
|
|
@GetMapping("/baike/type")
|
|
public ResponseJson<PaginationVo<BaikeProductVo>> getBaikeTypeData(Integer typeId,
|
|
public ResponseJson<PaginationVo<BaikeProductVo>> getBaikeTypeData(Integer typeId,
|
|
- @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
|
|
|
|
- @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
|
|
|
|
|
|
+ @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
|
|
|
|
+ @RequestParam(value = "pageSize", defaultValue = "20") int pageSize) {
|
|
if (null == typeId) {
|
|
if (null == typeId) {
|
|
return ResponseJson.error("参数异常", null);
|
|
return ResponseJson.error("参数异常", null);
|
|
}
|
|
}
|