java/qijisheng.git

			@@ -10,6 +10,7 @@
			import com.ruoyi.common.core.web.controller.BaseController;
			import com.ruoyi.common.core.web.page.PageInfo;
			import com.ruoyi.common.core.web.page.TableDataInfo;
			import com.ruoyi.common.redis.annotation.DistributedLock;
			import com.ruoyi.other.api.domain.Goods;
			import com.ruoyi.other.api.domain.VipSetting;
			import com.ruoyi.other.api.feignClient.VipSettingClient;
			@@ -47,6 +48,9 @@
			@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();
			}
			@@ -77,6 +81,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);
			@@ -172,11 +179,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
			@@ -188,8 +198,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
			@@ -220,5 +230,29 @@
			goodsService.updateBatchById(goods);
			return R.ok();
			}


			/**
			* 商品销量增加
			*/
			@PutMapping("/editGoodsNum")
			@DistributedLock(lockNamePre = "#goods_lock", lockNamePost = "#goodsId")
			public R<Void> editGoodsNum(@RequestParam("goodsId") Integer goodsId, @RequestParam("num") Integer num){
			Goods goods = goodsService.getById(goodsId);
			goods.setSaleNum(goods.getSaleNum() + num);
			goodsService.updateById(goods);
			return R.ok();
			}


			/**
			* 获取所有商品
			* @return
			*/
			@PostMapping("/getAllGoods")
			public R<List<Goods>> getAllGoods(){
			List<Goods> list = goodsService.list(new LambdaQueryWrapper<Goods>().eq(Goods::getDelFlag, 0).eq(Goods::getStatus, 2));
			return R.ok(list);
			}
			}