Merge branch 'feature-haoban-role' into developer

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

@@ -189,7 +189,7 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             return;
         }
         String messageTitle = "账号申请";
-        String content = staffDTO.getStaffName() + "申请关联导购code（" + clerkCode + "）";
+        String content = staffDTO.getStaffName() + "关联导购code（" + clerkCode + "）";
         JSONObject jsonObject = new JSONObject();
         jsonObject.put("storeId", storeId);
         String data = jsonObject.toJSONString();
@@ -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

@@ -267,11 +267,17 @@ public class AuditController extends WebBaseController {
                 //导购绑定
                 StaffClerkRelationDTO staffClerkRelation = staffClerkRelationApiService.getByCodeAndEnterpriseId(clerkCode, enterpriseId);
                 StaffClerkRelationDTO have = staffClerkRelationApiService.getOneByStoreIdAndStaffId(storeId, auditStaffId);
+                ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
                 if (have != null) {
                     audit.setAuditStatus(5);
-                    audit.setAuditReason("该成员在该门店下已经绑定过一个导购了");
+                    String reason = "该成员在该门店下已经绑定过一个导购了";
+                    if (clerkDTO != null) {
+                        if (clerkDTO.getClerkType() == 2) {
+                            reason = "该成员在该商户下已经绑定过一个区经了";
+                        }
+                    }
+                    audit.setAuditReason(reason);
                 } else {
-                    ClerkDTO clerkDTO = clerkService.getClerkByClerkId(clerkId);
                     if (clerkDTO == null) {
                         audit.setAuditStatus(5);
                         audit.setAuditReason("gic已删除该导购");