Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
9903c8d897
2 измененных файлов: 8 добавлений и 3 удалений
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java
  2. +5
    -3
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/invest/InvestFollowRecordVo.java Просмотреть файл

@@ -24,4 +24,7 @@ public class InvestFollowRecordVo extends InvestFollowRecordEntity {


@io.swagger.annotations.ApiModelProperty(value = "ownerInfo", name = "ownerInfo") @io.swagger.annotations.ApiModelProperty(value = "ownerInfo", name = "ownerInfo")
private MallUserInfo ownerInfo; private MallUserInfo ownerInfo;

@io.swagger.annotations.ApiModelProperty(value = "操作人名称", name = "operatorName")
private String operatorName ;
} }

+ 5
- 3
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java Просмотреть файл

@@ -351,7 +351,7 @@ public class InvestBizServiceImpl implements InvestBizService {
InvestMessageEntity messageEntity = new InvestMessageEntity(); InvestMessageEntity messageEntity = new InvestMessageEntity();
messageEntity.setOwner(InvestUserContext.getUserId()); messageEntity.setOwner(InvestUserContext.getUserId());
query.setQueryData(messageEntity); query.setQueryData(messageEntity);
query.setSortColumn("createDate");
query.setSortColumn("create_date");
query.setSortOrder("desc"); query.setSortOrder("desc");
return messageService.queryPage(query); return messageService.queryPage(query);
} }
@@ -508,7 +508,6 @@ public class InvestBizServiceImpl implements InvestBizService {
if (CollectionUtils.isEmpty(contentList)) { if (CollectionUtils.isEmpty(contentList)) {
return recordVo; return recordVo;
} }

for (TableTriple record : contentList) { for (TableTriple record : contentList) {
InvestOperateRecordVo itemVo = new InvestOperateRecordVo(); InvestOperateRecordVo itemVo = new InvestOperateRecordVo();
BeanUtils.copyProperties(recordEntity, itemVo); BeanUtils.copyProperties(recordEntity, itemVo);
@@ -552,7 +551,10 @@ public class InvestBizServiceImpl implements InvestBizService {
followRecordVo.setCustomer(customerEntity); followRecordVo.setCustomer(customerEntity);
followRecordVo.setMemberInfo(ownerInfo); followRecordVo.setMemberInfo(ownerInfo);
followRecordVo.setBrand(brand); followRecordVo.setBrand(brand);
followRecordVo.setOwnerInfo(usersMap.get(item.getOwner()));
if (Objects.nonNull(usersMap.get(item.getOwner()))) {
followRecordVo.setOwnerInfo(usersMap.get(item.getOwner()));
followRecordVo.setOperatorName(usersMap.get(item.getOwner()).getName());
}
BeanUtils.copyProperties(item, followRecordVo); BeanUtils.copyProperties(item, followRecordVo);
return followRecordVo; return followRecordVo;
} }


Загрузка…
Отмена
Сохранить