From 4e0b2444dfa887288785fed34d4a5008c534699c Mon Sep 17 00:00:00 2001 From: Burce Date: Sun, 29 Sep 2019 16:39:28 +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 | 2 +- .../invest/InvestFollowRecordController.java | 2 +- .../invest/InvestOperateRecordController.java | 8 ++++---- .../controller/invest/InvestTaskController.java | 5 +++-- ...eInvestEntity.java => InvestBaseEntity.java} | 2 +- .../domain/po/InvestCustomerEntity.java | 2 +- .../iformall/domain/po/InvestDemandEntity.java | 2 +- .../domain/po/InvestFollowRecordEntity.java | 10 +++++++--- .../domain/po/InvestOperateRecordEntity.java | 2 +- .../iformall/domain/po/InvestRemindEntity.java | 5 +---- .../iformall/domain/po/InvestTaskEntity.java | 3 +-- .../iformall/service/invest/InvestHelper.java | 2 +- .../impl/InvestFollowRecordServiceImpl.java | 17 ++++++++++++++--- 13 files changed, 37 insertions(+), 25 deletions(-) rename mallinkService/src/main/java/com/iformall/domain/po/{BaseInvestEntity.java => InvestBaseEntity.java} (96%) 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 816329ef1..5120ff211 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -50,7 +50,7 @@ public class InvestDemandController { return new InvestResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { log.error("list error", e); - return new InvestResultData(ErrorCode.SYS_BEAN_EMPTY_PROPERTY_ERROR); + return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } } 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 fe8083249..2c707ed07 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestFollowRecordController.java @@ -47,7 +47,7 @@ public class InvestFollowRecordController { return new InvestResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { log.error("list error", e); - return new InvestResultData(ErrorCode.SYS_BEAN_EMPTY_PROPERTY_ERROR); + return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } } 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 ebed31966..ddcb17f87 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestOperateRecordController.java @@ -45,7 +45,7 @@ public class InvestOperateRecordController { /** * 信息 */ - @GetMapping("/info/{id}") + //@GetMapping("/info/{id}") public ResultData info(@PathVariable("id") Long id){ InvestOperateRecordEntity investOperateRecord = investOperateRecordService.getById(id); @@ -55,7 +55,7 @@ public class InvestOperateRecordController { /** * 保存 */ - @PostMapping("/save") + //@PostMapping("/save") public ResultData save(@RequestBody InvestOperateRecordEntity investOperateRecord){ investOperateRecordService.save(investOperateRecord); @@ -65,7 +65,7 @@ public class InvestOperateRecordController { /** * 修改 */ - @PostMapping("/update") + //@PostMapping("/update") public ResultData update(@RequestBody InvestOperateRecordEntity investOperateRecord){ investOperateRecordService.updateById(investOperateRecord); @@ -75,7 +75,7 @@ public class InvestOperateRecordController { /** * 删除 */ - @GetMapping("/delete") + //@GetMapping("/delete") public ResultData delete(@RequestBody Long[] ids){ investOperateRecordService.removeByIds(Arrays.asList(ids)); 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 1d4a7296f..eab8e18c4 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -6,6 +6,7 @@ import com.iformall.annotation.SystemServiceLog; 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.InvestTaskEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; @@ -31,7 +32,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("invest/task") @Api(tags = "招商任务") -public class InvestTaskController { +public class InvestTaskController extends BaseController { @Autowired private InvestTaskService investTaskService; @@ -50,7 +51,7 @@ public class InvestTaskController { return new InvestResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { log.error("list error", e); - return new InvestResultData(ErrorCode.SYS_BEAN_EMPTY_PROPERTY_ERROR); + return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BaseInvestEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java similarity index 96% rename from mallinkService/src/main/java/com/iformall/domain/po/BaseInvestEntity.java rename to mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java index e760613be..54b00c9cc 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BaseInvestEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java @@ -21,7 +21,7 @@ import java.util.*; @JsonIgnoreType() @Data @Slf4j -public class BaseInvestEntity implements Serializable { +public class InvestBaseEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java index ba702e374..4418b8069 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java @@ -17,7 +17,7 @@ import lombok.Data; */ @Data @TableName("invest_customer") -public class InvestCustomerEntity extends BaseInvestEntity { +public class InvestCustomerEntity extends InvestBaseEntity { /** * 客户名称 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java index b77f63a9b..f2f530e36 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java @@ -16,7 +16,7 @@ import lombok.Data; */ @Data @TableName("invest_demand") -public class InvestDemandEntity extends BaseInvestEntity { +public class InvestDemandEntity extends InvestBaseEntity { /** * 负责人 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java index 965714212..0155e45da 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java @@ -3,7 +3,6 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumFollowType; import lombok.Data; @@ -16,7 +15,7 @@ import lombok.Data; */ @Data @TableName("invest_follow_record") -public class InvestFollowRecordEntity extends BaseInvestEntity { +public class InvestFollowRecordEntity extends InvestBaseEntity { /** * 主谈人 @@ -37,7 +36,12 @@ public class InvestFollowRecordEntity extends BaseInvestEntity { * 跟踪类型:0-招商任务;1-客户需求 */ @io.swagger.annotations.ApiModelProperty(value = "跟踪类型:0-招商任务;1-客户需求", name = "type") - @JsonIgnore private EnumFollowType type; + /** + * 跟踪类型的主键ID + */ + @io.swagger.annotations.ApiModelProperty(value = "跟踪类型的主键ID", name = "followId") + private Long followId; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java index 8c0362f30..6cd91db34 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_operate_record") -public class InvestOperateRecordEntity extends BaseInvestEntity { +public class InvestOperateRecordEntity extends InvestBaseEntity { /** * 表名称 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java index d280889cf..67e285793 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java @@ -1,10 +1,7 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import java.util.Date; import lombok.Data; @@ -19,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; */ @Data @TableName("invest_remind") -public class InvestRemindEntity extends BaseInvestEntity { +public class InvestRemindEntity extends InvestBaseEntity { /** * 提醒用户 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java index 31c52c6b7..5834e9ec2 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java @@ -2,7 +2,6 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumInvestType; import com.iformall.enums.EnumTaskStatus; import lombok.Data; @@ -16,7 +15,7 @@ import lombok.Data; */ @Data @TableName("invest_task") -public class InvestTaskEntity extends BaseInvestEntity { +public class InvestTaskEntity extends InvestBaseEntity { /** * 负责人 diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java index d92c0d78c..a76a89227 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java @@ -25,7 +25,7 @@ public class InvestHelper { * @param shopService * @param inputEntity */ - public static void checkShop(WxShopService shopService, BaseInvestEntity inputEntity) { + public static void checkShop(WxShopService shopService, InvestBaseEntity inputEntity) { Long targetId = null; EnumInvestType investType = null; if (inputEntity instanceof InvestDemandEntity) { 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 65426c0ff..0563e3e2e 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 @@ -6,13 +6,14 @@ 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.po.InvestTaskEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.enums.EnumFollowType; import com.iformall.exception.MallinkException; import com.iformall.mapper.InvestFollowRecordDao; +import com.iformall.service.MallUserInfoService; import com.iformall.service.invest.InvestDemandService; import com.iformall.service.invest.InvestFollowRecordService; import com.iformall.service.invest.InvestHelper; @@ -32,6 +33,8 @@ public class InvestFollowRecordServiceImpl extends ServiceImpl queryPage(InvestPageQuery params) { @@ -48,35 +51,43 @@ public class InvestFollowRecordServiceImpl extends ServiceImpl updateWrapper) { + checkBeforeSaveOrUpdate(entity); return super.update(entity, updateWrapper); } @TableLog @Override public boolean saveOrUpdate(InvestFollowRecordEntity entity) { + checkBeforeSaveOrUpdate(entity); return super.saveOrUpdate(entity); } @TableLog @Override public boolean updateById(InvestFollowRecordEntity entity) { + checkBeforeSaveOrUpdate(entity); return super.updateById(entity); } private void checkBeforeSaveOrUpdate(InvestFollowRecordEntity entity) { InvestHelper.checkAllNotNull(entity); + InvestBaseEntity baseInvestEntity; if(Objects.equals(entity.getType(), EnumFollowType.DEMAND)) { - + baseInvestEntity = demandService.getById(entity.getFollowId()); } else if(Objects.equals(entity.getType(), EnumFollowType.TASK)) { - + baseInvestEntity = taskService.getById(entity.getFollowId()); } else { throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL) ; } + InvestHelper.checkAllNotNull(baseInvestEntity); + + InvestHelper.checkUserExit(userInfoService, entity.getOwner()); } }