Merge branch 'feature/1.9.21-支付sdk-dingkai' into develop

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -107,6 +107,7 @@ import com.freemud.sdk.api.assortment.payment.request.UnifiedOrderRequest;
 import com.freemud.sdk.api.assortment.payment.response.OrderRefundResponse;
 import com.freemud.sdk.api.assortment.payment.response.UnifiedOrderResponse;
 import com.freemud.sdk.api.assortment.payment.service.StandardPaymentService;
+import com.google.common.base.Throwables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.gson.Gson;

order-application-service/src/main/java/cn/freemud/utils/LogUtil.java

@@ -22,6 +22,7 @@ import cn.freemud.service.thirdparty.CouponOnlineClient;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.application.sdk.api.log.LogThreadLocal;
+import com.google.common.base.Throwables;
 import org.apache.commons.lang.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.slf4j.Logger;
@@ -100,7 +101,7 @@ public class LogUtil {
                 message,
                 requestParams,
                 responseParams,
-                DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"), e);
+                DateUtil.convert2String(new Date(), "yyyy-MM-dd HH:mm:ss"), JSONObject.toJSONString(Throwables.getStackTraceAsString(e)));
     }
 
     private static volatile String appName = null;