diff --git a/src/main/java/com/kiisoo/ic/activity/bean/EventDTO.java b/src/main/java/com/kiisoo/ic/activity/bean/EventDTO.java deleted file mode 100644 index b23b650..0000000 --- a/src/main/java/com/kiisoo/ic/activity/bean/EventDTO.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.kiisoo.ic.activity.bean; - -import lombok.Data; - -@Data -public class EventDTO { - private String name; - private String key; - private String time; -} diff --git a/src/main/java/com/kiisoo/ic/activity/bean/JoinCbDTO.java b/src/main/java/com/kiisoo/ic/activity/bean/JoinCbDTO.java deleted file mode 100644 index e0611be..0000000 --- a/src/main/java/com/kiisoo/ic/activity/bean/JoinCbDTO.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.kiisoo.ic.activity.bean; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.kiisoo.ic.synchronous.entity.WxDataDTO; -import lombok.Data; - -import java.util.List; - -@Data -public class JoinCbDTO { - //店铺 user_id - @JsonProperty(value = "user_id") - private String userId; - //活动推广编码 - @JsonProperty(value = "pmn_code") - private String pmnCode; - //通知时间 - @JsonProperty(value = "notify_time") - private String notifyTime; - /** - * 微信id对象 - */ - @JsonProperty(value = "wx_data") - private WxDataDTO wxData; - - @JsonProperty(value = "union_id") - private String unionId; - - @JsonProperty(value = "open_id") - private String openId; - //事件名称 - private String name; - //事件名称 - private String key; - //时间 - private String time; - //活动操作事件 - private List events; -} diff --git a/src/main/java/com/kiisoo/ic/activity/controller/EventController.java b/src/main/java/com/kiisoo/ic/activity/controller/EventController.java index 87e472e..b6268a6 100644 --- a/src/main/java/com/kiisoo/ic/activity/controller/EventController.java +++ b/src/main/java/com/kiisoo/ic/activity/controller/EventController.java @@ -1,5 +1,6 @@ package com.kiisoo.ic.activity.controller; +import com.kiisoo.ic.synchronous.entity.TurnBackDTO; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RequestMapping; @@ -12,7 +13,7 @@ import java.util.Map; @RequestMapping(value = "/activity/event") @Slf4j public class EventController { - public Map joinCb(){ + public Map joinCb(TurnBackDTO turnBackDTOS){ return null; } } diff --git a/src/main/java/com/kiisoo/ic/activity/entity/PmnPromotionSrc.java b/src/main/java/com/kiisoo/ic/activity/entity/PmnPromotionSrc.java index 419deb6..42351b4 100644 --- a/src/main/java/com/kiisoo/ic/activity/entity/PmnPromotionSrc.java +++ b/src/main/java/com/kiisoo/ic/activity/entity/PmnPromotionSrc.java @@ -31,6 +31,8 @@ public class PmnPromotionSrc { private String code; + private String qrCode; + private Date createTime; private Date updateTime; diff --git a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java index d4b98f5..afc64a1 100644 --- a/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java +++ b/src/main/java/com/kiisoo/ic/activity/service/impl/PmnPromotionSrcServiceImpl.java @@ -100,7 +100,7 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl srcs = list(Wrappers.lambdaQuery().eq(PmnPromotionSrc::getPromoterId, userId).eq(PmnPromotionSrc::getType, type)); for (PmnPromotionSrc src : srcs) { File codeFile = new File("activity/" + src.getCode() + ".png"); - if (!codeFile.exists()) { + if (!codeFile.exists() || src.getQrCode() == null) { PoiStore store = poiStoreDOMapper.selectOne(Wrappers.lambdaQuery().eq(PoiStore::getId, info.get(0).getStoreId())); String cpUserId = "mayifei"; // String cpUserId = info.getCpUserId(); @@ -109,6 +109,8 @@ public class PmnPromotionSrcServiceImpl extends ServiceImpl