app/third/paymentService/payment_service.go

@@ -9,6 +9,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"github.com/qit-team/snow-core/log/logger"
 	"strconv"
 )
 
@@ -47,7 +48,7 @@ type PayOrderResponse struct {
 
 // PaymentService	统一发起支付
 func PaymentService(c context.Context, payOrderRequest PayOrderRequest) PayOrderResponse {
-	//logger.Info(c, "PaymentService 收到支付请求", payOrderRequest)
+	logger.Info(c, "PaymentService 收到支付请求", payOrderRequest)
 	var err error
 	var info string
 	var payOrderResponse PayOrderResponse
@@ -72,7 +73,7 @@ func PaymentService(c context.Context, payOrderRequest PayOrderRequest) PayOrder
 			ErrorMsg: err.Error(),
 		}
 		logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL
-	} else if payOrderResponse.ErrorMsg == "" {
+	} else {
 		payOrderResponse = PayOrderResponse{
 			Code:     payCommon.PAY_SUCCESS_CODE,
 			ErrorMsg: "",
@@ -141,7 +142,7 @@ func PayOrderQuery(c context.Context, payOrderQueryRequest PayOrderQueryRequest)
 			ErrorMsg: err.Error(),
 		}
 		logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL
-	} else if payOrderQueryResponse.ErrorMsg == "" {
+	} else {
 		payOrderQueryResponse = PayOrderQueryResponse{
 			Code:   payCommon.PAY_SUCCESS_CODE,
 			Result: info,
@@ -187,7 +188,7 @@ type OrderRefundInfo struct {
 
 // OrderRefund	订单退款
 func OrderRefund(c context.Context, orderRefundRequest OrderRefundRequest) OrderRefundResponse {
-	//logger.Info(c, "PaymentService 收到退款请求", orderRefundRequest)
+	logger.Info(c, "PaymentService 收到退款请求", orderRefundRequest)
 	var err error
 	var info OrderRefundInfo
 	var orderRefundResponse OrderRefundResponse
@@ -211,7 +212,7 @@ func OrderRefund(c context.Context, orderRefundRequest OrderRefundRequest) Order
 			ErrorMsg: err.Error(),
 		}
 		logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL
-	} else if orderRefundResponse.ErrorMsg == "" {
+	} else {
 		orderRefundResponse = OrderRefundResponse{
 			Code:   payCommon.PAY_SUCCESS_CODE,
 			Result: info,
@@ -268,7 +269,7 @@ func OrderRefundQuery(c context.Context, orderRefundQueryRequest OrderRefundQuer
 			ErrorMsg: err.Error(),
 		}
 		logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL
-	} else if orderRefundQueryResponse.ErrorMsg == "" {
+	} else {
 		orderRefundQueryResponse = OrderRefundQueryResponse{
 			Code:   payCommon.PAY_SUCCESS_CODE,
 			Result: info,
@@ -306,7 +307,7 @@ type OrderCloseInfo struct {
 
 // OrderClose	关闭订单
 func OrderClose(c context.Context, orderCloseRequest OrderCloseRequest) OrderCloseResponse {
-	//logger.Info(c, "PaymentService 收到关闭订单请求", orderCloseRequest)
+	logger.Info(c, "PaymentService 收到关闭订单请求", orderCloseRequest)
 	var err error
 	var info OrderCloseInfo
 	var orderCloseResponse OrderCloseResponse
@@ -330,7 +331,7 @@ func OrderClose(c context.Context, orderCloseRequest OrderCloseRequest) OrderClo
 			ErrorMsg: err.Error(),
 		}
 		logStatus = common.THIRD_ORDER_LOG_STATUS_FAIL
-	} else if orderCloseResponse.ErrorMsg == "" {
+	} else {
 		orderCloseResponse = OrderCloseResponse{
 			Code:   payCommon.PAY_SUCCESS_CODE,
 			Result: info,