Преглед изворни кода

[招商]adjust

release_toaliyun_real
Burce пре 6 година
родитељ
комит
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()); return new InvestResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) { } catch (Exception e) {
log.error("execute error", 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 { } finally {
InvestUserContext.remove(); InvestUserContext.remove();
} }


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java Прегледај датотеку

@@ -43,7 +43,7 @@ public class InvestDemandController extends InvestBaseController {
@SystemServiceLog @SystemServiceLog
@ApiOperation(value = "分页列表接口") @ApiOperation(value = "分页列表接口")
@GetMapping("/list") @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)); 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 @SystemServiceLog
@ApiOperation("分页列表接口") @ApiOperation("分页列表接口")
@GetMapping("/list") @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)); 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; package com.iformall.service.invest.impl;


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


Loading…
Откажи
Сачувај