From 7b2d2ce46077bf447a45df963b7dcc170f307c8e Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 25 Oct 2022 15:13:49 +0800 Subject: [PATCH] //plan --- .../src/main/java/com/iformall/domain/po/WxActivityJoin.java | 4 ++-- .../com/iformall/service/impl/TtCouponGoodsServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java b/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java index 6753343de..85a79360f 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxActivityJoin.java +++ b/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") 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") 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") private Integer signIn; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index 642648d43..42ff20569 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -623,6 +623,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { poiPlan.setPlanId(record.getId()); this.poiOrientedPlanDeleteTalent(ttWebService,record); }else{ + record.setDouyinId(JSON.toJSONString(record.getDouyinIdList())); poiPlan.setPlanName(record.getName()); } poiPlan.setMerchantPhone(record.getMerchantPhone());