Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java

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 {

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);