刷新绑定门店

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/MemberUnionidRelatedDTO.java

@@ -37,8 +37,18 @@ public class MemberUnionidRelatedDTO implements Serializable{
     
     private String avatar;
 
+    private String welcomeCode;
+
     private static final long serialVersionUID = 1L;
 
+    public String getWelcomeCode() {
+        return welcomeCode;
+    }
+
+    public void setWelcomeCode(String welcomeCode) {
+        this.welcomeCode = welcomeCode;
+    }
+
     public String getMemberUnionidRelatedId() {
         return memberUnionidRelatedId;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/WxEnterpriseRelatedService.java

@@ -21,4 +21,12 @@ public interface WxEnterpriseRelatedService {
 	 * @return
 	 */
 	List<TabHaobanWxEnterprise> listByEnterpriseId(String enterpriseId);
+
+	/**
+	 * 获取企业关联列表 根据商户id
+	 *
+	 * @param enterpriseId
+	 * @return
+	 */
+	TabHaobanWxEnterpriseRelated getByEnterpriseId(String wxEnterpriseId, String enterpriseId);
 }

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

@@ -60,4 +60,9 @@ public class WxEnterpriseRelatedServiceImpl implements WxEnterpriseRelatedServic
         Set<String> wxEnterpriseIds = relateds.stream().map(tab -> tab.getWxEnterpriseId()).collect(Collectors.toSet());
         return wxEnterpriseMapper.listByIds(wxEnterpriseIds);
     }
+
+    @Override
+    public TabHaobanWxEnterpriseRelated getByEnterpriseId(String wxEnterpriseId, String enterpriseId) {
+        return mapper.findOneByEIdAndWxEid(enterpriseId, wxEnterpriseId);
+    }
 }

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

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.*;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
@@ -14,9 +16,7 @@ import com.gic.haoban.manage.service.exception.WxApiLimitException;
 import com.gic.haoban.manage.service.pojo.DealQywxExternalUserPojo;
 import com.gic.haoban.manage.service.service.*;
 import com.gic.mq.sdk.GicMQClient;
-import com.gic.wechat.api.dto.qywx.QywxIinkExternalMessageDTO;
-import com.gic.wechat.api.dto.qywx.QywxImageExternalMessageDTO;
-import com.gic.wechat.api.dto.qywx.QywxTextExternalMessageDTO;
+import com.gic.wechat.api.dto.qywx.*;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
@@ -127,6 +127,9 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 	@Autowired
 	private PowerService powerService;
 
+    @Autowired
+    private EnterpriseService enterpriseService;
+
 	@Override
 	public void dealQywxExternalUser(String params) {
 		log.info("回调：{}", params);
@@ -367,6 +370,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     }
 
+    /**
+     * 创建关联关系
+     *
+     * @param dto
+     */
     private void insertExternalClerkRelatedNew(MemberUnionidRelatedDTO dto) {
         String wxUserId = dto.getWxUserId();
         String wxEnterpriseId = dto.getWxEnterpriseId();
@@ -395,6 +403,19 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("【新增外币联系人】导购和clerk关联为空");
             return;
         }
+
+        TabHaobanWxEnterpriseRelated wxEnterpriseRelated = wxEnterpriseRelatedService.getByEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
+        if (wxEnterpriseRelated == null) {
+            log.info("没有存在企业关联：{},{}", staffClerkRelationDTO.getWxEnterpriseId(), staffClerkRelationDTO.getEnterpriseId());
+            return;
+        }
+        //好友不开卡 发送欢迎语
+        if (wxEnterpriseRelated.getMemberOpenCardFlag() == 1) {
+            log.info("欢迎页面：");
+            addFriendByWelcome(dto, staffClerkRelationDTO);
+            return;
+        }
+
         //新增导购和外部联系人关系
         String clerkCode = staffClerkRelationDTO.getClerkCode();
         ClerkDTO clerk = clerkService.getClerkByClerkCode(staffClerkRelationDTO.getEnterpriseId(), clerkCode);
@@ -403,6 +424,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("【新增外币联系人】导购为空:{},{}", clerkCode, unionId);
             return;
         }
+
         String qrcodeParam = clerk.getQrcodeParam();
         if (StringUtils.isBlank(qrcodeParam)) {
             powerService.saveClerkQrCode(clerk.getClerkId());
@@ -413,6 +435,7 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
             log.info("不能生产导购二维码：{}", JSONObject.toJSONString(clerk));
             return;
         }
+
         log.info("【新增外部联系人会员】enterpriseId={},unionId={},name={},avatar={},QrcodeParam={}", staffClerkRelationDTO.getEnterpriseId(), unionId, name, avatar, qrcodeParam);
         MemberDTO member = memberOpenCardBusinessService.getMemberByQywxChannelParam(staffClerkRelationDTO.getEnterpriseId(), unionId, "", name, avatar, qrcodeParam);
         if (member == null) {
@@ -452,6 +475,33 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
     }
 
+    /**
+     * 欢迎语新增好友
+     *
+     * @param dto
+     */
+    private void addFriendByWelcome(MemberUnionidRelatedDTO dto, StaffClerkRelationDTO staffClerkRelationDTO) {
+        EnterpriseDTO enterpriseDTO = enterpriseService.getEnterpriseById(staffClerkRelationDTO.getEnterpriseId());
+        QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();
+        qywxWelcomeMsgDTO.setText("测试欢迎");
+        QywxMiniprogramExternalBaseDTO messageBaseDTO = new QywxMiniprogramExternalBaseDTO();
+        messageBaseDTO.setAppid(enterpriseDTO.getMallMiniprogramAppid());
+        String mediaId = materialApiService.reUpdalodMetail("41528646ad0e44aa8b479fb7da1ece92");
+        messageBaseDTO.setPicMediaId(mediaId);
+        messageBaseDTO.setTitle("ces");
+        messageBaseDTO.setPage("/pages/mall/mall-index/mall-index?test=1");
+        qywxWelcomeMsgDTO.setAttachments(new ArrayList<>());
+        qywxWelcomeMsgDTO.getAttachments().add(messageBaseDTO);
+
+        if (dto.getSuiteid().equals(SELF_APP)) {
+            SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(dto.getWxEnterpriseId(), SecretTypeEnum.HAOBAN_HELP.getVal());
+            qywxUserApiService.sendSelfWelcomeMsgByExternal(dto.getCorpid(), secretSetting.getSecretVal(), )
+        } else {
+            qywxUserApiService.sendWelcomeMsgByExternal(dto.getCorpid(), config.getWxSuiteid(), qywxWelcomeMsgDTO);
+
+        }
+    }
+
     @Deprecated
     private String insertMemberUnionIdRelated(MemberUnionidRelatedDTO dto) {
         if(dto == null){