From 675ccd51874f9c005285eab3e4829e451848b4b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 07 六月 2023 11:11:29 +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 | 8 +++++---
1 files changed, 5 insertions(+), 3 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 ed2e7be..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,14 +17,13 @@
import com.java110.common.dao.IMarketGoodsV1ServiceDao;
-import com.java110.dto.marketGoodsItem.MarketGoodsItemDto;
+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;
@@ -98,6 +97,9 @@
for(MarketGoodsDto marketGoodsDto1 : marketGoodss){
for(MarketGoodsItemDto marketGoodsItemDto1:marketGoodsItemDtos){
+ if(!marketGoodsDto1.getGoodsId().equals(marketGoodsItemDto1.getGoodsId())){
+ continue;
+ }
marketGoodsDto1.setGoodsCount(marketGoodsItemDto1.getGoodsCount());
}
}
--
Gitblit v1.8.0