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

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
aa534a1e64
4 измененных файлов: 13 добавлений и 7 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java
  3. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java
  4. +10
    -4
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java Просмотреть файл

@@ -24,7 +24,7 @@ public class InvestBaseController extends BaseController {
return new InvestResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
log.error("execute error", e);
return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
return new InvestResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage());
} finally {
InvestUserContext.remove();
}


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java Просмотреть файл

@@ -43,7 +43,7 @@ public class InvestDemandController extends InvestBaseController {
@SystemServiceLog
@ApiOperation(value = "分页列表接口")
@GetMapping("/list")
public InvestResultData<InvestPageResult<InvestDemandVo>> list(InvestPageQuery<InvestDemandDto> params) {
public InvestResultData<InvestPageResult<InvestDemandVo>> list(@RequestBody InvestPageQuery<InvestDemandDto> params) {
return execute(params, p -> investBizService.queryPageDemand(p));
}



+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java Просмотреть файл

@@ -41,7 +41,7 @@ public class InvestTaskController extends InvestBaseController {
@SystemServiceLog
@ApiOperation("分页列表接口")
@GetMapping("/list")
public InvestResultData<InvestPageResult<InvestTaskVo>> list(InvestPageQuery<InvestTaskEntity> params) {
public InvestResultData<InvestPageResult<InvestTaskVo>> list(@RequestBody InvestPageQuery<InvestTaskEntity> params) {
return execute(params, p -> bizService.queryPageTask(p));
}



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

@@ -1,6 +1,7 @@
package com.iformall.service.invest.impl;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.iformall.domain.dto.InvestDemandDto;
@@ -123,7 +124,7 @@ public class InvestBizServiceImpl implements InvestBizService {
List<MallUserInfo> ownerInfo = null ;
Map contentMap = JSON.parseObject(item.getContent(),Map.class);
if (MapUtils.isNotEmpty(contentMap)) {
String followMember = (String) contentMap.get(InvestFollowRecordEntity.KEY_MEMBER);
Object followMember = contentMap.get(InvestFollowRecordEntity.KEY_MEMBER);
ownerInfo = getMallUserInfos(followMember, usersMap);
}
return ownerInfo;
@@ -230,11 +231,16 @@ public class InvestBizServiceImpl implements InvestBizService {
return resultItemVo;
}

private List<MallUserInfo> getMallUserInfos(String userJson, Map<Long, MallUserInfo> usersMap) {
private List<MallUserInfo> getMallUserInfos(Object userJson, Map<Long, MallUserInfo> usersMap) {
List<MallUserInfo> ownerInfo = Lists.newArrayList();
List<Long> ownerList = JSON.parseArray(userJson, Long.class);
JSONArray ownerList;
if(userJson instanceof String) {
ownerList = JSONArray.parseArray((String)userJson);
} else {
ownerList = (JSONArray) userJson;
}
if (CollectionUtils.isNotEmpty(ownerList)) {
for (Long userId : ownerList) {
for (Object userId : ownerList) {
ownerInfo.add(usersMap.get(userId));
}
}


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