diff --git a/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java b/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java index ce3e2f1b..566cfbc3 100644 --- a/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java +++ b/ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java @@ -585,7 +585,7 @@ public class OpOrderServiceImpl implements OpOrderService { addNewOrderToOrderStatRedis(shopId, orderId); } if ((ObjectUtil.isEmpty(dbOpOrderInfo) && OrderConst.ORDER_STATUS_WAIT_PAY != order.getOrderStatus().intValue()) - || (dbOpOrderInfo.getOrderStatus().intValue() == OrderConst.ORDER_STATUS_WAIT_PAY) && order.getOrderStatus().intValue() != OrderConst.ORDER_STATUS_WAIT_PAY) { + || ObjectUtil.isNotEmpty(dbOpOrderInfo) && (dbOpOrderInfo.getOrderStatus().intValue() == OrderConst.ORDER_STATUS_WAIT_PAY) && order.getOrderStatus().intValue() != OrderConst.ORDER_STATUS_WAIT_PAY) { increaseNewPayingOrderToOrderStatRedis(); } try { diff --git a/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java b/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java index 67a69959..d141639f 100644 --- a/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java @@ -2654,10 +2654,8 @@ public class ProcessProductPublishTaskService extends TaskBaseService { addTaskBuffer(shopId, taskId, detailId, 1, queueMsg.getLimitSource(), tryTimes + 1, DateUtil.formatDateTime(DateUtil.offsetSecond(new Date(), new Random().nextInt(541) + 60))); return Ret.success(); } - String publishStat = processRet.getCode(); - MoveCollectTaskDetail updateMoveCollectTaskDetailDto = new MoveCollectTaskDetail(); - updateMoveCollectTaskDetailDto.setStatus(processRet.getCode()); + updateMoveCollectTaskDetailDto.setStatus(StatusConst.fail); updateMoveCollectTaskDetailDto.setReason(processRet.getReason()); updateMoveCollectTaskDetailDto.setPublishCostSeconds(publishCostSeconds);