Merge remote-tracking branch 'origin/developer' into developer

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

@@ -4,38 +4,45 @@ import java.io.Serializable;
 
 public class LoginDTO implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	private StaffDTO staffDTO;
-	
-	private  String wxEnterpriseId;
+    private StaffDTO staffDTO;
 
-	private Integer wxEnterpriseType;
+    private String wxEnterpriseId;
 
-	public Integer getWxEnterpriseType() {
-		return wxEnterpriseType;
-	}
+    private String enterpriseId;
 
-	public void setWxEnterpriseType(Integer wxEnterpriseType) {
-		this.wxEnterpriseType = wxEnterpriseType;
-	}
+    private Integer wxEnterpriseType;
 
-	public StaffDTO getStaffDTO() {
-		return staffDTO;
-	}
+    public Integer getWxEnterpriseType() {
+        return wxEnterpriseType;
+    }
 
-	public void setStaffDTO(StaffDTO staffDTO) {
-		this.staffDTO = staffDTO;
-	}
+    public void setWxEnterpriseType(Integer wxEnterpriseType) {
+        this.wxEnterpriseType = wxEnterpriseType;
+    }
 
-	public String getWxEnterpriseId() {
-		return wxEnterpriseId;
-	}
+    public StaffDTO getStaffDTO() {
+        return staffDTO;
+    }
 
-	public void setWxEnterpriseId(String wxEnterpriseId) {
-		this.wxEnterpriseId = wxEnterpriseId;
-	}
-	
-	
+    public void setStaffDTO(StaffDTO staffDTO) {
+        this.staffDTO = staffDTO;
+    }
 
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getEnterpriseId() {
+        return enterpriseId;
+    }
+
+    public void setEnterpriseId(String enterpriseId) {
+        this.enterpriseId = enterpriseId;
+    }
 }

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

@@ -1839,6 +1839,12 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         String[] s = sceneStr.split("_");
         String relationKey = s[1];
         TabHaobanExternalClerkRelated externalClerkRelated = externalClerkRelatedMapper.getByRelationKey(relationKey);
+        if (externalClerkRelated == null) {
+            log.error("关注公共号-会员回调好办关联好友,未查询到,relationKey：{}",relationKey);
+            serviceResponse.setCode(0);
+            serviceResponse.setMessage("未查询到好友关系");
+            return serviceResponse;
+        }
         externalClerkRelatedApiService.bindMemberIdExternalById(externalClerkRelated.getExternalClerkRelatedId(), enterpriseId, memberId, unionid);
         return serviceResponse;
     }

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

@@ -236,27 +236,27 @@ public class LoginController extends WebBaseController {
         WxEnterpriseDTO detailDTO = enterpriseDTOList.stream().filter(dto -> dto.getWxEnterpriseId().equals(wxEnterpriseId)).findFirst().orElse(null);
 
         if (null == detailDTO) {
-            logger.info("登录失败，不存在对应企业:{}", o);
+            logger.info("登录失败，不存在对应企业:gicEnterpriseId:{}",gicEnterpriseId );
             ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false));
             return model;
         }
 
         StaffDTO staff = staffApiService.selectByNationcodeAndPhoneNumber(detailDTO.getWxEnterpriseId(), "86", loginPhoneNumber);
         if (null == staff) {
-            logger.info("登录用户手机号不存在!{}", o);
+            logger.info("登录用户手机号不存在!gicEnterpriseId:{}", gicEnterpriseId);
             ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false));
             return model;
         }
 
         WxApplicationDTO application = wxApplicationApiService.selectByWxEnterpriseIdAndApplicationType(wxEnterpriseId, 2);
         if (null == application) {
-            logger.info("登录企业应用 没授权!{}");
+            logger.info("登录企业应用 没授权!gicEnterpriseId:{}",gicEnterpriseId);
             ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false));
             return model;
         }
         WxEnterpriseDTO enterprise = wxEnterpriseApiService.getOne(wxEnterpriseId);
         if (null == enterprise) {
-            logger.info("登录失败，不存在对应企业:{}", o);
+            logger.info("登录失败，不存在对应企业:wxEnterpriseId{}", wxEnterpriseId);
             ModelAndView model = new ModelAndView(new RedirectView("/haoban-3/#/gic-error", false, false));
             return model;
         }
@@ -287,6 +287,7 @@ public class LoginController extends WebBaseController {
         }
         LoginDTO loginDTO = new LoginDTO();
         loginDTO.setWxEnterpriseId(detailDTO.getWxEnterpriseId());
+        loginDTO.setEnterpriseId(gicEnterpriseId);
         loginDTO.setStaffDTO(staff);
         String redirectUri = config.getHost() + "index";
         redirectUri = redirectUri.replace("haoban-manage3-web", "haoban-3/#");

haoban-manage3-wx/src/main/webapp/WEB-INF/spring-interceptor.xml

@@ -3,8 +3,8 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
     <mvc:interceptors>
-        <bean class="com.gic.haoban.common.interceptor.HttpLimitInterceptor"/>
         <bean class="com.gic.commons.interceptor.HeaderTagInterceptor"/>
+        <bean class="com.gic.haoban.common.interceptor.HttpLimitInterceptor"/>
         <bean class="com.gic.haoban.common.ext.PropertyViewClearInterceptor"/>
         <mvc:interceptor>
             <mvc:mapping path="/**"/>