Merge branch 'developer' into 'master'

Developer

See merge request !102

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

@@ -504,10 +504,11 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
 
 
         TabWelcome tabWelcome = welcomeMapper.selectByWxEnterpriseId(staffClerkRelationDTO.getWxEnterpriseId());
-        if (tabWelcome.getOpenFlag() == 0) {
+        if (null == tabWelcome || tabWelcome.getOpenFlag() == 0) {
             log.info("不用发送欢迎语：{},{}", dto.getWxEnterpriseId(), JSONObject.toJSONString(tabWelcome));
             return;
         }
+
         String externalName = dto.getExternalName();
         String content = tabWelcome.getWelcomeContent().replaceAll("<微信昵称>", externalName);
         QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();

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

@@ -169,6 +169,10 @@ public class ClerkController extends WebBaseController{
 		AuditSettingVO auditSettingVO = new AuditSettingVO();
 
 		ClerkMainStoreRelatedDTO mainStore = clerkMainStoreRelatedApiService.getWxEnterpriseIdAndStaffId(wxEnterpriseId, staffId);
+		if (mainStore == null){
+			logger.info("该门店不存在");
+			return resultResponse(HaoBanErrCode.ERR_5);
+		}
 		String mainStoreId = mainStore.getStoreId();
 		StoreDTO storeDTO = storeService.getStore(mainStoreId);
 		if (null == storeDTO) {

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

@@ -246,6 +246,14 @@ public class InfoController extends WebBaseController{
         relatedDTO.setGicEnterpriseId(qo.getGicEnterpriseId());
         staffMemberRelationApiService.bindMemberAndStaff(relatedDTO);
 
+        //补充字段赋值
+        user.setStaffId(staffDTO.getStaffId());
+        user.setWxEnterpriseId(staffDTO.getWxEnterpriseId());
+        user.setStaffName(staffDTO.getStaffName());
+        user.setPhoneNumber(staffDTO.getPhoneNumber());
+        user.setNationCode(staffDTO.getNationCode());
+        user.setWxUserId(staffDTO.getWxUserId());
+
 
         List<StaffClerkInfoDTO> result = staffClerkRelationApiService.listBindDetailByStaffId(staffDTO.getStaffId());
 

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

@@ -219,7 +219,7 @@ public enum HaoBanErrCode {
 
     ERR_11122(11122,"手机号已存在"),
 
-    ERR_11123(11123, "还不是好办好友，需要在好办端刷新企业微信好友"),
+    ERR_11123(11123, "请到好办端刷新企业微信好友"),
 
     ERR_11124(11124, "好办小程序配置没有配置对应的小程序"),
 

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/qo/MemberLoginQo.java

@@ -16,6 +16,18 @@ public class MemberLoginQo implements Serializable {
     private String corpId;
     private List<StoreMemberVO> storeList;
 
+    private String staffId;
+
+    private String wxEnterpriseId;
+
+    private String staffName;
+
+    private String phoneNumber;
+
+    private String nationCode;
+
+    private String wxUserId;
+
     public String getUserId() {
         return userId;
     }
@@ -39,4 +51,52 @@ public class MemberLoginQo implements Serializable {
     public void setStoreList(List<StoreMemberVO> storeList) {
         this.storeList = storeList;
     }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+
+    public String getNationCode() {
+        return nationCode;
+    }
+
+    public void setNationCode(String nationCode) {
+        this.nationCode = nationCode;
+    }
+
+    public String getWxUserId() {
+        return wxUserId;
+    }
+
+    public void setWxUserId(String wxUserId) {
+        this.wxUserId = wxUserId;
+    }
 }