From f2070facdb5715e7349df69cfe257289c680d292 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期三, 23 四月 2025 18:12:46 +0800
Subject: [PATCH] 前端联调
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java | 83 ++++++++++++++++++++---------------------
1 files changed, 41 insertions(+), 42 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
index 5035619..dee2baf 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -264,42 +264,43 @@
}
@Override
- public IPage<Goods> getManageGoodsList(Page<Goods> page, Goods goods) {
- IPage<Goods> goodsIPage = goodsMapper.selectManageGoodsList(page, goods);
- goodsIPage.getRecords().forEach(goods1 -> {
- Integer data = orderClient.getGoodsSaleNum(goods1.getId(), 1).getData();
- goods1.setSaleNum(data);
- });
- return goodsIPage;
+ public R getManageGoodsList(Integer pageNum,Integer pageSize, Goods goods) {
+ PageInfo<Goods> pageInfo = new PageInfo<>(pageNum,pageSize);
+ List<Goods> list = goodsMapper.selectManageGoodsList(pageInfo, goods);
+ pageInfo.setRecords(list);
+ return R.ok(pageInfo);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void addGoods(Goods goods) {
- /* goods.setSaleNum(0);
- goods.setStatus(GoodsStatus.DOWN.getCode());
+
goodsMapper.insert(goods);
- // 指定门店
- Integer appointStore = goods.getAppointStore();
- if (null != appointStore && appointStore == 1){
- List<GoodsShop> goodsShopList = goods.getGoodsShopList();
- if (CollectionUtils.isEmpty(goodsShopList)){
- throw new NullPointerException("请选择指定门店");
- }
- saveGoodsShopList(goodsShopList, goods.getId());
- }*/
+ //保存商品门店关系
+ GoodsShop goodsShop = new GoodsShop();
+ goodsShop.setGoodsId(goods.getId());
+ goodsShop.setShopId(goods.getShopId());
+ Shop shop = shopMapper.selectById(goods.getShopId());
+ goodsShop.setShopName(shop.getName());
+ goodsShop.setOwnerName(shop.getShopManager());
+ goodsShop.setPhone(shop.getPhone());
+ goodsShop.setAddress(shop.getAddress());
+ goodsShopService.save(goodsShop);
+
+ //判断是否参加秒杀活动
+
+
}
@Override
public void updateManageGoods(Goods goods) {
- /* this.updateById(goods);
+ this.updateById(goods);
//修改个别字段
this.update(new LambdaUpdateWrapper<Goods>().eq(Goods::getId, goods.getId()).set(Goods::getSellingPrice, goods.getSellingPrice())
.set(Goods::getIntegral, goods.getIntegral()));
- // 指定门店
- List<GoodsShop> goodsShopList = goods.getGoodsShopList();
- saveGoodsShopList(goodsShopList, goods.getId());*/
+ // 保存门店
+ saveGoodsShop(goods.getShopId(),goods.getId());
}
@@ -309,16 +310,16 @@
- private void saveGoodsShopList(List<GoodsShop> goodsShopList, Integer goodsId) {
+ private void saveGoodsShop(Integer shopId, Integer goodsId) {
goodsShopService.remove(new LambdaQueryWrapper<GoodsShop>()
.eq(GoodsShop::getGoodsId, goodsId));
- if (!CollectionUtils.isEmpty(goodsShopList)){
- for (GoodsShop goodsShop : goodsShopList) {
- goodsShop.setGoodsId(goodsId);
- goodsShop.setId(null);
- }
- }
- goodsShopService.saveBatch(goodsShopList);
+
+ GoodsShop goodsShop = new GoodsShop();
+ goodsShop.setGoodsId(goodsId);
+ goodsShop.setShopId(shopId);
+ goodsShop.setId(null);
+
+ goodsShopService.save(goodsShop);
}
@Override
@@ -327,20 +328,18 @@
if (goods == null){
return null;
}
- // 指定门店
- List<GoodsShop> goodsShops = goodsShopService.list(new LambdaQueryWrapper<GoodsShop>()
+ // 获取指定门店
+ GoodsShop goodsShop = goodsShopService.getOne(new LambdaQueryWrapper<GoodsShop>()
.eq(GoodsShop::getGoodsId, goodsId));
-
- for (GoodsShop goodsShop : goodsShops) {
- Shop shop = shopMapper.selectById(goodsShop.getShopId());
- if(null != shop){
- goodsShop.setShopName(shop.getName());
- goodsShop.setOwnerName(shop.getShopManager());
- goodsShop.setPhone(shop.getPhone());
- goodsShop.setAddress(shop.getAddress());
- }
+ goods.setShopId(goodsShop.getShopId());
+ Shop shop = shopService.getById(goodsShop.getShopId());
+ if(null != shop){
+ goodsShop.setShopName(shop.getName());
+ goodsShop.setPhone(shop.getPhone());
+ goodsShop.setAddress(shop.getAddress());
+ goodsShop.setOwnerName(shop.getShopManager());
}
-// goods.setGoodsShopList(goodsShops);
+ goods.setGoodsShop(goodsShop);
return goods;
}
--
Gitblit v1.7.1