Merge branch 'feature-0323' into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MemberUnionidRelatedApiServiceImpl.java

@@ -310,6 +310,8 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         TabHaobanClerkMainStoreRelated mainStoreRelated = clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId);
         if (mainStoreRelated == null) {
             log.info("【新增外部联系人】主门店为空:{}", staffId);
+            // 无主门店仅发送欢迎语
+            sendWelcome(dto, wxEnterpriseId, null, staffId, null);
             return;
         }
 
@@ -632,6 +634,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
     }
 
     private void attachmentAddParamProgram(List<QywxExternalMessageBaseDTO> attachments, String enterpriseId, String wxEnterpriseId, String relationKey) {
+        if (StringUtils.isEmpty(enterpriseId) || StringUtils.isEmpty(relationKey)) {
+            log.info("带参二维码无法发送");
+            return;
+        }
         log.info("发送带参小程序：wxEnterpriseId:{}", wxEnterpriseId);
         //发送小程序
         TabMiniprogramSetting miniprogramSetting = miniprogramSettingService.getMiniprogramSetting(wxEnterpriseId, enterpriseId);
@@ -649,6 +655,10 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     private void attachmentAddParamQrCode(List<QywxExternalMessageBaseDTO> attachments, String enterpriseId, String clerkId,
                                           WxEnterpriseDTO wxEnterpriseDTO, String relationKey) {
+        if (StringUtils.isEmpty(enterpriseId) || StringUtils.isEmpty(clerkId)) {
+            log.info("带参小程序无法发送");
+            return;
+        }
         //带参数的公众号二维码
         String sceneStr = "QWHY_" + relationKey + "_" + clerkId;
         //30天失效