|
@@ -75,7 +75,8 @@ public class WeComUserDetailJob {
|
|
|
}
|
|
}
|
|
|
String response = apiClient.getRunClientByUuid(new UuidRequest(uuid));
|
|
String response = apiClient.getRunClientByUuid(new UuidRequest(uuid));
|
|
|
CommonResponse<LoginInfo> commonResponse =
|
|
CommonResponse<LoginInfo> commonResponse =
|
|
|
- JSONObject.parseObject(response, new TypeReference<CommonResponse<LoginInfo>>() {});
|
|
|
|
|
|
|
+ JSONObject.parseObject(response, new TypeReference<CommonResponse<LoginInfo>>() {
|
|
|
|
|
+ });
|
|
|
if (commonResponse.getErrcode() == 0) {
|
|
if (commonResponse.getErrcode() == 0) {
|
|
|
LoginInfo loginInfo = commonResponse.getData();
|
|
LoginInfo loginInfo = commonResponse.getData();
|
|
|
staff.setAvatar(loginInfo.getUser_info().getObject().getAvatar());
|
|
staff.setAvatar(loginInfo.getUser_info().getObject().getAvatar());
|
|
@@ -118,13 +119,13 @@ public class WeComUserDetailJob {
|
|
|
List<Integer> deleteStatusList = Arrays.asList(0, 8, 2049);
|
|
List<Integer> deleteStatusList = Arrays.asList(0, 8, 2049);
|
|
|
ThirdPartWeComStaffUser existUser = existUserMap.get(contactItem.getUser_id());
|
|
ThirdPartWeComStaffUser existUser = existUserMap.get(contactItem.getUser_id());
|
|
|
existUser.setUpdateTime(new Date());
|
|
existUser.setUpdateTime(new Date());
|
|
|
- if (deleteStatusList.contains(contactItem.getStatus())
|
|
|
|
|
- && !deleteStatusList.contains(existUser.getStatus())) {
|
|
|
|
|
- existUser.setRemoveCustomerTime(System.currentTimeMillis() / 1000);
|
|
|
|
|
- } else if (deleteStatusList.contains(contactItem.getStatus())
|
|
|
|
|
- && Objects.isNull(existUser.getRemoveCustomerTime())) {
|
|
|
|
|
- // 历史已删除,设为前一天
|
|
|
|
|
- existUser.setRemoveCustomerTime((System.currentTimeMillis() / 1000) - 86400);
|
|
|
|
|
|
|
+ if (Objects.isNull(existUser.getRemoveCustomerTime()) && deleteStatusList.contains(contactItem.getStatus())) {
|
|
|
|
|
+ if (!deleteStatusList.contains(existUser.getStatus())) {
|
|
|
|
|
+ existUser.setRemoveCustomerTime(System.currentTimeMillis() / 1000);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ // 历史已删除,设为前一天
|
|
|
|
|
+ existUser.setRemoveCustomerTime((System.currentTimeMillis() / 1000) - 86400);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
existUser.setAddCustomerTime(contactItem.getAdd_customer_time());
|
|
existUser.setAddCustomerTime(contactItem.getAdd_customer_time());
|
|
|
existUser.setUnionid(contactItem.getUnionid());
|
|
existUser.setUnionid(contactItem.getUnionid());
|