fix 欢迎语模板

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

@@ -61,6 +61,10 @@ public class CorpCustomerAcquisitionLinkServiceImpl extends ServiceImpl<CorpCust
 
         WxCpLinkAddResp wxCpLinkAddResp = corpOps.customerAcquisitionUpdateLink(null, wxCpLinkUpd);
 
+        if (corpCustomerAcquisitionLink.getMsgId() == null) {
+            corpCustomerAcquisitionLink.setMsgId(0l);
+        }
+
         this.updateById(corpCustomerAcquisitionLink);
     }
 

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

@@ -796,6 +796,7 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 					.eq(CorpWelcomeTemplate::getType, 0)
 					.eq(CorpWelcomeTemplate::getDeleted, 1)
 					.last("limit 1"));
+			log.info("===========未找到自然流量默认欢迎语===========");
 			if (corpWelcomeTemplate != null) {
 				senCorpWelcomeMsg(message, corpWelcomeTemplate.getText(), corpWelcomeTemplate.getAttachmentsStr());
 			}
@@ -1077,10 +1078,10 @@ public class CorpEventActionServiceImpl implements CorpEventActionService {
 			String welcomeContent = corpWelcomeTemplate.getText();
 			String attachmentsStr = corpWelcomeTemplate.getAttachmentsStr();
 			//发送对应欢迎语
-			if (StrUtil.isNotBlank(welcomeContent) && StrUtil.isNotBlank(attachmentsStr)) {
+			if (StrUtil.isNotBlank(welcomeContent) || StrUtil.isNotBlank(attachmentsStr)) {
 				THREAD_POOL.execute(() -> {
-					message.setWelcomeCode(null);
 					senCorpWelcomeMsg(message, welcomeContent, attachmentsStr);
+					message.setWelcomeCode(null);
 				});
 			}
 		}

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

@@ -155,6 +155,9 @@ public class CorpFollowServiceImpl implements CorpFollowService {
 		if (activeCode.getCouponId() == null) {
 			activeCode.setCouponId(0l);
 		}
+		if (activeCode.getMsgId() == null) {
+			activeCode.setMsgId(0l);
+		}
 		corpFollowActiveCodeMapper.updateById(activeCode);
 	}
 

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

@@ -73,6 +73,7 @@ public class CorpWelcomeTemplateController {
 			}
 		} else if (byId.getType() == 1) {
 			count = corpFollowActiveCodeMapper.selectCount(Wrappers.lambdaQuery(CorpFollowActiveCode.class)
+					.eq(CorpFollowActiveCode::getDeleted, 1)
 					.eq(CorpFollowActiveCode::getMsgId, byId.getId()));
 		} else if (byId.getType() == 2) {
 			count = acquisitionLinkMapper.selectCount(Wrappers.lambdaQuery(CorpCustomerAcquisitionLink.class)