|
@@ -92,7 +92,12 @@ public class OmsOrderServiceImpl implements OmsOrderService {
|
|
|
|
|
|
// 过滤出学校订单,查询学校信息
|
|
|
List<Long> schoolIds = list.stream().filter(o->o.getSourceType() ==2).map(OmsOrder::getMemberId).collect(Collectors.toList());
|
|
|
-
|
|
|
+ for (OrderVo orderVo : list) {
|
|
|
+ if (orderVo.getSourceType() == 2 ||orderVo.getSourceType() == 4) {
|
|
|
+ orderVo.setPhone("");
|
|
|
+ orderVo.setUsername("");
|
|
|
+ }
|
|
|
+ }
|
|
|
if (!CollectionUtils.isEmpty(schoolIds)) {
|
|
|
try {
|
|
|
HttpResponseResult<List<SchoolDto>> schoolDtoHttpResponseResult = webFeignService.schoolListByIds(schoolIds);
|
|
@@ -102,7 +107,9 @@ public class OmsOrderServiceImpl implements OmsOrderService {
|
|
|
if (o.getSourceType() == 2) {
|
|
|
SchoolDto schoolDto = schoolDtoMap.get(o.getMemberId());
|
|
|
if (schoolDto != null) {
|
|
|
- o.setMemberUsername(schoolDto.getName());
|
|
|
+ o.setUsername(schoolDto.getName());
|
|
|
+ } else {
|
|
|
+ o.setUsername("");
|
|
|
}
|
|
|
}
|
|
|
});
|
|
@@ -113,6 +120,7 @@ public class OmsOrderServiceImpl implements OmsOrderService {
|
|
|
|
|
|
}
|
|
|
|
|
|
+
|
|
|
return list;
|
|
|
}
|
|
|
|