Your Name лет назад: 3
Родитель
Сommit
8c437835ba

+ 10 - 0
java110-bean/src/main/java/com/java110/vo/api/resourceStore/ApiResourceStoreDataVo.java

@@ -1,5 +1,6 @@
 package com.java110.vo.api.resourceStore;
 
+import com.java110.dto.resourceStoreTimes.ResourceStoreTimesDto;
 import com.java110.dto.resourceSupplier.ResourceSupplierDto;
 
 import java.io.Serializable;
@@ -58,6 +59,7 @@ public class ApiResourceStoreDataVo implements Serializable {
     private String isFixed;
     private String isFixedName;
 
+    private List<ResourceStoreTimesDto> times;
     public String getResId() {
         return resId;
     }
@@ -329,4 +331,12 @@ public class ApiResourceStoreDataVo implements Serializable {
     public void setIsFixedName(String isFixedName) {
         this.isFixedName = isFixedName;
     }
+
+    public List<ResourceStoreTimesDto> getTimes() {
+        return times;
+    }
+
+    public void setTimes(List<ResourceStoreTimesDto> times) {
+        this.times = times;
+    }
 }

+ 2 - 2
service-store/src/main/java/com/java110/store/smo/impl/ResourceStoreInnerServiceSMOImpl.java

@@ -79,7 +79,7 @@ public class ResourceStoreInnerServiceSMOImpl extends BaseServiceSMO implements
         }
 
         if (resourceResourceStores == null || resourceResourceStores.size() < 1 || resourceResourceStores.size() > 15) {
-            return resourceResourceStores;
+            return resourceStoreDtos;
         }
 
         ResourceStoreTimesDto resourceStoreTimesDto = new ResourceStoreTimesDto();
@@ -92,7 +92,7 @@ public class ResourceStoreInnerServiceSMOImpl extends BaseServiceSMO implements
         }
 
         List<ResourceStoreTimesDto> times = null;
-        for (ResourceStoreDto resourceStoreDto : resourceResourceStores) {
+        for (ResourceStoreDto resourceStoreDto : resourceStoreDtos) {
             times = new ArrayList<>();
             for (ResourceStoreTimesDto tmpResourceStoreTimesDto : resourceStoreTimesDtos) {
                 if (resourceStoreDto.getResCode().equals(tmpResourceStoreTimesDto.getResCode())) {