Commit d189f4c0 authored by fangxinjiang's avatar fangxinjiang

Merge remote-tracking branch 'origin/MVP1.7.13' into MVP1.7.13

parents e0ab3005 a39c24bf
...@@ -85,6 +85,8 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -85,6 +85,8 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
public void handlePushEntry(TGzPushEntry tGzPushEntry) { public void handlePushEntry(TGzPushEntry tGzPushEntry) {
// 先改为推送中 // 先改为推送中
tGzPushEntry.setFailReason("");
tGzPushEntry.setPushTime(LocalDateTime.now());
tGzPushEntry.setPushStatus(CommonConstants.THREE_STRING); tGzPushEntry.setPushStatus(CommonConstants.THREE_STRING);
tGzPushEntry.setUpdateTime(LocalDateTime.now()); tGzPushEntry.setUpdateTime(LocalDateTime.now());
tGzPushEntryService.updateById(tGzPushEntry); tGzPushEntryService.updateById(tGzPushEntry);
...@@ -135,6 +137,8 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -135,6 +137,8 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
} }
// 先改为推送中 // 先改为推送中
findWaitInfo.setFailReason("");
findWaitInfo.setPushTime(LocalDateTime.now());
findWaitInfo.setPushStatus(CommonConstants.THREE_STRING); findWaitInfo.setPushStatus(CommonConstants.THREE_STRING);
findWaitInfo.setUpdateTime(LocalDateTime.now()); findWaitInfo.setUpdateTime(LocalDateTime.now());
tGzPushEntryService.updateById(findWaitInfo); tGzPushEntryService.updateById(findWaitInfo);
...@@ -269,7 +273,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -269,7 +273,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){ if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId()) updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getEmpPushStatus, CommonConstants.ZERO_STRING); .set(TGzEmpInfo::getEmpPushStatus, CommonConstants.ONE_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper); tGzEmpInfoService.update(null, updateEmpWrapper);
} }
} }
...@@ -295,7 +299,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -295,7 +299,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){ if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId()) updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getContractPushStatus, CommonConstants.ZERO_STRING); .set(TGzEmpInfo::getContractPushStatus, CommonConstants.ONE_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper); tGzEmpInfoService.update(null, updateEmpWrapper);
} }
} }
...@@ -376,7 +380,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService { ...@@ -376,7 +380,7 @@ public class TGzPushHandleServiceImpl implements TGzPushHandleService {
if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){ if(CommonConstants.GZ_SUCCESS_CODE.equals(returnMap.get("responseCode"))){
LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TGzEmpInfo> updateEmpWrapper = new LambdaUpdateWrapper<>();
updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId()) updateEmpWrapper.eq(TGzEmpInfo::getBizId, pushInfo.getBizId())
.set(TGzEmpInfo::getContractAttaPushStatus, CommonConstants.ZERO_STRING); .set(TGzEmpInfo::getContractAttaPushStatus, CommonConstants.ONE_STRING);
tGzEmpInfoService.update(null, updateEmpWrapper); tGzEmpInfoService.update(null, updateEmpWrapper);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment