From cc134fa83edea4865b48d7afc1acda5ad70e7465 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 13 一月 2025 11:20:05 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsController.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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 3cc2ec4..1a20f52 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
@@ -13,6 +14,7 @@
import com.ruoyi.other.api.domain.VipSetting;
import com.ruoyi.other.api.feignClient.VipSettingClient;
import com.ruoyi.other.service.GoodsService;
+import com.ruoyi.other.service.VipSettingService;
import com.ruoyi.other.vo.GoodsVO;
import io.swagger.annotations.*;
import org.springframework.web.bind.annotation.*;
@@ -36,6 +38,8 @@
private GoodsService goodsService;
@Resource
private VipSettingClient settingClient;
+ @Resource
+ private VipSettingService vipSettingService;
/**
* 添加商品
@@ -74,6 +78,16 @@
@ApiOperation(value = "商品修改", tags = {"管理后台-商品管理"})
public R<Void> manageGoodsUpdate(@RequestBody Goods goods){
goodsService.updateManageGoods(goods);
+ if (goods.getType()==2){
+ goods.setAppointStore(2);
+ goodsService.updateById(goods);
+ }
+ if (goods.getType()==1){
+ LambdaUpdateWrapper<Goods> goodsLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+ goodsLambdaUpdateWrapper.set(Goods::getDistributionMode,null);
+ goodsLambdaUpdateWrapper.eq(Goods::getId, goods.getId());
+ goodsService.update(goodsLambdaUpdateWrapper);
+ }
return R.ok();
}
@@ -112,6 +126,10 @@
@DeleteMapping("/manageGoodsDelete/{goodsId}")
@ApiOperation(value = "商品删除", tags = {"管理后台-商品管理"})
public R<Void> manageGoodsDelete(@PathVariable("goodsId") Long goodsId){
+ long count = vipSettingService.count(new LambdaQueryWrapper<VipSetting>().last(" where FIND_IN_SET(" + goodsId + ", good_ids)"));
+ if(0 < count){
+ return R.fail("商品已被会员配置使用，不能删除");
+ }
goodsService.removeById(goodsId);
return R.ok();
}
@@ -154,8 +172,8 @@
*/
@GetMapping("/goodsDetail/{goodsId}")
@ApiOperation(value = "商品详情", tags = {"小程序-商城-首页"})
- public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId){
- return R.ok(goodsService.goodsDetail(goodsId));
+ public R<GoodsVO> goodsDetail(@PathVariable("goodsId") Long goodsId, String longitude, String latitude){
+ return R.ok(goodsService.goodsDetail(goodsId, longitude, latitude));
}
@@ -191,5 +209,16 @@
return R.ok(goods);
}
+
+ /**
+ * 编辑商品
+ * @param goods
+ * @return
+ */
+ @PostMapping("/editGoodsList")
+ public R editGoodsList(@RequestBody List<Goods> goods){
+ goodsService.updateBatchById(goods);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1