方法多余字段去除

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

@@ -344,7 +344,7 @@ public class PayServiceImpl {
             }
         } else if (orderBean.getAmount() > 0 && StringUtils.isNotEmpty(cardCode)) {
             //svc卡支付
-            orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, orderBean.getOid(), LogThreadLocal.getTrackingNo());
+            orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, orderBean.getOid());
             orderExtInfoDto.setPrePayTransId(orderPayResponse.getPayTransId());
         } else if (orderBean.getAmount() < 0) {
             throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
@@ -644,9 +644,9 @@ public class PayServiceImpl {
         //混合支付
         if (check && StringUtils.isNotBlank(channel)) {
             String partnerPayOvertime = this.getPartnerPayOvertime(orderBean.getCompanyId());
-            orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId, trackingNo);
+            orderPayResponse = comPayOrder(cardCode, orderBean, paymentRequest, partnerPayOvertime, totalAmount.intValue(), channel, storeId);
         } else {//svc 支付
-            orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId, trackingNo);
+            orderPayResponse = svcPay(cardCode, orderBean, paymentRequest, transId);
         }
         return orderPayResponse;
     }
@@ -661,8 +661,7 @@ public class PayServiceImpl {
             , String partnerPayOvertime
             , Integer totalAmount
             , String channel
-            , String storeId
-            , String trackingNo) {
+            , String storeId) {
 
         String ebCode = this.getPayCodeByChanel(paymentRequest.getWxAppId(), channel, storeId);
         OrderPayResponse orderPayResponse = new OrderPayResponse();
@@ -745,7 +744,7 @@ public class PayServiceImpl {
     /**
      * 纯储值卡或礼品卡支付
      */
-    public OrderPayResponse svcPay(String cardCode, OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId, String trackingNo) {
+    public OrderPayResponse svcPay(String cardCode, OrderBeanV1 orderBean, PaymentRequest paymentRequest, String transId) {
         FacePayRequestDto request = new FacePayRequestDto();
         OrderPayResponse orderPayResponse = new OrderPayResponse();
         String partnerId = orderBean.getCompanyId();
@@ -1279,6 +1278,9 @@ public class PayServiceImpl {
     }
 
 
+    /**
+     * 退款从sdk 剥离
+     */
     public com.freemud.application.sdk.api.base.BaseResponse<OrderRefundResponse> orderRefundNew(OrderRefundRequest refundRequest) {
 
         PaymentQueryOrderRequestDto paymentQueryOrderRequest = new PaymentQueryOrderRequestDto();