From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-common/src/main/java/com/java110/common/smo/impl/MarketSmsV1InnerServiceSMOImpl.java |   46 +++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/service-common/src/main/java/com/java110/common/smo/impl/MarketSmsV1InnerServiceSMOImpl.java b/service-common/src/main/java/com/java110/common/smo/impl/MarketSmsV1InnerServiceSMOImpl.java
index eb8e8b4..8d02080 100644
--- a/service-common/src/main/java/com/java110/common/smo/impl/MarketSmsV1InnerServiceSMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/smo/impl/MarketSmsV1InnerServiceSMOImpl.java
@@ -17,12 +17,13 @@
 
 
 import com.java110.common.dao.IMarketSmsV1ServiceDao;
+import com.java110.dto.market.MarketSmsValueDto;
 import com.java110.intf.common.IMarketSmsV1InnerServiceSMO;
-import com.java110.dto.marketSms.MarketSmsDto;
-import com.java110.po.marketSms.MarketSmsPo;
+import com.java110.dto.market.MarketSmsDto;
+import com.java110.intf.common.IMarketSmsValueV1InnerServiceSMO;
+import com.java110.po.market.MarketSmsPo;
 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 IMarketSmsV1ServiceDao marketSmsV1ServiceDaoImpl;
+
+    @Autowired
+    private IMarketSmsValueV1InnerServiceSMO marketSmsValueV1InnerServiceSMOImpl;
 
 
     @Override
@@ -78,9 +82,45 @@
 
         List<MarketSmsDto> marketSmss = BeanConvertUtil.covertBeanList(marketSmsV1ServiceDaoImpl.getMarketSmsInfo(BeanConvertUtil.beanCovertMap(marketSmsDto)), MarketSmsDto.class);
 
+        refreshMarketValues(marketSmss);
         return marketSmss;
     }
 
+    /**
+     * 杈撳叆 鍊�
+     * @param marketSmss
+     */
+    private void refreshMarketValues(List<MarketSmsDto> marketSmss) {
+
+        if(marketSmss == null || marketSmss.size() <1){
+            return ;
+        }
+
+        List<String> smsIds = new ArrayList<>();
+
+        for(MarketSmsDto marketSmsDto : marketSmss){
+            smsIds.add(marketSmsDto.getSmsId());
+        }
+
+
+        MarketSmsValueDto marketSmsValueDto = new MarketSmsValueDto();
+        marketSmsValueDto.setSmsIds(smsIds.toArray(new String[smsIds.size()]));
+        List<MarketSmsValueDto> smsValueDtos = marketSmsValueV1InnerServiceSMOImpl.queryMarketSmsValues(marketSmsValueDto);
+
+        List<MarketSmsValueDto> marketSmsValueDtos = null;
+        for(MarketSmsDto marketSmsDto : marketSmss){
+            marketSmsValueDtos = new ArrayList<>();
+            for(MarketSmsValueDto smsValueDto : smsValueDtos){
+                if(!marketSmsDto.getSmsId().equals(smsValueDto.getSmsId())){
+                    continue;
+                }
+                marketSmsValueDtos.add(smsValueDto);
+            }
+
+            marketSmsDto.setValues(marketSmsValueDtos);
+        }
+    }
+
 
     @Override
     public int queryMarketSmssCount(@RequestBody MarketSmsDto marketSmsDto) {

--
Gitblit v1.8.0