误删登记状态

dev
anthonywj 2 years ago
parent 702c4798d0
commit 447526f19c

@ -162,6 +162,7 @@ public class IoOrderController extends BaseController {
if (ioOrderResponse.getCheckStatus() == null) { if (ioOrderResponse.getCheckStatus() == null) {
ioOrderResponse.setCheckStatus(0 + ""); ioOrderResponse.setCheckStatus(0 + "");
} }
ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
} }
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list); PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);

@ -99,8 +99,6 @@ public class HeartService {
IoOrderDetailCodeService orderDetailCodeService; IoOrderDetailCodeService orderDetailCodeService;
@Resource @Resource
IoOrderDetailResultService orderDetailResultService; IoOrderDetailResultService orderDetailResultService;
@Resource
IoOrderInvoiceService orderInvoiceService;
@Resource @Resource
IoOrderInvoiceMapper ioOrderInvoiceMapper; IoOrderInvoiceMapper ioOrderInvoiceMapper;
@ -1995,15 +1993,6 @@ public class HeartService {
} }
} }
//更新发票信息
// if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
// List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
// for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
// if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
// ioOrderInvoiceMapper.insertOrUpdate(orderInvoiceEntity);
// }
// }
// }
} }

@ -289,7 +289,7 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
*/ */
private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) { private boolean verifyTask(ThrSystemDetailEntity thrSystemDetailEntity) {
String taskKey = getTaskKey(thrSystemDetailEntity); String taskKey = getTaskKey(thrSystemDetailEntity);
ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey); ThirdSysInterfaceExecuteVo vo = getLastResult(taskKey);
if (null != vo && !vo.isFinished()) { if (null != vo && !vo.isFinished()) {
log.info(vo.getKey() + "有任务尚未执行完成当前任务key{}", taskKey); log.info(vo.getKey() + "有任务尚未执行完成当前任务key{}", taskKey);
return false; return false;
@ -298,12 +298,12 @@ public class SyncThirdSysTask implements SchedulingConfigurer {
if (vo != null) { if (vo != null) {
long lastTime = vo.getNextTime(); long lastTime = vo.getNextTime();
long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60; long timeInterval = Long.parseLong(thrSystemDetailEntity.getTime().intValue() + "") * 1000 * 60;
if (curTime - lastTime < timeInterval) { if (curTime - lastTime < timeInterval) {
log.info("定时任务时间未到---" + taskKey); log.info("定时任务时间未到---" + taskKey);
return false; return false;
} else { } else {
return true; return true;
} }
} else { } else {
vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo()); vo = Optional.ofNullable(vo).orElse(new ThirdSysInterfaceExecuteVo());

Loading…
Cancel
Save