增加系统配置接口

controllers/order.go

@@ -228,7 +228,7 @@ func (this *OrderController) ProductOrderList() {
 				ProductType:   ProductTypeMap[orderItem.ProductType],
 				ProductName:   orderItem.ProductName,
 				TotalAmount:   orderItem.TotalAmount,
-				TradeNO:       orderItem.TradeNO,
+				TradeNO:       orderItem.TradeNo,
 				RefundAmount:  orderItem.RefundAmount,
 				RefundTradeId: orderItem.RefundTradeId,
 				PaymentWay:    PaymentWayMap[orderItem.PaymentWay],
@@ -239,19 +239,19 @@ func (this *OrderController) ProductOrderList() {
 				Remark:        orderItem.Remark,
 				CreatedTime:   orderItem.CreatedTime.Format(time.DateTime),
 			}
-			if orderItem.TradeNO != "" {
+			if orderItem.TradeNo != "" {
 				view.PaymentTime = orderItem.PaymentTime.Format(time.DateTime)
-				tradeOrder, tradeErr := models.GetTradeOrderByNo(orderItem.TradeNO)
+				tradeOrder, tradeErr := models.GetTradeOrderByNo(orderItem.TradeNo)
 				if tradeErr != nil {
-					utils.FileLog.Error("获取支付订单失败，支付订单号：" + orderItem.TradeNO + ",err:" + tradeErr.Error())
+					utils.FileLog.Error("获取支付订单失败，支付订单号：" + orderItem.TradeNo + ",err:" + tradeErr.Error())
 				} else {
 					view.PaymentAmount = fmt.Sprintf("%s %.2f", tradeOrder.Currency, tradeOrder.Amount)
 				}
 			}
 			if orderItem.Status == models.OrderStatusPaid {
-				access, accessErr := models.GetAccess(orderItem.ProductID, orderItem.TemplateUserId)
+				access, accessErr := models.GetAccess(orderItem.ProductId, orderItem.TemplateUserId)
 				if accessErr != nil {
-					utils.FileLog.Error("获取用户订阅记录失败，templateUserId:" + string(rune(orderItem.TemplateUserId)) + "productId:" + string(rune(orderItem.ProductID)) + ",err:" + accessErr.Error())
+					utils.FileLog.Error("获取用户订阅记录失败，templateUserId:" + string(rune(orderItem.TemplateUserId)) + "productId:" + string(rune(orderItem.ProductId)) + ",err:" + accessErr.Error())
 				} else {
 					if access.ProductType == models.ProductPackage {
 						view.ValidDuration = fmt.Sprintf("%s~%s", access.BeginDate.Format(time.DateOnly), access.EndDate.Format(time.DateOnly))
@@ -520,7 +520,7 @@ func (this *OrderController) ExportProductOrder() {
 				ProductType:   ProductTypeMap[orderItem.ProductType],
 				ProductName:   orderItem.ProductName,
 				TotalAmount:   orderItem.TotalAmount,
-				TradeNO:       orderItem.TradeNO,
+				TradeNO:       orderItem.TradeNo,
 				RefundAmount:  orderItem.RefundAmount,
 				RefundTradeId: orderItem.RefundTradeId,
 				PaymentWay:    PaymentWayMap[orderItem.PaymentWay],
@@ -530,19 +530,19 @@ func (this *OrderController) ExportProductOrder() {
 				Remark:        orderItem.Remark,
 				CreatedTime:   orderItem.CreatedTime.Format(time.DateTime),
 			}
-			if orderItem.TradeNO != "" {
+			if orderItem.TradeNo != "" {
 				view.PaymentTime = orderItem.PaymentTime.Format(time.DateTime)
-				tradeOrder, tradeErr := models.GetTradeOrderByNo(orderItem.TradeNO)
+				tradeOrder, tradeErr := models.GetTradeOrderByNo(orderItem.TradeNo)
 				if tradeErr != nil {
-					utils.FileLog.Error("获取支付订单失败，支付订单号：" + orderItem.TradeNO + ",err:" + tradeErr.Error())
+					utils.FileLog.Error("获取支付订单失败，支付订单号：" + orderItem.TradeNo + ",err:" + tradeErr.Error())
 				} else {
 					view.PaymentAmount = fmt.Sprintf("%s %.2f", tradeOrder.Currency, tradeOrder.Amount)
 				}
 			}
 			if orderItem.Status == models.OrderStatusPaid {
-				access, accessErr := models.GetAccess(orderItem.ProductID, orderItem.TemplateUserId)
+				access, accessErr := models.GetAccess(orderItem.ProductId, orderItem.TemplateUserId)
 				if accessErr != nil {
-					utils.FileLog.Error("获取用户订阅记录失败，templateUserId:" + string(rune(orderItem.TemplateUserId)) + "productId:" + string(rune(orderItem.ProductID)) + ",err:" + accessErr.Error())
+					utils.FileLog.Error("获取用户订阅记录失败，templateUserId:" + string(rune(orderItem.TemplateUserId)) + "productId:" + string(rune(orderItem.ProductId)) + ",err:" + accessErr.Error())
 				} else {
 					if access.ProductType == models.ProductPackage {
 						view.ValidDuration = fmt.Sprintf("%s~%s", access.BeginDate.Format(time.DateOnly), access.EndDate.Format(time.DateOnly))
@@ -763,7 +763,7 @@ func (this *OrderController) Refund() {
 		br.ErrMsg = "退款失败，当前订单退款处理中"
 		return
 	}
-	tradeOrder, err := models.GetTradeOrderByNo(productOrder.TradeNO)
+	tradeOrder, err := models.GetTradeOrderByNo(productOrder.TradeNo)
 	if err != nil {
 		br.Msg = "退款失败，获取原订单失败"
 		br.ErrMsg = "退款失败，获取原订单失败,err:" + err.Error()
@@ -782,7 +782,7 @@ func (this *OrderController) Refund() {
 	aa := GenerateProductOrderNo()
 	refundOrder := &models.TradeOrder{
 		TransactionId:    aa,
-		OrgTransactionId: productOrder.TradeNO,
+		OrgTransactionId: productOrder.TradeNo,
 		ProductOrderId:   productOrder.OrderId,
 		PaymentAccount:   tradeOrder.PaymentAccount,
 		PaymentWay:       tradeOrder.PaymentWay,

models/product_order.go

@@ -55,12 +55,12 @@ type ProductOrder struct {
 	RealName         string              `gorm:"column:real_name;default:null;comment:'临时用户id'" json:"real_name"`
 	AreaCode         string              `gorm:"column:area_code;default:null;comment:'临时用户id'" json:"area_code"`
 	Mobile           string              `gorm:"column:mobile;default:null;comment:'临时用户id'" json:"mobile"`
-	ProductID        int                 `gorm:"column:product_id;default:null;comment:'产品id'" json:"product_id"`
+	ProductId        int                 `gorm:"column:product_id;default:null;comment:'产品id'" json:"product_id"`
 	ProductType      MerchantProductType `gorm:"column:product_type;default:null;comment:'产品类型'" json:"product_type"`
 	ProductName      string              `gorm:"column:product_name;default:null;comment:'商品名称'" json:"product_name"`
 	TotalAmount      string              `gorm:"column:total_amount;size:255;default:null;comment:'金额'" json:"total_amount"`
-	TradeID          int                 `gorm:"column:trade_id;default:null;comment:'支付订单'" json:"trade_id"`
-	TradeNO          string              `gorm:"column:trade_no;default:null;comment:'支付订单'" json:"trade_no"`
+	TradeId          int                 `gorm:"column:trade_id;default:null;comment:'支付订单'" json:"trade_id"`
+	TradeNo          string              `gorm:"column:trade_no;default:null;comment:'支付订单'" json:"trade_no"`
 	RefundTradeId    string              `column:"refund_trade_id;null;comment:'退款金额'" json:"refund_trade_id"`
 	RefundAmount     string              `gorm:"column:refund_amount;size:255;default:null;comment:'退款金额'" json:"refund_amount"`
 	PaymentAmount    string              `gorm:"column:payment_amount;size:255;default:null;comment:'支付金额'" json:"payment_amount"`