From 9d2c8bd605bbcfa14a03bc210676504690307b2a Mon Sep 17 00:00:00 2001 From: Burce Date: Thu, 10 Oct 2019 11:10:36 +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/domain/po/InvestBaseEntity.java | 4 ++-- .../iformall/domain/po/InvestDemandEntity.java | 2 +- .../domain/po/InvestFollowRecordEntity.java | 16 ++++++++-------- .../domain/po/InvestOperateRecordEntity.java | 10 +--------- .../iformall/domain/po/InvestRemindEntity.java | 12 ++++++------ .../com/iformall/domain/po/InvestTaskEntity.java | 8 ++++---- .../java/com/iformall/enums/EnumInvestType.java | 2 +- .../service/invest/event/InvestListener.java | 2 +- .../invest/impl/InvestBaseServiceImpl.java | 3 +-- 9 files changed, 25 insertions(+), 34 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java index e4c43e122..d978b6a7e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java @@ -35,13 +35,13 @@ public class InvestBaseEntity implements Serializable { /** * 创建时间 */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate") + @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate",example = "2018-10-01 12:18:48") @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Date createDate; /** * 更新时间 */ - @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate") + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate",example = "2018-10-01 12:18:48") @JsonProperty(access = JsonProperty.Access.READ_ONLY) private Date updateDate; } 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 ee30ca561..013c3f335 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java @@ -39,7 +39,7 @@ public class InvestDemandEntity extends InvestBaseEntity { * 客户意向 */ @io.swagger.annotations.ApiModelProperty(value = "客户意向", name = "intent", - example = "{\"rent_area\":100,\"opening_time\": \"2019-09-03\"}") + example = "\"{\"rent_area\":100,\"opening_time\": \"2019-09-03\"}\"") @LogColumn(COLUMN_TYPE) private String intent; /** 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 9570facc5..7d09917ad 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java @@ -32,14 +32,14 @@ public class InvestFollowRecordEntity extends InvestBaseEntity { /** * 洽谈内容 */ - @io.swagger.annotations.ApiModelProperty(value = "洽谈内容", name = "content",example = "{\n" + - " \"date\": \"2019-09-03\",\n" + - " \"address\": \"北京三里屯\",\n" + - " \"text\": \"今天约了王老板,目标要签订框架协议\",\n" + - " \"document\": [\"url1\",\"url2\"],\n" + - " \"member\": [id1,id2,id3],\n" + - " \"negotiationType\": 1\n" + - "}") + @io.swagger.annotations.ApiModelProperty(value = "洽谈内容", name = "content",example = "\"{" + + "\"date\": \"2019-09-03\"," + + " \"address\": \"北京三里屯\"," + + " \"text\": \"今天约了王老板,目标要签订框架协议\"," + + " \"document\": [\"url1\",\"url2\"]," + + " \"member\": [id1,id2,id3]," + + " \"negotiationType\": 1" + + "}\"") private String content; /** * 跟踪类型:0-招商任务;1-客户需求 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 fba4c6455..8788de180 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonIgnore; import com.iformall.enums.EnumTableOperateType; import lombok.Data; @@ -46,16 +45,9 @@ public class InvestOperateRecordEntity extends InvestBaseEntity { /** * 更新内容 */ - @JsonFormat - @io.swagger.annotations.ApiModelProperty(value = "更新前", name = "content") + @io.swagger.annotations.ApiModelProperty(value = "更新前", name = "content",example = "\"[{\"after\": \"13366183866\", \"before\": \"15811234999\", \"column\": \"phone\"}]\"") private String content; - /** - * 创建时间 - */ - @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") - private Date createDate; - @JsonIgnore @TableField(exist = false) private Date updateDate; 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 3fbf66d6f..13b3ba7e4 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java @@ -28,12 +28,12 @@ public class InvestRemindEntity extends InvestBaseEntity { /** * 提醒内容 */ - @io.swagger.annotations.ApiModelProperty(value = "提醒内容", name = "content",example = "" + - "{\n" + - " \"text\": \"今天约了王老板,要求签订框架协议\",\n" + - " \"customer_id\": 222222,\n" + - " \"negotiation_type\": 2\n" + - "}") + @io.swagger.annotations.ApiModelProperty(value = "提醒内容", name = "content",example = "\"" + + "{" + + "\"text\": \"今天约了王老板,要求签订框架协议\"," + + " \"customer_id\": 222222," + + " \"negotiation_type\": 2" + + "}\"") private String content; /** * 提醒时间 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 463433372..44f6a7395 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java @@ -47,10 +47,10 @@ public class InvestTaskEntity extends InvestBaseEntity { /** * 任务设定条件 */ - @io.swagger.annotations.ApiModelProperty(value = "任务设定条件", name = "content",example = "{\n" + - " \"business\": 1,\n" + - " \"lastDate\": \"2018-10-01 12:18:48\"\n" + - "}") + @io.swagger.annotations.ApiModelProperty(value = "任务设定条件", name = "content",example = "\"{" + + "\"business\": 1," + + " \"lastDate\": \"2018-10-01 12:18:48\"" + + "}\"") private String content; /** diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumInvestType.java b/mallinkService/src/main/java/com/iformall/enums/EnumInvestType.java index 87dae795c..6052da845 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumInvestType.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumInvestType.java @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonValue; * 招商类型:0-商铺招租;1-其他 */ public enum EnumInvestType { - SHOP(0, "商铺"), + RENT(0, "商铺招租"), ; public static EnumInvestType getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java b/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java index 2e46b2265..c40b46ce7 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java @@ -31,7 +31,7 @@ public class InvestListener implements ApplicationListener { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.in(InvestTaskEntity::getTargetId, rentEventInfo.getTargetIds()); - query.eq(InvestTaskEntity::getTargetType, EnumInvestType.SHOP); + query.eq(InvestTaskEntity::getTargetType, EnumInvestType.RENT); List tasks = taskService.list(query); if (CollectionUtils.isEmpty(tasks)) { log.warn("receive InvestEvent , tasks is empty : {}", tasks); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java index 009d07179..6575b81e3 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java @@ -30,7 +30,6 @@ import java.io.Serializable; import java.util.List; import java.util.Objects; import java.util.function.Consumer; -import java.util.function.Function; import java.util.stream.Collectors; public class InvestBaseServiceImpl, T> extends ServiceImpl implements InvestBaseService { @@ -107,7 +106,7 @@ public class InvestBaseServiceImpl, T> extends ServiceIm investType = entity.getTargetType(); } - if (EnumInvestType.SHOP.equals(investType)) { + if (EnumInvestType.RENT.equals(investType)) { WxShop shop = shopService.getById(targetId); checkShopNotNull(shop); }