|
@@ -7,6 +7,7 @@ import com.ruixuan.isc.service.ISupplyChainService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -20,14 +21,37 @@ public class SupplyChainServiceImpl implements ISupplyChainService {
|
|
|
public List<JSONObject> getOrderList(Map<String, Object> requestMap) {
|
|
|
List<JSONObject> list = supplyChainMapper.getOrderList(requestMap);
|
|
|
if (!Check.isNull(list)) {
|
|
|
+ Map<Long, Long> map = new HashMap<>();
|
|
|
for (int i = 0; i < list.size(); i++) {
|
|
|
JSONObject jsonObject = list.get(i);
|
|
|
Long promoterId = jsonObject.getLong("promoterId");
|
|
|
requestMap.put("promoterId", promoterId);
|
|
|
List<JSONObject> topOrders = supplyChainMapper.getTopOrders(requestMap);
|
|
|
jsonObject.put("topOrders", topOrders);
|
|
|
+ map.put(promoterId, promoterId);
|
|
|
+ }
|
|
|
+ Map<Long, 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.getLong("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;
|
|
|
}
|
|
|
|