好办bug修复

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

@@ -63,7 +63,12 @@ public class WxUserAddLogServiceImpl implements WxUserAddLogService {
             entity.setAddChannel(0);
             entity.setStatusFlag(1);
             entity.setStaffId(qdto.getStaffId());
-            entity.setStaffName(qdto.getStaffName());
+            //截取成员name
+            String staffName = qdto.getStaffName();
+            if (null != staffName && staffName.length()>32){
+                staffName = staffName.substring(0, 32);
+            }
+            entity.setStaffName(staffName);
             entity.setAllDelFlag(0);
             if (qdto.isDelFlag()) {
                 TabWxUserAddLog logUser = this.wxUserAddLogMapper.selectNewLog(externalUserid, qdto.getStaffId());

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

@@ -158,7 +158,9 @@ public class WelcomeSendServiceImpl implements WelcomeSendService {
         String content = welcomeBO.getWelcomeContent();
         if (content.contains("<微信昵称>")) {
             String nickName = this.getExternalUserName(qwDTO, externalUserId);
+            nickName = nickName.replaceAll("\\$","RDS_CHAR_DOLLAR");// encode replacement;
             content = content.replaceAll("<微信昵称>", nickName);
+            content = content.replaceAll("RDS_CHAR_DOLLAR","\\$");// decode replacement;
         }
         QywxWelcomeMsgDTO qywxWelcomeMsgDTO = new QywxWelcomeMsgDTO();
         // 欢迎语内容

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

@@ -922,7 +922,13 @@ public class WxStaffController extends WebBaseController {
         AuditDTO auditDTO = auditApiService.findByBindRelatedIdAndAuditType(clerkId, AuditType.CLERK_BIND.getCode(),
                 wxEnterpriseId, clerk.getEnterpriseId());
         if (auditDTO != null) {
-            return resultResponse(HaoBanErrCode.ERR_10018);
+            // 验证码登录不需要管理员审核，需要删除该记录
+            if(auditType == 2){
+                auditDTO.setStatusFlag(0);
+                auditApiService.update(auditDTO);
+            }else {
+                return resultResponse(HaoBanErrCode.ERR_10018);
+            }
         }
         String storeId = "";
         String storeName = "";