From 4d2dda710968035fa52e69dea47525985674422b Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 21 一月 2026 17:18:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
index ea8173e..0a5ea0a 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/ShopServiceImpl.java
@@ -206,6 +206,7 @@
shop.setEditDate(new Date());
shop.setIsdeleted(Constants.ONE);
shopMapper.updateById(shop);
+ shopGoodsRelationMapper.delete(new UpdateWrapper<ShopGoodsRelation>().lambda().eq(ShopGoodsRelation::getShopId,id));
}
@Override
@@ -316,7 +317,7 @@
queryWrapper.selectAll(Shop.class);
queryWrapper.eq(Shop::getId,id);
- queryWrapper.select("(select AVG(SCORE) from shop_comment where ISDELETED=0 and OBJ_ID=t.id) as score");//闂ㄥ簵璇勫垎
+// queryWrapper.select("(select AVG(SCORE) from shop_comment where ISDELETED=0 and OBJ_ID=t.id) as score");//闂ㄥ簵璇勫垎
/** ----------------start搴楅摵璁块棶鏁版嵁----------------*/
// queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id) as shopTotalVisits");//涓婚〉鎬昏闂噺
// queryWrapper.select("(select count(id) from shop_scan where ISDELETED=0 and SHOP_ID=t.id and to_days(CREATE_DATE)=to_days(now()) ) as shopNowVisits");//浠婃棩璁块棶閲�
@@ -336,7 +337,7 @@
// queryWrapper.select("(select sum(LIMIT_PRICE) from member_coupon where ISDELETED=0 and SHOP_ID=t.id and type=0 and STATUS=1 ) as couponUserMoney");//浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)
/** ----------------end搴楅摵浼樻儬鍒告暟鎹�----------------*/
- queryWrapper.select("(select count(g.id) from goodsorder where g.ISDELETED=0 and g.DISTRIBUTION_SHOP_ID=t.id ) as totalOrderNUm");//浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)
+ queryWrapper.select("(select count(g.id) from goodsorder g where g.ISDELETED=0 and g.DISTRIBUTION_SHOP_ID=t.id ) as totalOrderNUm");//浼樻儬鍒镐娇鐢ㄩ噾棰�(鍏�)
Shop shop= shopJoinMapper.selectJoinOne(Shop.class,queryWrapper);
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
@@ -378,8 +379,9 @@
queryWrapper.selectAll(Shop.class);
if(pageWrap.getModel().getGoodsId()!=null){
//鏌ヨ鏌愬晢鍝佺殑渚涜揣浠�
- queryWrapper.select("(select s.price from shop_goods_relation s where s.ISDELETED=0 and s.shop_id = t.id and s.GOODS_ID="+pageWrap.getModel().getGoodsId()+") as goodsPrice ");
+ queryWrapper.select("(select s.price from shop_goods_relation s where s.ISDELETED=0 and s.shop_id = t.id and s.GOODS_ID="+pageWrap.getModel().getGoodsId()+" limit 1) as goodsPrice ");
}
+ queryWrapper.select("(select count(s.id) from shop_goods_relation s left join goods g on s.goods_id =g.id where g.status=0 and s.ISDELETED=0 and s.shop_id=t.id) as pricedGoodsNum ");
queryWrapper.selectAs(Labels::getName,Shop::getBigAreaName);
queryWrapper.selectAs(Member::getNickname,Shop::getNickName);
queryWrapper.selectAs(Member::getImgurl,Shop::getMemberImgurl);
@@ -402,9 +404,13 @@
IPage<Shop> result = shopJoinMapper.selectJoinPage(page, Shop.class, queryWrapper);
String path = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.SHOP_FILE).getCode();
+ long goodsNum = goodsMapper.selectCount(new QueryWrapper<Goods>().lambda()
+ .eq(Goods::getIsdeleted,Constants.ZERO)
+ .eq(Goods::getStatus,Constants.ZERO));
for(Shop model:result.getRecords()){
model.setImgFullUrl(path);
model.setAreas( AreasServiceImpl.getAddressByAreaId(model.getAreaId()));
+ model.setGoodsNum(goodsNum);
if(model.getLatitude()!=null && model.getLongitude()!=null){
model.setLocationInfo(model.getLatitude().doubleValue()+","+model.getLongitude().doubleValue());
}
@@ -876,12 +882,6 @@
}
return saleReportResponse;
}
-
-
-
-
-
-
@Override
@Transactional
--
Gitblit v1.9.3