Merge branch 'fixbug_2022_0301' of http://git.gicdev.com/haoban3.0/haoban-manage3.0

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

@@ -115,6 +115,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("不符合鸿星尔克需求,返回");
             return;
         }
+        if (StringUtils.isEmpty(qywxCallBackDTO.getMobile())) {
+            log.info("手机号参数为空, 不作处理");
+            return;
+        }
         try {
             // 放开限制
             // if (config.getSuiteId().equals(qywxCallBackDTO.getSuiteId()) || CONTACT_APP.equals(qywxCallBackDTO.getSuiteId())) {
@@ -157,6 +161,10 @@ public class MessageApiServiceImpl implements MessageApiService {
             log.info("没有配置secret：{}", JSONObject.toJSONString(enterprise));
             return;
         }
+        // 这里将员工姓名改一下, 代开发返回的 id 和 name 一样
+        if (Objects.equals(dto.getUserid(), dto.getUserName())) {
+            dto.setUserName((String) response.getResult());
+        }
         // 取第一个企业的id
         doDealUser(dto, relatedList.get(0).getEnterpriseId(), secretSetting.getSecretVal());
 

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

@@ -430,6 +430,8 @@ public class StaffApiServiceImpl implements StaffApiService {
         }
         logger.info("门店变更保存：{}", JSONObject.toJSONString(user));
         staffDepartChange(staff, wxEnterpriseId, user);
+        // 返回结果带上员工姓名
+        res.setResult(staff.getStaffName());
         return res;
     }