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

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -571,7 +571,7 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                                            try {
                                                cancelOrder(timeOutOrder.getId(), "超时取消");
                                            } catch (Exception e) {
-                                               LOG.warn("订单取消失败,{}",e.fillInStackTrace());
+                                               LOG.error("订单取消失败,",e);
                                            }
                                        }
                                    }, 60L, TimeUnit.SECONDS);