会员关联提示

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

@@ -130,7 +130,7 @@ public class StoreRangeServiceImpl implements StoreRangeService {
             Set<String> mid = needDelStoreIds.stream().collect(Collectors.toSet());
             needUnBindStoreIds.addAll(mid);
         });
-        //todo 销售线索 解绑 这些门店解除绑定
+        //这些门店解除绑定
         staffClerkRelationService.delBindByStoreIds(null, needUnBindStoreIds, optStaffId, channelCode);
         //先删除 后新增
         tabHaobanStoreRelationMapper.deleteAllStoreRalation(enterpriseId);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/InfoController.java

@@ -35,7 +35,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -350,6 +349,15 @@ public class InfoController extends WebBaseController{
         if (StringUtils.isAnyBlank(externalUserid, wxUserId, wxEnterpriseId)) {
             return resultResponse(HaoBanErrCode.ERR_2);
         }
+        WxEnterpriseRelationDetailDTO enterpriseBindInfo = wxEnterpriseRelatedApiService.getEnterpriseBindInfo(wxEnterpriseId, gicEnterpriseId);
+        if (null == enterpriseBindInfo) {
+            logger.info("企业不存在没有绑定");
+            return resultResponse(HaoBanErrCode.ERR_400002);
+        }
+        if (enterpriseBindInfo.getMemberOpenCardFlag() != 1) {
+            logger.info("该企业在同一个开平，无需手动关联:wxEid:{}, eid:{}", wxEnterpriseId, gicEnterpriseId);
+            return resultResponse(HaoBanErrCode.ERR_11125);
+        }
         MemberUnionidRelatedDTO memberUnionidRelatedDTO = memberUnionidRelatedApiService.getExternalUseridInfoBySelfExternalUserId(wxEnterpriseId, wxUserId, externalUserid);
         if (null == memberUnionidRelatedDTO) {
             logger.info("请刷新好友");

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/errCode/HaoBanErrCode.java

@@ -223,6 +223,8 @@ public enum HaoBanErrCode {
 
     ERR_11124(11124, "好办小程序配置没有配置对应的小程序"),
 
+    ERR_11125(11125, "该企业与gic在同一开平，无需手动关联好友会员"),
+
     ERR_999(999, "操作失败"),
     ERR_DEFINE(-888, "自定义错误"),