diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java index 3f909a56a..ab2f2cc98 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMall.java @@ -13,8 +13,6 @@ import java.util.List; @Data @EqualsAndHashCode(callSuper = true) public class WxMall extends BaseEntity { - private static final long serialVersionUID = 1L; - protected Long id; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java index de91fb30f..26eb18d65 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java @@ -60,6 +60,7 @@ public class WxMallServiceImpl implements WxMallService { } WxMall mall = wxMallMapper.selectById(id); // 插入缓存 + logger.info("getById: " + mall.toString()); operations.set(key, mall, 3600, TimeUnit.SECONDS); return mall; } @@ -129,6 +130,7 @@ public class WxMallServiceImpl implements WxMallService { return mall; } WxMall mall = wxMallMapper.getByTenantId(id); + logger.info("getByTenantId: " + mall.toString()); // 插入缓存 operations.set(key, mall, 3600, TimeUnit.SECONDS); return mall; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index cc0c061d2..84353eae2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; @@ -25,6 +26,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; + import java.util.*; import java.util.stream.Collectors; @@ -303,6 +305,15 @@ public class WxMsgServiceImpl implements WxMsgService { String[] split = phones.split(","); final IdWorker idWorker = IdWorker.get(); for (String phone : split) { + WxMsgCallback queryMsgCallback = new WxMsgCallback(); + queryMsgCallback.setTenantId(wxmsg.getTenantId()); + queryMsgCallback.setPhone(phone); + queryMsgCallback.setBatchNo(batchNo); + Integer count = wxMsgCallbackMapper.selectCount(new QueryWrapper<>(queryMsgCallback)); + if (count > 0) { + logger.info("营销短信回调主动添加-批次" + batchNo + "手机号" + phone + "已存在"); + continue; + } WxMsgCallback wxMsgCallback = new WxMsgCallback(); wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setPhone(phone); @@ -315,7 +326,6 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallbackMapper.insert(wxMsgCallback); } logger.info("营销短信发送时主动添加回调记录结束..."); - }