From 07de03ccae02d00be243911a003115fe9b24f863 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期二, 08 四月 2025 16:07:07 +0800
Subject: [PATCH] 订单部分+个人中心部分
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
index 5951435..e0d3790 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java
@@ -85,7 +85,7 @@
@PutMapping("/manageGoodsUpdate")
@ApiOperation(value = "商品修改", tags = {"管理后台-商品管理"})
public R<Void> manageGoodsUpdate(@RequestBody Goods goods){
- if(goods.getPurchaseLimit()==null){
+ /* if(goods.getPurchaseLimit()==null){
goods.setPurchaseLimit(-1);
}
goodsService.updateManageGoods(goods);
@@ -98,7 +98,7 @@
goodsLambdaUpdateWrapper.set(Goods::getDistributionMode,null);
goodsLambdaUpdateWrapper.eq(Goods::getId, goods.getId());
goodsService.update(goodsLambdaUpdateWrapper);
- }
+ }*/
return R.ok();
}
@@ -162,9 +162,9 @@
*/
@GetMapping("/getGoodsListByShopId")
@ApiOperation(value = "商品购买列表", tags = {"小程序-首页-门店详情"})
- public R<PageInfo<Goods>> getGoodsListByShopId(@ApiParam("门店id") Integer shopId, Integer pageCurr, Integer pageSize) {
- PageInfo<Goods> pageInfo = new PageInfo(pageCurr, pageSize);
- List<Goods> goodsList = goodsService.getGoodsListByShopId(pageInfo, shopId);
+ public R<PageInfo<GoodsVO>> getGoodsListByShopId(@ApiParam("门店id") Integer shopId, Integer pageCurr, Integer pageSize) {
+ PageInfo<GoodsVO> pageInfo = new PageInfo(pageCurr, pageSize);
+ List<GoodsVO> goodsList = goodsService.getGoodsListByShopId(pageInfo, shopId);
return R.ok(pageInfo.setRecords(goodsList));
}
@@ -174,23 +174,19 @@
*/
@GetMapping("/goodsDetail/{goodsId}")
@ApiOperation(value = "商品详情", tags = {"小程序-商城-首页"})
- public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId,
- Integer shopId,
- String longitude,
- String latitude) {
- return R.ok(goodsService.goodsDetail(goodsId, shopId, longitude, latitude));
+ public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId) {
+ return R.ok(goodsService.goodsDetail(goodsId));
}
/**
- * 根据类型（1=服务商品，2=单品商品）获取商品数据
- * @param type
+ * 获取商品数据
* @return
*/
@ResponseBody
@PostMapping("/getGoodsByType")
- public R<List<Goods>> getGoodsByType(@RequestParam("type") Integer type){
- List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getType, type).eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
+ public R<List<Goods>> getGoodsByType(){
+ List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
return R.ok(list);
}
--
Gitblit v1.7.1