Merge remote-tracking branch 'origin/dev_goblin' into pre

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/goblin/service/impl/GoblinSelfGoodsCategoryServiceImpl.java

@@ -14,6 +14,7 @@ import com.liquidnet.service.goblin.entity.GoblinSelfGoodsCategory;
 import com.liquidnet.service.goblin.mapper.GoblinSelfGoodsCategoryMapper;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -47,7 +48,17 @@ public class GoblinSelfGoodsCategoryServiceImpl extends ServiceImpl<GoblinSelfGo
     @Override
     public List<GoblinSelfGoodsCategoryDto> listForForMultiGrade() {
         goblinSelfGoodsCategoryMapper.statsForForMultiGrade();
-        return goblinSelfGoodsCategoryMapper.listForForMultiGrade();
+        List<GoblinSelfGoodsCategoryDto> dtos = goblinSelfGoodsCategoryMapper.listForForMultiGrade();
+        if (!CollectionUtils.isEmpty(dtos)) {
+            dtos.forEach(dto -> {
+                if (StringUtils.isNotEmpty(dto.getTcateId())) {
+                    dto.setFcounts(dto.getTcounts());
+                } else if (StringUtils.isNotEmpty(dto.getScateId())) {
+                    dto.setFcounts(dto.getScounts());
+                }
+            });
+        }
+        return dtos;
     }
 
     @Transactional

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/GoblinSelfGoodsCategoryDto.java

@@ -11,17 +11,17 @@ public class GoblinSelfGoodsCategoryDto implements Serializable {
     private String fname;
     private String ficon;
     private String fneIsbn;
-    private Integer fcounts;
+    private int fcounts;
 
     private String scateId;
     private String sname;
     private String sicon;
     private String sneIsbn;
-    private Integer scounts;
+    private int scounts;
 
     private String tcateId;
     private String tname;
     private String ticon;
     private String tneIsbn;
-    private Integer tcounts;
+    private int tcounts;
 }