feat：文案

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/AuditType.java

@@ -5,7 +5,7 @@ package com.gic.haoban.manage.api.enums;
  */
 public enum AuditType {
     STORE_CHANGE(1, "门店信息变更"),
-    CLERK_BIND(2,"导购绑定"),
+    CLERK_BIND(2,"账号绑定"),
     CLERK_ADD(3,"导购新增"),
     CLERK_DEL(4,"导购删除"),
     CLERK_UNBIND(5,"导购解除绑定");

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/NoticeMessageTypeEnum.java

@@ -28,10 +28,10 @@ public enum NoticeMessageTypeEnum {
     TASK_TRANS(2010, "话务任务通知", NoticeMessageCategoryTypeEnum.TASK.getType(), "task_trans", "/pages/route/index?pageType=", "hbapp_task_list_new"),
 
 
-    STORE_ACCOUNT(3001, "门店账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account", "/pages/route/index?pageType=", "store_relate_store_record_list"),
-    MEMBER_FACE(3002, "门店账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "member_face", "/pages/route/index?pageType=", "hbapp_customer_edit_tag"),
-    STORE_ACCOUNT_REFUSE(3010, "门店账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account_refuse", "/pages/route/index?pageType=", "store_relate_store_record_list"),
-    STORE_ACCOUNT_AGREE(3011, "门店账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account_agree", "/pages/route/index?pageType=", "store_relate_store_record_list"),
+    STORE_ACCOUNT(3001, "账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account", "/pages/route/index?pageType=", "store_relate_store_record_list"),
+    MEMBER_FACE(3002, "账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "member_face", "/pages/route/index?pageType=", "hbapp_customer_edit_tag"),
+    STORE_ACCOUNT_REFUSE(3010, "账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account_refuse", "/pages/route/index?pageType=", "store_relate_store_record_list"),
+    STORE_ACCOUNT_AGREE(3011, "账号申请", NoticeMessageCategoryTypeEnum.OTHER.getType(), "store_account_agree", "/pages/route/index?pageType=", "store_relate_store_record_list"),
 
     CLERK_ADD_REFUSE(3020, "导购新增通知", NoticeMessageCategoryTypeEnum.OTHER.getType(), "clerk_add_refuse", "/pages/route/index?pageType=", "store_relate_store_record_list"),
     CLERK_ADD_AGREE(3021, "导购新增通知", NoticeMessageCategoryTypeEnum.OTHER.getType(), "clerk_add_agree", "/pages/route/index?pageType=", "store_relate_store_record_list"),

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

@@ -137,7 +137,14 @@ public class AuditApiServiceImpl implements AuditApiService {
             StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, staffId);
             if (have != null) {
                 tab.setAuditStatus(5);
-                tab.setAuditReason("该成员在该门店下已经绑定过一个导购了");
+                Integer manageFlag = staffClerkRelation.getManageFlag();
+                String reason = "";
+                if (manageFlag != null && manageFlag == 1) {
+                    reason = "该成员在该商户下已经绑定过一个区经了";
+                } else {
+                    reason = "该成员在该门店下已经绑定过一个导购了";
+                }
+                tab.setAuditReason(reason);
                 auditMapper.updateByPrimaryKeySelective(tab);
                 if (StringUtils.isNotBlank(batchId)) {
                     insertBatchLog(batchId, AuditRsultType.fail.getCode(), tab);

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

@@ -188,7 +188,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             logger.info("staff不存在，发送消息失败{}", staffId);
             return;
         }
-        String messageTitle = "门店账号申请";
+        String messageTitle = "账号申请";
         String content = staffDTO.getStaffName() + "申请关联导购code（" + clerkCode + "）";
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("storeId", storeId);
@@ -248,7 +248,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             logger.info("staff不存在，发送消息失败{}", staffId);
             return;
         }
-        String messageTitle = "门店账号申请";
+        String messageTitle = "账号";
         String messageContent = staffDTO.getStaffName() + "申请关联导购code（" + clerkCode + "）";
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("storeId", storeId);

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

@@ -255,7 +255,6 @@ public class AuditController extends WebBaseController {
         String enterpriseId = audit.getEnterpriseId();
         String clerkId = json.getString("clerkId") == null ? "" : json.get("clerkId").toString();
         String clerkName = json.get("clerkName") == null ? "" : json.get("clerkName").toString();
-        String wxUserId = json.getString("wxUserId") == null ? "" : json.get("wxUserId").toString();
         Integer sex = json.getInteger("sex") == null ? 0 : json.getInteger("sex");
         String phoneNumber = json.getString("phoneNumber") == null ? "" : json.get("phoneNumber").toString();
         String nationCode = json.getString("nationCode") == null ? "" : json.get("nationCode").toString();
@@ -319,7 +318,6 @@ public class AuditController extends WebBaseController {
             audit.setAuditStatus(2);
             //发送消息
             if (audit.getAuditType() == AuditType.CLERK_BIND.getCode()) {
-//                staffDepartmentRelatedApiService.sendStaffBind(auditStaffId, clerkCode, storeId, auditStatus, auditReason);
                 staffDepartmentRelatedApiService.sendBindAuditMessage(auditId, auditStaffId, clerkId, auditReason, true);
             } else if (audit.getAuditType() == AuditType.CLERK_ADD.getCode()) {
                 staffDepartmentRelatedApiService.sendClerkAdd(clerkName, clerkCode, storeId, auditStatus, auditReason);