优化代码

java110-bean/src/main/java/com/java110/dto/fee/FeeDto.java

@@ -29,6 +29,7 @@ public class FeeDto extends PageDto implements Serializable {
 
     private String amount;
     private String incomeObjId;
+    private String incomeObjName;
     private String feeTypeCd;
     private Date startTime;
     private Date endTime;
@@ -498,4 +499,12 @@ public class FeeDto extends PageDto implements Serializable {
     public void setFeeAttrDtos(List<FeeAttrDto> feeAttrDtos) {
         this.feeAttrDtos = feeAttrDtos;
     }
+
+    public String getIncomeObjName() {
+        return incomeObjName;
+    }
+
+    public void setIncomeObjName(String incomeObjName) {
+        this.incomeObjName = incomeObjName;
+    }
 }

service-fee/src/main/java/com/java110/fee/bmo/rentingFee/impl/QueryRentingFeeImpl.java

@@ -2,13 +2,17 @@ package com.java110.fee.bmo.rentingFee.impl;
 
 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 @@ public class QueryRentingFeeImpl implements IQueryRentingFee {
     @Autowired
     private IFeeInnerServiceSMO feeInnerServiceSMOImpl;
 
+    @Autowired
+    private IStoreInnerServiceSMO storeInnerServiceSMOImpl;
+
     @Override
     public ResponseEntity<String> queryFees(FeeDto feeDto) {
 
@@ -27,6 +34,27 @@ public class QueryRentingFeeImpl implements IQueryRentingFee {
             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);
     }
 }