From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java | 221 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 164 insertions(+), 57 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
index 8c6e644..774ff5c 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.GoodsBargainPrice;
@@ -9,18 +11,20 @@
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
import com.ruoyi.other.service.GoodsBargainPriceDetailService;
import com.ruoyi.other.service.GoodsBargainPriceService;
+import com.ruoyi.other.vo.AddGoodsBargainPriceVo;
+import com.ruoyi.other.vo.GoodsBargainPriceInfo;
import com.ruoyi.system.api.model.LoginUser;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.*;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.List;
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -28,64 +32,167 @@
*/
@RestController
@RequestMapping("/goods-bargain-price")
+@Api("门店特殊售价")
public class GoodsBargainPriceController {
-
- @Resource
- private GoodsBargainPriceService goodsBargainPriceService;
-
- @Resource
- private GoodsBargainPriceDetailService goodsBargainPriceDetailService;
- @Resource
- private TokenService tokenService;
-
-
- /**
- * 根据商品id和会员等级获取门店特价
- * @param goodsBargainPrice
- * @return
- */
- @PostMapping("/getGoodsBargainPrice")
- public R<GoodsBargainPriceDetail> getGoodsBargainPrice(@RequestBody GetGoodsBargainPrice goodsBargainPrice){
- GoodsBargainPrice one = goodsBargainPriceService.getOne(new LambdaQueryWrapper<GoodsBargainPrice>()
- .eq(GoodsBargainPrice::getGoodsId, goodsBargainPrice.getGoodsId())
- .eq(GoodsBargainPrice::getShopId, goodsBargainPrice.getShopId())
- .eq(GoodsBargainPrice::getAuditStatus, 1)
- .eq(GoodsBargainPrice::getDelFlag, 0)
- .orderByDesc(GoodsBargainPrice::getCreateTime)
- .last(" limit 0,1"));
- if(null == one){
- return R.ok();
- }
- GoodsBargainPriceDetail detailServiceOne = goodsBargainPriceDetailService.getOne(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
- .eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, one.getId()).eq(GoodsBargainPriceDetail::getVip, goodsBargainPrice.getVip()));
- return R.ok(detailServiceOne);
- }
+ @Resource
+ private GoodsBargainPriceService goodsBargainPriceService;
- /**
- * 新增
- */
- @PostMapping("/add")
- public R<Void> add(@RequestBody GoodsBargainPrice goodsBargainPrice) {
- LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- goodsBargainPrice.setAuditStatus(0);
- goodsBargainPrice.setCreateUserId(loginUserApplet.getUserid());
- goodsBargainPriceService.save(goodsBargainPrice);
+ @Resource
+ private GoodsBargainPriceDetailService goodsBargainPriceDetailService;
- List<GoodsBargainPriceDetail> goodsBargainPriceDetailList = goodsBargainPrice.getGoodsBargainPriceDetailList();
- if (goodsBargainPriceDetailList == null || goodsBargainPriceDetailList.isEmpty()){
- return R.fail("添加失败");
- }
- for (GoodsBargainPriceDetail goodsBargainPriceDetail : goodsBargainPriceDetailList) {
- goodsBargainPriceDetail.setGoodsBargainPriceId(goodsBargainPrice.getId());
- }
- goodsBargainPriceDetailService.saveBatch(goodsBargainPriceDetailList);
- return R.ok();
- }
+ @Resource
+ private TokenService tokenService;
-
-
+ /**
+ * 根据商品id和会员等级获取门店特价
+ *
+ */
+ @PostMapping("/getGoodsBargainPrice")
+ public R<GoodsBargainPriceDetail> getGoodsBargainPrice(@RequestBody GetGoodsBargainPrice goodsBargainPrice) {
+ GoodsBargainPrice one = goodsBargainPriceService.getOne(new LambdaQueryWrapper<GoodsBargainPrice>()
+ .eq(GoodsBargainPrice::getGoodsId, goodsBargainPrice.getGoodsId())
+ .eq(GoodsBargainPrice::getShopId, goodsBargainPrice.getShopId())
+ .eq(GoodsBargainPrice::getAuditStatus, 1)
+ .eq(GoodsBargainPrice::getDelFlag, 0)
+ .orderByDesc(GoodsBargainPrice::getCreateTime)
+ .last(" limit 0,1"));
+ if (null == one) {
+ return R.ok();
+ }
+ GoodsBargainPriceDetail detailServiceOne = goodsBargainPriceDetailService.getOne(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
+ .eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, one.getId()).eq(GoodsBargainPriceDetail::getVip, goodsBargainPrice.getVip()));
+ return R.ok(detailServiceOne);
+ }
+
+ /**
+ * 新增
+ */
+ @PostMapping("/add")
+ @ApiOperation(value = "新增", tags = {"管理后台-商品管理-门店特殊售价"})
+ @Transactional(rollbackFor = Exception.class)
+ public R<Void> add(@RequestBody GoodsBargainPrice goodsBargainPrice) {
+ LoginUser loginUserApplet = tokenService.getLoginUserApplet();
+ goodsBargainPrice.setAuditStatus(0);
+ goodsBargainPrice.setCreateUserId(loginUserApplet.getUserid());
+ goodsBargainPriceService.save(goodsBargainPrice);
+ saveGoodsBargainPriceDetail(goodsBargainPrice);
+ return R.ok();
+ }
+
+ private void saveGoodsBargainPriceDetail(@RequestBody GoodsBargainPrice goodsBargainPrice) {
+ List<GoodsBargainPriceDetail> goodsBargainPriceDetailList = goodsBargainPrice.getGoodsBargainPriceDetailList();
+ if (goodsBargainPriceDetailList == null || goodsBargainPriceDetailList.isEmpty()) {
+ throw new RuntimeException("请输入明细");
+ }
+ for (GoodsBargainPriceDetail goodsBargainPriceDetail : goodsBargainPriceDetailList) {
+ goodsBargainPriceDetail.setGoodsBargainPriceId(goodsBargainPrice.getId());
+ }
+ goodsBargainPriceDetailService.saveBatch(goodsBargainPriceDetailList);
+ }
+
+ /**
+ * 删除
+ */
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "删除", tags = {"管理后台-商品管理-门店特殊售价-"})
+ public R<Void> delete(@ApiParam("id") @RequestParam("id") Integer id) {
+ goodsBargainPriceService.removeById(id);
+ goodsBargainPriceDetailService.remove(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
+ .eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, id));
+ return R.ok();
+ }
+
+ /**
+ * 修改
+ */
+ @PutMapping("/edit")
+ @ApiOperation(value = "修改", tags = {"管理后台-商品管理-门店特殊售价"})
+ @Transactional(rollbackFor = Exception.class)
+ public R<Void> edit(@RequestBody GoodsBargainPrice goodsBargainPrice) {
+ goodsBargainPriceService.updateById(goodsBargainPrice);
+ goodsBargainPriceDetailService.remove(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
+ .eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, goodsBargainPrice.getId()));
+ saveGoodsBargainPriceDetail(goodsBargainPrice);
+ return R.ok();
+ }
+
+ /**
+ * 详情
+ */
+ @GetMapping("/detail")
+ @ApiOperation(value = "详情", tags = {"管理后台-商品管理-门店特殊售价"})
+ public R<GoodsBargainPrice> detail(@ApiParam("id") @RequestParam("id") Integer id) {
+ GoodsBargainPrice goodsBargainPrice = goodsBargainPriceService.getById(id);
+ List<GoodsBargainPriceDetail> goodsBargainPriceDetailList = goodsBargainPriceDetailService.list(new LambdaQueryWrapper<GoodsBargainPriceDetail>()
+ .eq(GoodsBargainPriceDetail::getGoodsBargainPriceId, id));
+ goodsBargainPrice.setGoodsBargainPriceDetailList(goodsBargainPriceDetailList);
+ return R.ok(goodsBargainPrice);
+ }
+
+ /**
+ * 列表
+ */
+ @GetMapping("/list")
+ @ApiOperation(value = "列表", tags = {"管理后台-商品管理-门店特殊售价"})
+ public R<IPage<GoodsBargainPrice>> list(@ApiParam("页码") @RequestParam(value = "pageNum", required = false) Integer pageNum,
+ @ApiParam("每页数量") @RequestParam(value = "pageSize", required = false) Integer pageSize,
+ @ApiParam("商品id") @RequestParam(value = "goodsId", required = false) Integer goodsId,
+ @ApiParam("商品名称") @RequestParam(value = "goodsName", required = false) String goodsName,
+ @ApiParam("商品类型") @RequestParam(value = "goodsType", required = false) Integer goodsType,
+ @ApiParam("所属分类") @RequestParam(value = "categoryId", required = false) Integer categoryId,
+ @ApiParam("审核状态") @RequestParam(value = "auditStatus", required = false) Integer auditStatus) {
+ GoodsBargainPrice bargainPrice = new GoodsBargainPrice();
+ bargainPrice.setGoodsName(goodsName);
+ bargainPrice.setGoodsId(goodsId);
+ bargainPrice.setGoodsType(goodsType);
+ bargainPrice.setCategoryId(categoryId);
+ bargainPrice.setAuditStatus(auditStatus);
+ IPage<GoodsBargainPrice> goodsBargainPriceIPage = goodsBargainPriceService.queryGoodsBargainPricePage(Page.of(pageNum, pageSize), bargainPrice);
+ return R.ok(goodsBargainPriceIPage);
+ }
+
+
+
+
+ @ResponseBody
+ @GetMapping("/getGoodsBargainPriceInfo/{id}")
+ @ApiOperation(value = "获取商品特殊售价详情", tags = {"门店后台-商品管理"})
+ @ApiImplicitParams({
+ @ApiImplicitParam(value = "商品id", name = "id", required = true, dataType = "int"),
+ })
+ public R<GoodsBargainPriceInfo> getGoodsBargainPriceInfo(@PathVariable("id") Integer id){
+ GoodsBargainPriceInfo goodsBargainPriceInfo = goodsBargainPriceService.getGoodsBargainPriceInfo(id);
+ return R.ok(goodsBargainPriceInfo);
+ }
+
+
+
+
+ @ResponseBody
+ @PostMapping("/addGoodsBargainPrice")
+ @ApiOperation(value = "保存商品特殊售价", tags = {"门店后台-商品管理"})
+ public R addGoodsBargainPrice(@RequestBody AddGoodsBargainPriceVo vo){
+ return goodsBargainPriceService.addGoodsBargainPrice(vo);
+ }
+
+ /**
+ * 审核商品
+ */
+ @PostMapping("/auditGoods")
+ @ApiOperation(value = "审核商品", tags = {"管理后台-商品管理-门店特殊售价"})
+ public R<Void> auditGoods(@RequestBody GoodsBargainPrice goodsBargainPrice) {
+ LoginUser loginUser = tokenService.getLoginUser();
+ Integer id = goodsBargainPrice.getId();
+ GoodsBargainPrice bargainPrice = goodsBargainPriceService.getById(id);
+ bargainPrice.setAuditStatus(goodsBargainPrice.getAuditStatus());
+ bargainPrice.setAuditMsg(goodsBargainPrice.getAuditMsg());
+ bargainPrice.setAuditUserId(loginUser.getUserid());
+ bargainPrice.setAuditTime(LocalDateTime.now());
+ goodsBargainPriceService.updateById(bargainPrice);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1