From 3fe2aea7827eafc7513159db9a337fdf567584c8 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 08 五月 2023 01:21:13 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/smo/impl/MarketGoodsV1InnerServiceSMOImpl.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MarketGoodsV1InnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MarketGoodsV1InnerServiceSMOImpl.java
index 214261e..b6a6dcf 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/MarketGoodsV1InnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MarketGoodsV1InnerServiceSMOImpl.java
@@ -17,12 +17,13 @@
import com.java110.common.dao.IMarketGoodsV1ServiceDao;
+import com.java110.dto.market.MarketGoodsItemDto;
+import com.java110.intf.common.IMarketGoodsItemV1InnerServiceSMO;
import com.java110.intf.common.IMarketGoodsV1InnerServiceSMO;
-import com.java110.dto.marketGoods.MarketGoodsDto;
+import com.java110.dto.market.MarketGoodsDto;
import com.java110.po.marketGoods.MarketGoodsPo;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.core.base.smo.BaseServiceSMO;
-import com.java110.dto.user.UserDto;
import com.java110.dto.PageDto;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -44,6 +45,9 @@
@Autowired
private IMarketGoodsV1ServiceDao marketGoodsV1ServiceDaoImpl;
+
+ @Autowired
+ private IMarketGoodsItemV1InnerServiceSMO marketGoodsItemV1InnerServiceSMOImpl;
@Override
@@ -78,6 +82,28 @@
List<MarketGoodsDto> marketGoodss = BeanConvertUtil.covertBeanList(marketGoodsV1ServiceDaoImpl.getMarketGoodsInfo(BeanConvertUtil.beanCovertMap(marketGoodsDto)), MarketGoodsDto.class);
+ if(marketGoodss == null || marketGoodss.size()<1 || marketGoodss.size()>20){
+ return marketGoodss;
+ }
+ List<String> goodsIds = new ArrayList<>();
+
+ for(MarketGoodsDto marketGoodsDto1 : marketGoodss){
+ goodsIds.add(marketGoodsDto1.getGoodsId());
+ }
+
+ MarketGoodsItemDto marketGoodsItemDto = new MarketGoodsItemDto();
+ marketGoodsItemDto.setGoodsIds(goodsIds.toArray(new String[goodsIds.size()]));
+ List<MarketGoodsItemDto> marketGoodsItemDtos = marketGoodsItemV1InnerServiceSMOImpl.queryMarketGoodssGroupCount(marketGoodsItemDto);
+
+ for(MarketGoodsDto marketGoodsDto1 : marketGoodss){
+ for(MarketGoodsItemDto marketGoodsItemDto1:marketGoodsItemDtos){
+ if(!marketGoodsDto1.getGoodsId().equals(marketGoodsItemDto1.getGoodsId())){
+ continue;
+ }
+ marketGoodsDto1.setGoodsCount(marketGoodsItemDto1.getGoodsCount());
+ }
+ }
+
return marketGoodss;
}
--
Gitblit v1.8.0