迭代版本：2.28

luofl

2025-03-06 2ed6444f45d227e2acc6de65c3e8b582440fb83a

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java

@@ -48,6 +48,22 @@
    @PostMapping("/addGoods")
    @ApiOperation(value = "发布商品", tags = {"管理后台-商品管理"})
    public R<Void> addGoods(@RequestBody Goods goods) {
        if(goods.getPurchaseLimit()==null){
            goods.setPurchaseLimit(-1);
        }
        goodsService.addGoods(goods);
        return R.ok();
    }

    /**
     * 商品克隆
     */
    @GetMapping("/cloneGoods")
    @ApiOperation(value = "商品克隆", tags = {"管理后台-商品管理"})
    public R<Void> cloneGoods(@RequestParam Long goodsId,@RequestParam String goodsName) {
        Goods goods = goodsService.getManageGoodsDetail(goodsId);
        goods.setId(null);
        goods.setName(goodsName);
        goodsService.addGoods(goods);
        return R.ok();
    }
@@ -78,6 +94,9 @@
    @PutMapping("/manageGoodsUpdate")
    @ApiOperation(value = "商品修改", tags = {"管理后台-商品管理"})
    public R<Void> manageGoodsUpdate(@RequestBody Goods goods){
        if(goods.getPurchaseLimit()==null){
            goods.setPurchaseLimit(-1);
        }
        goodsService.updateManageGoods(goods);
        if (goods.getType()==2){
            goods.setAppointStore(2);
@@ -131,7 +150,9 @@
        if(0 < count){
            return R.fail("商品已被会员配置使用，不能删除");
        }
        goodsService.removeById(goodsId);
        Goods goods = goodsService.getById(goodsId);
        goods.setDelFlag(1);
        goodsService.updateById(goods);
        return R.ok();
    }

@@ -173,11 +194,14 @@
     */
    @GetMapping("/goodsDetail/{goodsId}")
    @ApiOperation(value = "商品详情", tags = {"小程序-商城-首页"})
    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId, String longitude, String latitude){
        return R.ok(goodsService.goodsDetail(goodsId, longitude, latitude));
    public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId,
                                  Integer shopId,
                                  String longitude,
                                  String latitude) {
        return R.ok(goodsService.goodsDetail(goodsId, shopId, longitude, latitude));
    }
    
    


    /**
     * 根据类型（1=服务商品，2=单品商品）获取商品数据
     * @param type
@@ -189,8 +213,8 @@
        List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getType, type).eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
        return R.ok(list);
    }
    
    


    /**
     * 根据id获取商品信息
     * @param id