From 91e9c006a2ce431a5916b137974bd004622eb9fa Mon Sep 17 00:00:00 2001 From: huliguo <2023611923@qq.com> Date: 星期三, 09 四月 2025 20:15:45 +0800 Subject: [PATCH] 用户端代码调整测试 --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 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 60dc06f..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(); } @@ -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