xhxu 3 лет назад
Родитель
Сommit
7b2d2ce460
2 измененных файлов: 3 добавлений и 2 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java
  2. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java

+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java Просмотреть файл

@@ -57,11 +57,11 @@ public class WxActivityJoin extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName") @io.swagger.annotations.ApiModelProperty(value = "昵称", name = "nickName")
private String nickName; private String nickName;


@Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "8")
@Excel(name = "报名时间", format = "yyyy-MM-dd HH:mm:ss", width = 30, orderNum = "9")
@io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime") @io.swagger.annotations.ApiModelProperty(value = "创建时间", name = "createTime")
private Date createTime; private Date createTime;


@Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "9")
@Excel(name = "活动签到", replace = {"未签到_0", "已签到_1"}, width = 10, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn") @io.swagger.annotations.ApiModelProperty(value = "签到状态1签到0未签到", name = "signIn")
private Integer signIn; private Integer signIn;


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

@@ -623,6 +623,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService {
poiPlan.setPlanId(record.getId()); poiPlan.setPlanId(record.getId());
this.poiOrientedPlanDeleteTalent(ttWebService,record); this.poiOrientedPlanDeleteTalent(ttWebService,record);
}else{ }else{
record.setDouyinId(JSON.toJSONString(record.getDouyinIdList()));
poiPlan.setPlanName(record.getName()); poiPlan.setPlanName(record.getName());
} }
poiPlan.setMerchantPhone(record.getMerchantPhone()); poiPlan.setMerchantPhone(record.getMerchantPhone());


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