Merge remote-tracking branch 'origin/test' into test

# Conflicts:
#	src/main/java/com/sqx/modules/job/task/TempOrdersTask.java

src/main/java/com/sqx/modules/job/task/TempOrdersTask.java

@@ -99,6 +99,9 @@ public class TempOrdersTask implements ITask {
                     logger.info("payDetails：{} ", JSONUtil.toJsonStr(payDetails));
                     logger.info("order：{} ", JSONUtil.toJsonStr(order));
                     updateOrderStatus(payDetails, order);
+                } else {
+                    order.setStatus(3);
+                    updateOrderStatus(payDetails, order);
                 }
             } catch (Exception e) {
                 logger.error("查询订单异常：{}", e);