微调

integrate-system/src/main/java/com/system/serivce/impl/DockingDistributionServiceImpl.java

@@ -5,6 +5,7 @@ import com.system.serivce.IDockingDistributionService;
 import com.system.transfer.response.RestResponse;
 import com.system.utils.HttpClientUtil;
 import com.system.utils.JsonUtil;
+import com.system.utils.StringUtil;
 import com.system.utils.ThirdPartyLogUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,7 +37,7 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
             data.put("secret", secret);
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/memberAdd", JsonUtil.toString(data));
 
-            thirdPartyLogUtil.thirdPartyLogCreate("分销会员创建", "0002", queueId, "平台->分销", JsonUtil.toString(data), result);
+            thirdPartyLogUtil.thirdPartyLogCreate("分销会员创建", "0002", queueId, "平台->分销", JsonUtil.toString(data), StringUtil.replaceBlank(result));
             return result;
         } catch (IOException e) {
             e.printStackTrace();
@@ -50,7 +51,7 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
             data.put("secret", secret);
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/trade", JsonUtil.toString(data));
 
-            thirdPartyLogUtil.thirdPartyLogCreate("分销交易创建", "0001", queueId, "平台->分销", JsonUtil.toString(data), result);
+            thirdPartyLogUtil.thirdPartyLogCreate("分销交易创建", "0001", queueId, "平台->分销", JsonUtil.toString(data), StringUtil.replaceBlank(result));
             return result;
         } catch (IOException e) {
             e.printStackTrace();
@@ -87,7 +88,7 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
             data.put("memberId", memberId);
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/subordinate", JsonUtil.toString(data));
 
-            thirdPartyLogUtil.thirdPartyLogCreate("分销会员下级查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), result);
+            thirdPartyLogUtil.thirdPartyLogCreate("分销会员下级查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), StringUtil.replaceBlank(result));
             return result;
         } catch (IOException e) {
             e.printStackTrace();
@@ -103,7 +104,7 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
             data.put("memberId", memberId);
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/member/balance", JsonUtil.toString(data));
 
-            thirdPartyLogUtil.thirdPartyLogCreate("分销会员余额查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), result);
+            thirdPartyLogUtil.thirdPartyLogCreate("分销会员余额查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), StringUtil.replaceBlank(result));
             return result;
         } catch (IOException e) {
             e.printStackTrace();
@@ -121,7 +122,7 @@ public class DockingDistributionServiceImpl implements IDockingDistributionServi
             data.put("limit", 14);
             String result = HttpClientUtil.sendPost("http://192.168.0.34:8080/api/v1/member/profit", JsonUtil.toString(data));
 
-            thirdPartyLogUtil.thirdPartyLogCreate("分销会员收益查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), result);
+            thirdPartyLogUtil.thirdPartyLogCreate("分销会员收益查询", "0001", queueId, "平台->分销", JsonUtil.toString(data), StringUtil.replaceBlank(result));
             return result;
         } catch (IOException e) {
             e.printStackTrace();

integrate-system/src/main/java/com/system/serivce/impl/DockingServiceImpl.java

@@ -42,7 +42,7 @@ public class DockingServiceImpl implements IDockingService {
         data.put("disParentId", inVo.getReferrerId());
         if (StringUtil.isBlank(inVo.getReferrerId())) {
             data.put("disPlatformId", "test");
-        }else {
+        } else {
             data.put("disPlatformId", "");
         }
         data.put("disNote", inVo.getRemark());
@@ -84,21 +84,25 @@ public class DockingServiceImpl implements IDockingService {
         }
         String result = dockingDistributionService.dockingDistributionMemberSubordinateList(inVo.getQueueId(), inVo.getMemberId());
 
-        List<Map<String, Object>> recordsList = new ArrayList<>();
         Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
         if (!CollectionUtils.isEmpty(map) && Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
             List<Object> objectList = JsonUtil.toList(JsonUtil.toString(map.get("data")), Object.class);
             List<Map<String, Object>> tempList = objectList.stream().map(m -> JsonUtil.toMap(JsonUtil.toString(m), String.class, Object.class)).collect(Collectors.toList());
+            Map<String, Object> response = tempList.stream().filter(m -> inVo.getMemberId().equals(m.get("memberId"))).findFirst().orElse(new HashMap<>(1));
 
+            List<Map<String, Object>> recordsList = new ArrayList<>();
             List<Map<String, Object>> temp01List = tempList.stream().filter(m -> inVo.getMemberId().equals(m.get("parentId"))).collect(Collectors.toList());
             for (Map<String, Object> temp : temp01List) {
                 List<Map<String, Object>> temp02List = tempList.stream().filter(m -> temp.get("memberId").equals(m.get("parentId"))).collect(Collectors.toList());
                 temp.put("children", temp02List);
                 recordsList.add(temp);
             }
+
+            response.put("children", recordsList);
+            return RestResponse.success(response);
         }
 
-        return RestResponse.success(recordsList);
+        return RestResponse.success();
     }
 
     @Override

integrate-system/src/main/java/com/system/utils/JsonUtil.java

 package com.system.utils;
 
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,6 +17,7 @@ import java.util.Map;
  */
 @Slf4j
 public class JsonUtil {
+
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
 
@@ -36,7 +36,6 @@ public class JsonUtil {
         }
     }
 
-
     public static <T> T toBean(String json, Class<T> tClass) {
         try {
             return MAPPER.readValue(json, tClass);
@@ -52,7 +51,6 @@ public class JsonUtil {
         }
     }
 
-
     public static <T> String listToJson(List<T> list) {
         if (null != list && list.size() > 0) {
             JSONArray jsonArray = JSONArray.fromObject(list);
@@ -61,7 +59,6 @@ public class JsonUtil {
         return "";
     }
 
-
     public static <E> List<E> toList(String json, Class<E> eClass) {
         try {
             return MAPPER.readValue(json, MAPPER.getTypeFactory().constructCollectionType(List.class, eClass));
@@ -71,7 +68,6 @@ public class JsonUtil {
         }
     }
 
-
     public static <K, V> Map<K, V> toMap(String json, Class<K> kClass, Class<V> vClass) {
         try {
             return MAPPER.readValue(json, MAPPER.getTypeFactory().constructMapType(Map.class, kClass, vClass));
@@ -81,7 +77,6 @@ public class JsonUtil {
         }
     }
 
-
     public static <T> T nativeRead(String json, TypeReference<T> type) {
         try {
             return MAPPER.readValue(json, type);

integrate-system/src/main/java/com/system/utils/StringUtil.java

@@ -12,6 +12,7 @@ import java.util.regex.Pattern;
  * @author ruoyi
  */
 public class StringUtil extends org.apache.commons.lang3.StringUtils {
+
     /**
      * 空字符串
      */