From 142480d89f99e7beec8bf757277af54857f07b2d Mon Sep 17 00:00:00 2001 From: Burce Date: Mon, 30 Sep 2019 09:50:56 +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 --- .../invest/InvestDemandController.java | 8 ++--- .../invest/InvestFollowRecordController.java | 12 +++---- .../invest/InvestOperateRecordController.java | 14 +++----- .../invest/InvestRemindController.java | 8 ++--- .../invest/InvestTaskController.java | 8 ++--- .../invest/impl/InvestBaseService.java | 35 +++++++++++++++++++ .../impl/InvestCustomerServiceImpl.java | 24 ++++++------- .../invest/impl/InvestDemandServiceImpl.java | 17 ++++----- .../impl/InvestFollowRecordServiceImpl.java | 9 ++--- .../invest/impl/InvestRemindServiceImpl.java | 26 ++++++-------- .../invest/impl/InvestTaskServiceImpl.java | 26 ++++++-------- 11 files changed, 98 insertions(+), 89 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index 15bab5eb1..e706481fc 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -1,7 +1,5 @@ package com.iformall.controller.invest; -import java.util.Arrays; - import com.iformall.annotation.SystemServiceLog; import com.iformall.common.InvestResultData; import com.iformall.domain.po.InvestDemandEntity; @@ -9,11 +7,13 @@ import com.iformall.domain.vo.invest.InvestDemandVo; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.service.invest.InvestDemandService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java index 72ee591c5..4d41cca35 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java @@ -1,21 +1,17 @@ package com.iformall.controller.invest; -import java.util.Arrays; - -import com.iformall.common.ErrorCode; import com.iformall.common.InvestResultData; -import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.domain.po.InvestFollowRecordEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; -import com.iformall.exception.MallinkException; import com.iformall.service.invest.InvestFollowRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java index 8c1401a61..fda34fb02 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -1,23 +1,17 @@ package com.iformall.controller.invest; -import java.util.Arrays; -import java.util.List; - -import com.iformall.common.ErrorCode; import com.iformall.common.InvestResultData; -import com.iformall.common.ResultData; -import com.iformall.controller.base.BaseController; import com.iformall.domain.po.InvestOperateRecordEntity; -import com.iformall.domain.vo.invest.InvestDemandVo; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; -import com.iformall.exception.MallinkException; import com.iformall.service.invest.InvestOperateRecordService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index 0a4b7de5d..216e3a927 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -1,17 +1,17 @@ package com.iformall.controller.invest; -import java.util.Arrays; - import com.iformall.common.InvestResultData; import com.iformall.domain.po.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.service.invest.InvestRemindService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 355d70d25..58a21b991 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -1,7 +1,5 @@ package com.iformall.controller.invest; -import java.util.Arrays; - import com.iformall.annotation.SystemServiceLog; import com.iformall.common.InvestResultData; import com.iformall.domain.po.InvestTaskEntity; @@ -9,11 +7,13 @@ import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.domain.vo.invest.InvestTaskVo; import com.iformall.service.invest.InvestTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + +import java.util.Arrays; diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseService.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseService.java index 1d26c10c5..de34bc1c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseService.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseService.java @@ -2,12 +2,15 @@ package com.iformall.service.invest.impl; import com.alibaba.fastjson.JSONArray; +import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.common.ErrorCode; +import com.iformall.common.TableLog; import com.iformall.domain.po.*; import com.iformall.domain.vo.invest.InvestPageQuery; +import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.enums.EnumInvestType; import com.iformall.enums.EnumShopStatus; import com.iformall.exception.MallinkException; @@ -20,6 +23,7 @@ import org.apache.commons.lang3.ObjectUtils; import java.io.Serializable; import java.util.List; import java.util.Objects; +import java.util.function.Consumer; import java.util.stream.Collectors; public class InvestBaseService, T> extends ServiceImpl { @@ -31,6 +35,37 @@ public class InvestBaseService, T> extends ServiceImpl consumer) { + checkUserAndTenant(entity,consumer); + return super.save(entity); + } + + @TableLog + public boolean updateActon(T entity, Wrapper updateWrapper,Consumer consumer) { + checkUserAndTenant(entity,consumer); + return super.update(entity, updateWrapper); + } + + @TableLog + public boolean saveOrUpdateAction(T entity,Consumer consumer) { + checkUserAndTenant(entity,consumer); + return super.saveOrUpdate(entity); + } + + @TableLog + public boolean updateByIdAction(T entity,Consumer consumer) { + checkUserAndTenant(entity,consumer); + return super.updateById(entity); + } + + void checkUserAndTenant(T input,Consumer consumer) { + checkAllNotNull(input); + checkAllNotNull(InvestUserContext.getUser()); + ((InvestBaseEntity) input).setTenantId(InvestUserContext.getUser().getTenantId()); + consumer.accept(input); + } + /** * 校验商铺 * diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java index 63218d384..860b14357 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java @@ -34,19 +34,12 @@ public class InvestCustomerServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } - @TableLog @Override public boolean update(InvestCustomerEntity entity, Wrapper updateWrapper) { - checkBusiness(entity); - checkBrand(entity); - checkType(entity); - return super.update(entity, updateWrapper); + return super.updateActon(entity, updateWrapper,input -> checkBeforeSaveOrUpdate(input)); } @Deprecated @@ -56,15 +49,18 @@ public class InvestCustomerServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } + + private void checkBeforeSaveOrUpdate(InvestCustomerEntity entity) { + checkBusiness(entity); + checkBrand(entity); + checkType(entity); + } + private void checkBusiness(InvestCustomerEntity entity) { WxBusiness business = businessService.getById(entity.getBusinessId()) ; if (Objects.isNull(business)) { diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java index d4d60a2b7..a86a790e0 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestDemandServiceImpl.java @@ -1,10 +1,10 @@ package com.iformall.service.invest.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.iformall.common.TableLog; import com.iformall.domain.po.InvestCustomerEntity; import com.iformall.domain.po.InvestDemandEntity; import com.iformall.domain.po.WxBrand; @@ -132,18 +132,14 @@ public class InvestDemandServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } - @TableLog @Override public boolean update(InvestDemandEntity entity, Wrapper updateWrapper) { - checkBeforeSaveOrUpdate(entity); - return super.update(entity, updateWrapper); + return super.updateActon(entity, updateWrapper,input -> checkBeforeSaveOrUpdate(input)); } @Deprecated @@ -153,17 +149,18 @@ public class InvestDemandServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } private void checkBeforeSaveOrUpdate(InvestDemandEntity entity) { checkCustomerExit(customerService, entity.getCustomerId()); checkUserExit(userInfoService, entity.getOwner()); checkShop(shopService, entity); + if(Objects.nonNull(entity.getIntent())) { + entity.setIntent(JSON.toJSONString(entity.getIntent())); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java index 3d442214e..90b25fd79 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java @@ -1,11 +1,11 @@ package com.iformall.service.invest.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.iformall.common.ErrorCode; -import com.iformall.common.TableLog; import com.iformall.domain.po.InvestBaseEntity; import com.iformall.domain.po.InvestFollowRecordEntity; import com.iformall.domain.vo.invest.InvestPageQuery; @@ -48,11 +48,9 @@ public class InvestFollowRecordServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } @Deprecated @@ -89,5 +87,8 @@ public class InvestFollowRecordServiceImpl extends InvestBaseService implements InvestRemindService { @@ -43,38 +45,30 @@ public class InvestRemindServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } - @TableLog @Override public boolean update(InvestRemindEntity entity, Wrapper updateWrapper) { - checkBeforeSaveOrUpdate(entity); - return super.update(entity, updateWrapper); + return super.updateActon(entity, updateWrapper, input -> checkBeforeSaveOrUpdate(input)); } - @TableLog @Override public boolean saveOrUpdate(InvestRemindEntity entity) { - checkBeforeSaveOrUpdate(entity); - return super.saveOrUpdate(entity); + return super.saveOrUpdateAction(entity, input -> checkBeforeSaveOrUpdate(input)); } - @TableLog @Override public boolean updateById(InvestRemindEntity entity) { - checkBeforeSaveOrUpdate(entity); - return super.updateById(entity); + return super.updateByIdAction(entity, input -> checkBeforeSaveOrUpdate(input)); } private void checkBeforeSaveOrUpdate(InvestRemindEntity input) { - checkAllNotNull(input); - checkAllNotNull(InvestUserContext.getUser()); input.setOwner(InvestUserContext.getUserId()); - input.setTenantId(InvestUserContext.getUser().getTenantId()); + if (Objects.nonNull(input.getContent())) { + input.setContent(JSON.toJSONString(input.getContent())); + } } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index f42c137cf..123083115 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -1,10 +1,10 @@ package com.iformall.service.invest.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.iformall.common.TableLog; import com.iformall.domain.po.InvestTaskEntity; import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.invest.InvestPageQuery; @@ -19,10 +19,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @@ -75,18 +72,14 @@ public class InvestTaskServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } - @TableLog @Override public boolean update(InvestTaskEntity entity, Wrapper updateWrapper) { - checkBeforeSaveOrUpdate(entity); - return super.update(entity, updateWrapper); + return super.updateActon(entity, updateWrapper, input -> checkBeforeSaveOrUpdate(input)); } @Deprecated @@ -96,19 +89,22 @@ public class InvestTaskServiceImpl extends InvestBaseService checkBeforeSaveOrUpdate(input)); } private void checkBeforeSaveOrUpdate(InvestTaskEntity entity) { - checkAllNotNull(entity); // 1 check shop 状态 checkShop(shopService, entity); // 2 check user checkUserExit(userInfoService, entity.getOwner()); + if (Objects.nonNull(entity.getOwner())) { + entity.setOwner(JSON.toJSONString(entity.getOwner())); + } + if (Objects.nonNull(entity.getContent())) { + entity.setContent(JSON.toJSONString(entity.getContent())); + } } }