From a2142f36dbc62fe7b01a54c5f0d71522ed9b6707 Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 14 Oct 2019 16:51:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]adjust?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/invest/InvestBaseController.java | 2 ++ .../main/java/com/iformall/service/invest/InvestBizService.java | 2 -- .../com/iformall/service/invest/impl/InvestBizServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java index a82d5357e..6b2dc9a21 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java @@ -7,6 +7,7 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.enums.EnumCustomerRatingType; import com.iformall.enums.EnumCustomerType; +import com.iformall.enums.EnumFollowType; import com.iformall.enums.EnumTaskStatus; import com.iformall.exception.MallinkException; import com.iformall.service.invest.InvestHelper; @@ -28,6 +29,7 @@ public class InvestBaseController extends BaseController { registerEnumEditor(dataBinder, EnumCustomerType.class, "customerType") ; registerEnumEditor(dataBinder, EnumCustomerRatingType.class, "customerRatingType") ; registerEnumEditor(dataBinder, EnumTaskStatus.class, "taskStatus") ; + registerEnumEditor(dataBinder, EnumFollowType.class, "followType") ; } public InvestResultData execute(T params, Function function) { diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java index c946a683c..ff22fbc6f 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestBizService.java @@ -4,7 +4,6 @@ import com.iformall.domain.dto.InvestDemandDto; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.invest.InvestRemindEntity; import com.iformall.domain.vo.invest.*; - import java.util.List; public interface InvestBizService { @@ -31,5 +30,4 @@ public interface InvestBizService { InvestFollowRecordVo findFollowRecordById(Long id) ; - } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index d0f0f041a..47bd4c6a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -67,7 +67,7 @@ public class InvestBizServiceImpl implements InvestBizService { return investPage; } queryWrapperDemand = new LambdaQueryWrapper<>(); - queryWrapperDemand.in(InvestDemandEntity::getId, getIds(customers, InvestCustomerEntity::getId)); + queryWrapperDemand.in(InvestDemandEntity::getCustomerId, getIds(customers, InvestCustomerEntity::getId)); } InvestPageResult demandPage = demandService.queryPage(buildPageQuery(params, demandParams), queryWrapperDemand);