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

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

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

@@ -1932,7 +1932,6 @@ public class OrderServiceImpl implements Orderservice {
             return orderPayResponse;
         } catch (Exception e) {
             LogUtil.error("getPreOrderPay_error", JSONObject.toJSONString(orderBean), JSONObject.toJSONString(paymentRequest));
-            log.error("创建支付异常 trackingNo:{} ex:{}", trackingNo, JSONObject.toJSONString(e));
             //TODO 邮件告警
             return null;
         }