From ff811ae8df41273d7ab0011b6b7f1f278f03bbd2 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 12 十二月 2024 18:06:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsBargainPriceController.java | 217 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 181 insertions(+), 36 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 d558f16..bce64c6 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,22 +2,33 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.account.api.feignClient.AppUserClient;
+import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.other.api.domain.GoodsBargainPrice;
-import com.ruoyi.other.api.domain.GoodsBargainPriceDetail;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.other.api.domain.*;
import com.ruoyi.other.api.vo.GetGoodsBargainPrice;
-import com.ruoyi.other.service.GoodsBargainPriceDetailService;
-import com.ruoyi.other.service.GoodsBargainPriceService;
-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 com.ruoyi.other.service.*;
+import com.ruoyi.system.api.model.LoginUser;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.alibaba.nacos.shaded.org.checkerframework.checker.units.UnitsTools.g;
/**
* <p>
- * 前端控制器
+ * 前端控制器
* </p>
*
* @author luodangjia
@@ -25,34 +36,168 @@
*/
@RestController
@RequestMapping("/goods-bargain-price")
+@Api("门店特殊售价")
public class GoodsBargainPriceController {
-
- @Resource
- private GoodsBargainPriceService goodsBargainPriceService;
-
- @Resource
- private GoodsBargainPriceDetailService goodsBargainPriceDetailService;
-
-
- /**
- * 根据商品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;
+
+ @Resource
+ private GoodsBargainPriceDetailService goodsBargainPriceDetailService;
+
+ @Resource
+ private TokenService tokenService;
+
+ @Resource
+ private GoodsService goodsService;
+
+ @Resource
+ private GoodsCategoryService goodsCategoryService;
+
+ @Resource
+ private AppUserClient appUserClient;
+
+ @Resource
+ private ShopService shopService;
+
+
+ /**
+ * 根据商品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);
+ }
+
+ /**
+ * 新增
+ */
+ @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<Page<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) {
+
+
+ List<Goods> goodsList = goodsService.list(new LambdaQueryWrapper<Goods>()
+ .eq(StringUtils.isNotEmpty(goodsName), Goods::getName, goodsName)
+ .eq(goodsType != null, Goods::getType, goodsType)
+ .eq(categoryId != null, Goods::getGoodsCategoryId, categoryId));
+ List<Integer> goodsIds = goodsList.stream().map(Goods::getId).collect(Collectors.toList());
+ if (goodsId != null){
+ goodsIds.add(goodsId);
+ }
+
+ Page<GoodsBargainPrice> page = goodsBargainPriceService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<GoodsBargainPrice>()
+ .eq(!CollectionUtils.isEmpty(goodsIds), GoodsBargainPrice::getGoodsId, goodsId)
+ .eq(auditStatus != null, GoodsBargainPrice::getAuditStatus, auditStatus));
+
+ page.getRecords().forEach(goodsBargainPrice -> {
+ goodsList.stream()
+ .filter(goods -> goods.getId().equals(goodsBargainPrice.getGoodsId()))
+ .findFirst().ifPresent(g -> {
+ GoodsCategory goodsCategory = goodsCategoryService.getById(g.getGoodsCategoryId());
+ Integer shopId = goodsBargainPrice.getShopId();
+ Shop shop = shopService.getById(shopId);
+ R<AppUser> r = appUserClient.getAppUserByPhone(shop.getPhone());
+ if (R.isError(r)){
+ throw new RuntimeException("获取店长信息失败");
+ }
+ goodsBargainPrice.setOwnerName(r.getData().getName());
+ goodsBargainPrice.setOwnerPhone(shop.getPhone());
+ goodsBargainPrice.setShopName(shop.getName());
+ goodsBargainPrice.setGoodsName(g.getName());
+ goodsBargainPrice.setCategoryName(goodsCategory.getName());
+ });
+ });
+
+ return R.ok(page);
+ }
+
}
--
Gitblit v1.7.1