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