Browse Source

修改报错

yumeng 1 year ago
parent
commit
3486242d7e

+ 0 - 22
ruixuan-live/src/main/java/com/ruixuan/isc/service/impl/SupplyChainServiceImpl.java

@@ -44,37 +44,15 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
     public List<JSONObject> getOrderList(Map<String, Object> requestMap) {
         List<JSONObject> list = supplyChainMapper.getOrderList(requestMap);
         if (!Check.isNull(list)) {
-            Map<String, String> map = new HashMap<>();
             for (int i = 0; i < list.size(); i++) {
                 JSONObject jsonObject = list.get(i);
                 String promoterId = jsonObject.getString("promoterId");
                 requestMap.put("promoterId", promoterId);
                 List<JSONObject> topOrders = supplyChainMapper.getTopOrders(requestMap);
                 jsonObject.put("topOrders", topOrders);
-                map.put(promoterId, promoterId);
-            }
-            Map<String, String> userMap = new HashMap<>();
-            if (!Check.isNullMap(map)) {
-                List<JSONObject> userList = supplyChainMapper.getUserList(map);
-                for (int i = 0; i < userList.size(); i++) {
-                    JSONObject jsonObject = userList.get(i);
-                    userMap.put(jsonObject.getString("promoterId"), jsonObject.getString("userName"));
-                }
-            }
 
-            if (!Check.isNullMap(userMap)) {
-                for (int i = 0; i < list.size(); i++) {
-                    JSONObject jsonObject = list.get(i);
-                    Long promoterId = jsonObject.getLong("promoterId");
-                    String userName = userMap.get(promoterId);
-                    if (!Check.isNull(userName)) {
-                        jsonObject.put("userName", userName);
-                    }
-                }
             }
         }
-
-
         return list;
     }
 

+ 4 - 1
ruixuan-live/src/main/resources/mapper/isc/SupplyChainMapper.xml

@@ -67,7 +67,10 @@
         <if test="promoterNickName != null and promoterNickName != ''">
             and promoter_nick_name like concat(concat('%',#{promoterNickName}),'%')
         </if>
-        group by promoter_id) t
+        group by promoter_id) t left join (
+            select  promoter_id as 'promoterId',group_concat(user_name)  as 'userName' from  kuaishou_promoter where  media_id = 2
+                                               group by
+        ) t2 on t.promoterId = t2.promoterId
         order by t.orderNum desc
     </select>
     <select id="getTopOrders" resultType="com.alibaba.fastjson.JSONObject">