fix 去掉活吗得优惠券id

netflix-dao/src/main/java/com/cyksj/model/entity/CorpFollowActiveCode.java

@@ -77,7 +77,5 @@ public class CorpFollowActiveCode extends BaseEntity{
 	 */
 	private String operator;
 
-	private String couponIds;
-
 	private Boolean deleted;
 }

netflix-dao/src/main/java/com/cyksj/model/views/CorpFollowActiveCodeView.java

@@ -78,9 +78,6 @@ public class CorpFollowActiveCodeView {
 	@DbField("cfa.operator")
 	private String operator;
 
-	@DbField("cfa.coupon_id")
-	private Long couponId;
-
 	/**
 	 * 优惠券名
 	 */

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpEventActionServiceImpl.java

@@ -721,6 +721,7 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 		String state = message.getState();
 		CorpFollowActiveCode corpFollowActiveCode = null;
 		AtomicBoolean isSendWelcomeMsg = new AtomicBoolean(false);
+		CorpWelcomeTemplate corpWelcomeTemplate = null;
 		if (StrUtil.isNotBlank(state) && state.contains(Constant.AC_CODE_KEY)) {
 			//查找对应的活动活码 记录
 			String acIdStr = StrUtil.subAfter(state, StrUtil.C_COLON, true);
@@ -733,7 +734,7 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 					}
 					//欢迎语模板id
 					Long msgId = corpFollowActiveCode.getMsgId();
-					sendWelcomeMsg(msgId, message);
+					corpWelcomeTemplate = sendWelcomeMsg(msgId, message);
 					isSendWelcomeMsg.set(true);
 					try {
 						//对客户进行标记
@@ -802,10 +803,17 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 				isJoinFixedCustomer(user.getId(), message.getUserId());
 
 				//活码 优惠券发送
-				if (corpFollowActiveCode != null && StrUtil.isNotBlank(corpFollowActiveCode.getCouponIds())) {
+				if (corpFollowActiveCode != null && corpFollowActiveCode.getMsgId() != 0) {
+					Long msgId = corpFollowActiveCode.getMsgId();
+					if (corpWelcomeTemplate == null) {
+						corpWelcomeTemplate = corpWelcomeTemplateMapper.selectById(msgId);
+					}
+					String couponIdsStr = corpWelcomeTemplate != null ? corpWelcomeTemplate.getCouponIds() : null;
 					try {
-						List<Long> couponIds = Jsons.parseList(corpFollowActiveCode.getCouponIds(), Long.class);
-						couponIds.forEach(couponId -> couponCommonService.sendCouponToUser(user.getId(), couponId, 0l, 0l, 0l, CouponUser.Channel.corp_active_code));
+						if (StrUtil.isNotBlank(couponIdsStr)) {
+							List<Long> couponIds = Jsons.parseList(couponIdsStr, Long.class);
+							couponIds.forEach(couponId -> couponCommonService.sendCouponToUser(user.getId(), couponId, 0l, 0l, 0l, CouponUser.Channel.corp_active_code));
+						}
 					} catch (Exception e) {
 					}
 				}
@@ -841,16 +849,16 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 
 		//若没找到规则的欢迎语 发送默认欢迎语
 		if (StrUtil.isNotEmpty(message.getWelcomeCode()) && !isSendWelcomeMsg.get()) {
-			CorpWelcomeTemplate corpWelcomeTemplate = corpWelcomeTemplateMapper.selectOne(Wrappers.lambdaQuery(CorpWelcomeTemplate.class)
+			CorpWelcomeTemplate serviceWelcomeTemplate = corpWelcomeTemplateMapper.selectOne(Wrappers.lambdaQuery(CorpWelcomeTemplate.class)
 					.eq(CorpWelcomeTemplate::getType, 0)
 					.eq(CorpWelcomeTemplate::getDeleted, 1)
 					.last("limit 1"));
-			if (corpWelcomeTemplate == null) {
+			if (serviceWelcomeTemplate == null) {
 				log.info("===========未找到自然流量默认欢迎语===========");
 			}
-			if (corpWelcomeTemplate != null) {
+			if (serviceWelcomeTemplate != null) {
 				log.info("===========找到自然流量默认欢迎语记录===========");
-				senCorpWelcomeMsg(message, corpWelcomeTemplate.getText(), corpWelcomeTemplate.getAttachmentsStr());
+				senCorpWelcomeMsg(message, serviceWelcomeTemplate.getText(), serviceWelcomeTemplate.getAttachmentsStr());
 			}
 		}
 		return corpUser;
@@ -1151,9 +1159,9 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 	 * @param msgId 模板id
 	 * @param message
 	 */
-	public void sendWelcomeMsg(Long msgId, CorpXmlMessage message) {
+	public CorpWelcomeTemplate sendWelcomeMsg(Long msgId, CorpXmlMessage message) {
 		if (StrUtil.isEmpty(message.getWelcomeCode())) {
-			return;
+			return null;
 		}
 		CorpWelcomeTemplate corpWelcomeTemplate = corpWelcomeTemplateMapper.selectById(msgId);
 		if (corpWelcomeTemplate != null) {
@@ -1166,5 +1174,6 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 				});
 			}
 		}
+		return corpWelcomeTemplate;
 	}
 }

netflix-service/src/main/java/com/cyksj/service/corp/impl/CorpFollowServiceImpl.java

@@ -156,9 +156,6 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 		} else if (isUpdateAcCode) {
 			corpFollowDynamicConfigService.updateCorpFollowActiveCode(dbActiveCode.getMarkTag(), activeCode.getMarkTag());
 		}
-		if (StrUtil.isEmpty(activeCode.getCouponIds())) {
-			activeCode.setCouponIds(null);
-		}
 		if (activeCode.getMsgId() == null) {
 			activeCode.setMsgId(0l);
 		}

netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupsRelationExpiryRecordServiceImpl.java

@@ -52,7 +52,7 @@ public class GroupsRelationExpiryRecordServiceImpl extends ServiceImpl<GroupsRel
 				this.saveOrUpdateBatch(groupsRelationExpiryRecords);
 			}
 		}
-		if (groupsRelationExpiryRecord != null) {
+		if (groupsRelationExpiryRecord != null) { 
 			groupsRelationExpiryRecord.setReBuyGoodsId(goodsDon.getId());
 			groupsRelationExpiryRecord.setReBuyGoodsTitle(goodsDon.getTitle());
 			groupsRelationExpiryRecord.setReBuySkuId(sku.getId());

netflix-web/src/main/java/com/cyksj/web/controller/manage/corp/CmsCorpFollowActiveCodeController.java

@@ -37,7 +37,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 
 /** admin/企业微信/客服活码
@@ -144,9 +143,6 @@ public class CmsCorpFollowActiveCodeController {
 	public Result<SearchResult<CorpFollowActiveCodeView>> getActiveCodeList() {
 		SearchResult<CorpFollowActiveCodeView> search = beanSearcher.search(CorpFollowActiveCodeView.class, MapUtils.flatBuilder(request.getParameterMap()).build());
 		search.getDataList().forEach(data -> {
-			if (data.getCouponId() > 0) {
-				Optional.ofNullable(couponMapper.selectById(data.getCouponId())).ifPresent(c -> data.setCouponName(c.getName()));
-			}
 			Integer numOfUser = corpUserMapper.selectCount(Wrappers.lambdaQuery(CorpUser.class)
 					.eq(CorpUser::getAcId, data.getId()));
 			data.setNumOfUser(numOfUser);