| @@ -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) | @JsonProperty(access = JsonProperty.Access.READ_ONLY) | ||||
| private Date createDate; | 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) | @JsonProperty(access = JsonProperty.Access.READ_ONLY) | ||||
| private Date updateDate; | private Date updateDate; | ||||
| } | } | ||||
| @@ -39,7 +39,7 @@ public class InvestDemandEntity extends InvestBaseEntity { | |||||
| * 客户意向 | * 客户意向 | ||||
| */ | */ | ||||
| @io.swagger.annotations.ApiModelProperty(value = "客户意向", name = "intent", | @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) | @LogColumn(COLUMN_TYPE) | ||||
| private String intent; | private String intent; | ||||
| /** | /** | ||||
| @@ -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; | private String content; | ||||
| /** | /** | ||||
| * 跟踪类型:0-招商任务;1-客户需求 | * 跟踪类型:0-招商任务;1-客户需求 | ||||
| @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import java.util.Date; | import java.util.Date; | ||||
| import com.fasterxml.jackson.annotation.JsonFormat; | |||||
| import com.fasterxml.jackson.annotation.JsonIgnore; | import com.fasterxml.jackson.annotation.JsonIgnore; | ||||
| import com.iformall.enums.EnumTableOperateType; | import com.iformall.enums.EnumTableOperateType; | ||||
| import lombok.Data; | 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; | private String content; | ||||
| /** | |||||
| * 创建时间 | |||||
| */ | |||||
| @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createDate", example = "2018-10-01 12:18:48") | |||||
| private Date createDate; | |||||
| @JsonIgnore | @JsonIgnore | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Date updateDate; | private Date updateDate; | ||||
| @@ -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; | private String content; | ||||
| /** | /** | ||||
| * 提醒时间 | * 提醒时间 | ||||
| @@ -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; | private String content; | ||||
| /** | /** | ||||
| @@ -7,7 +7,7 @@ import com.fasterxml.jackson.annotation.JsonValue; | |||||
| * 招商类型:0-商铺招租;1-其他 | * 招商类型:0-商铺招租;1-其他 | ||||
| */ | */ | ||||
| public enum EnumInvestType { | public enum EnumInvestType { | ||||
| SHOP(0, "商铺"), | |||||
| RENT(0, "商铺招租"), | |||||
| ; | ; | ||||
| public static EnumInvestType getEnum(Integer code) { | public static EnumInvestType getEnum(Integer code) { | ||||
| @@ -31,7 +31,7 @@ public class InvestListener implements ApplicationListener<InvestEvent> { | |||||
| LambdaQueryWrapper<InvestTaskEntity> query = new LambdaQueryWrapper<>(); | LambdaQueryWrapper<InvestTaskEntity> query = new LambdaQueryWrapper<>(); | ||||
| query.in(InvestTaskEntity::getTargetId, rentEventInfo.getTargetIds()); | query.in(InvestTaskEntity::getTargetId, rentEventInfo.getTargetIds()); | ||||
| query.eq(InvestTaskEntity::getTargetType, EnumInvestType.SHOP); | |||||
| query.eq(InvestTaskEntity::getTargetType, EnumInvestType.RENT); | |||||
| List<InvestTaskEntity> tasks = taskService.list(query); | List<InvestTaskEntity> tasks = taskService.list(query); | ||||
| if (CollectionUtils.isEmpty(tasks)) { | if (CollectionUtils.isEmpty(tasks)) { | ||||
| log.warn("receive InvestEvent , tasks is empty : {}", tasks); | log.warn("receive InvestEvent , tasks is empty : {}", tasks); | ||||
| @@ -30,7 +30,6 @@ import java.io.Serializable; | |||||
| import java.util.List; | import java.util.List; | ||||
| import java.util.Objects; | import java.util.Objects; | ||||
| import java.util.function.Consumer; | import java.util.function.Consumer; | ||||
| import java.util.function.Function; | |||||
| import java.util.stream.Collectors; | import java.util.stream.Collectors; | ||||
| public class InvestBaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements InvestBaseService<T> { | public class InvestBaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M, T> implements InvestBaseService<T> { | ||||
| @@ -107,7 +106,7 @@ public class InvestBaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceIm | |||||
| investType = entity.getTargetType(); | investType = entity.getTargetType(); | ||||
| } | } | ||||
| if (EnumInvestType.SHOP.equals(investType)) { | |||||
| if (EnumInvestType.RENT.equals(investType)) { | |||||
| WxShop shop = shopService.getById(targetId); | WxShop shop = shopService.getById(targetId); | ||||
| checkShopNotNull(shop); | checkShopNotNull(shop); | ||||
| } | } | ||||