Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
9d2c8bd605
9 измененных файлов: 25 добавлений и 34 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/InvestBaseEntity.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java
  3. +8
    -8
      mallinkService/src/main/java/com/iformall/domain/po/InvestFollowRecordEntity.java
  4. +1
    -9
      mallinkService/src/main/java/com/iformall/domain/po/InvestOperateRecordEntity.java
  5. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/InvestRemindEntity.java
  6. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumInvestType.java
  8. +1
    -1
      mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java
  9. +1
    -2
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBaseServiceImpl.java

+ 2
- 2
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;
}

+ 1
- 1
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;
/**


+ 8
- 8
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-客户需求


+ 1
- 9
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;


+ 6
- 6
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;
/**
* 提醒时间


+ 4
- 4
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;

/**


+ 1
- 1
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) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/invest/event/InvestListener.java Просмотреть файл

@@ -31,7 +31,7 @@ public class InvestListener implements ApplicationListener<InvestEvent> {

LambdaQueryWrapper<InvestTaskEntity> query = new LambdaQueryWrapper<>();
query.in(InvestTaskEntity::getTargetId, rentEventInfo.getTargetIds());
query.eq(InvestTaskEntity::getTargetType, EnumInvestType.SHOP);
query.eq(InvestTaskEntity::getTargetType, EnumInvestType.RENT);
List<InvestTaskEntity> tasks = taskService.list(query);
if (CollectionUtils.isEmpty(tasks)) {
log.warn("receive InvestEvent , tasks is empty : {}", tasks);


+ 1
- 2
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<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();
}

if (EnumInvestType.SHOP.equals(investType)) {
if (EnumInvestType.RENT.equals(investType)) {
WxShop shop = shopService.getById(targetId);
checkShopNotNull(shop);
}


Загрузка…
Отмена
Сохранить