From 2d079ac843ebcb335f2ef7d6952f9700a16fddde Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 05 五月 2021 14:11:00 +0800
Subject: [PATCH] 游湖阿底阿妈

---
 service-fee/src/main/java/com/java110/fee/bmo/rentingFee/impl/QueryRentingFeeImpl.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/bmo/rentingFee/impl/QueryRentingFeeImpl.java b/service-fee/src/main/java/com/java110/fee/bmo/rentingFee/impl/QueryRentingFeeImpl.java
old mode 100644
new mode 100755
index 98dd1f2..5bd7331
--- a/service-fee/src/main/java/com/java110/fee/bmo/rentingFee/impl/QueryRentingFeeImpl.java
+++ b/service-fee/src/main/java/com/java110/fee/bmo/rentingFee/impl/QueryRentingFeeImpl.java
@@ -2,13 +2,17 @@
 
 import com.alibaba.fastjson.JSONArray;
 import com.java110.dto.fee.FeeDto;
+import com.java110.dto.store.StoreDto;
 import com.java110.fee.bmo.rentingFee.IQueryRentingFee;
 import com.java110.intf.fee.IFeeInnerServiceSMO;
+import com.java110.intf.store.IStoreInnerServiceSMO;
 import com.java110.vo.ResultVo;
+import org.apache.catalina.Store;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -18,6 +22,9 @@
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
+
     @Override
     public ResponseEntity<String> queryFees(FeeDto feeDto) {
 
@@ -27,6 +34,27 @@
             return ResultVo.createResponseEntity(new JSONArray());
         }
 
+        List<String> storeIds = new ArrayList<>();
+        for(FeeDto tmpFeeDto: feeDtos){
+            storeIds.add(tmpFeeDto.getIncomeObjId());
+        }
+
+        if(storeIds.size() < 1){
+            return ResultVo.createResponseEntity(feeDtos);
+        }
+
+        StoreDto storeDto = new StoreDto();
+        storeDto.setStoreIds(storeIds.toArray(new String[storeIds.size()]));
+        List<StoreDto> storeDtos = storeInnerServiceSMOImpl.getStores(storeDto);
+
+        for(StoreDto tmpStoreDto: storeDtos){
+            for(FeeDto tmpFeeDto: feeDtos){
+                if(tmpStoreDto.getStoreId().equals(tmpFeeDto.getIncomeObjId())){
+                    tmpFeeDto.setIncomeObjName(tmpStoreDto.getStoreName());
+                }
+            }
+        }
+
         return ResultVo.createResponseEntity(feeDtos);
     }
 }

--
Gitblit v1.8.0