|
@@ -794,19 +794,6 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
params = detailMap.get(note.getIdCardNumber());
|
|
params = detailMap.get(note.getIdCardNumber());
|
|
params.put("amount", String.valueOf(new BigDecimal((String) params.get("amount")).add(note.getSettleAmount()).doubleValue()));
|
|
params.put("amount", String.valueOf(new BigDecimal((String) params.get("amount")).add(note.getSettleAmount()).doubleValue()));
|
|
|
|
|
|
-
|
|
|
|
- LocalDate startTime = (LocalDate) params.get("taskStartTime");
|
|
|
|
- LocalDate endTime = (LocalDate) params.get("taskEndTime");
|
|
|
|
- LocalDate noteCreateTime = wmScorePackage.getCreateTime().toLocalDate();
|
|
|
|
- LocalDate noteUpdateTime = wmScorePackage.getUpdateTime().toLocalDate();
|
|
|
|
-
|
|
|
|
- if (noteCreateTime.isBefore(startTime)) {
|
|
|
|
- params.put("taskStartTime", wmScorePackage.getCreateTime().toLocalDate());
|
|
|
|
- }
|
|
|
|
- if (noteUpdateTime.isAfter(endTime)) {
|
|
|
|
- params.put("taskEndTime", wmScorePackage.getUpdateTime().toLocalDate());
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
Set<Integer> ids = (Set<Integer>) params.get("noteIds");
|
|
Set<Integer> ids = (Set<Integer>) params.get("noteIds");
|
|
ids.add(note.getId());
|
|
ids.add(note.getId());
|
|
params.put("noteIds", ids);
|
|
params.put("noteIds", ids);
|
|
@@ -895,8 +882,10 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
note.setId(id);
|
|
note.setId(id);
|
|
note.setUpdateTime(LocalDateTime.now());
|
|
note.setUpdateTime(LocalDateTime.now());
|
|
|
|
+ note.setSubToGigTime(now);
|
|
note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
|
|
note.setSettleNoteStatus(DingEnum.NOTE_STATUS_SUBMIT.getType());
|
|
// 新增字段streamId
|
|
// 新增字段streamId
|
|
note.setStreamId(dataJsonObj.getStr("requestId"));
|
|
note.setStreamId(dataJsonObj.getStr("requestId"));
|
|
@@ -908,7 +897,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
note.setId(id);
|
|
note.setId(id);
|
|
log.info("政企之星结算提交失败: {}", note.getSettleNo());
|
|
log.info("政企之星结算提交失败: {}", note.getSettleNo());
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
note.setUpdateTime(LocalDateTime.now());
|
|
note.setUpdateTime(LocalDateTime.now());
|
|
|
|
+ note.setSubToGigTime(now);
|
|
note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
this.baseMapper.updateById(note);
|
|
this.baseMapper.updateById(note);
|
|
log.info("认证状态异常,结算解锁settleNoteId:{}", note.getId());
|
|
log.info("认证状态异常,结算解锁settleNoteId:{}", note.getId());
|
|
@@ -924,7 +915,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
|
|
WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
WmScorePackageSettleNote note = new WmScorePackageSettleNote();
|
|
note.setId(id);
|
|
note.setId(id);
|
|
log.info("政企之星结算提交失败: {}", note.getSettleNo());
|
|
log.info("政企之星结算提交失败: {}", note.getSettleNo());
|
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
note.setUpdateTime(LocalDateTime.now());
|
|
note.setUpdateTime(LocalDateTime.now());
|
|
|
|
+ note.setSubToGigTime(now);
|
|
note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
|
|
this.baseMapper.updateById(note);
|
|
this.baseMapper.updateById(note);
|
|
log.info("认证状态异常,结算解锁settleNoteId:{}", note.getId());
|
|
log.info("认证状态异常,结算解锁settleNoteId:{}", note.getId());
|