|
@@ -222,7 +222,7 @@ func (this *OrderController) ProductOrderList() {
|
|
|
go func(orderItem *models.ProductOrder) {
|
|
|
defer wg.Done()
|
|
|
view := &models.ProductOrderView{
|
|
|
- OrderID: orderItem.OrderID,
|
|
|
+ OrderID: orderItem.OrderId,
|
|
|
RealName: orderItem.RealName,
|
|
|
Mobile: fmt.Sprintf("+%s %s", orderItem.AreaCode, orderItem.Mobile),
|
|
|
ProductType: ProductTypeMap[orderItem.ProductType],
|
|
@@ -249,9 +249,9 @@ func (this *OrderController) ProductOrderList() {
|
|
|
}
|
|
|
}
|
|
|
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))
|
|
@@ -514,7 +514,7 @@ func (this *OrderController) ExportProductOrder() {
|
|
|
go func(orderItem models.ProductOrder) {
|
|
|
defer wg.Done()
|
|
|
view := models.ProductOrderView{
|
|
|
- OrderID: orderItem.OrderID,
|
|
|
+ OrderID: orderItem.OrderId,
|
|
|
RealName: orderItem.RealName,
|
|
|
Mobile: fmt.Sprintf("+%s %s", orderItem.AreaCode, orderItem.Mobile),
|
|
|
ProductType: ProductTypeMap[orderItem.ProductType],
|
|
@@ -540,9 +540,9 @@ func (this *OrderController) ExportProductOrder() {
|
|
|
}
|
|
|
}
|
|
|
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))
|
|
@@ -783,7 +783,7 @@ func (this *OrderController) Refund() {
|
|
|
refundOrder := &models.TradeOrder{
|
|
|
TransactionId: aa,
|
|
|
OrgTransactionId: productOrder.TradeNO,
|
|
|
- ProductOrderId: productOrder.OrderID,
|
|
|
+ ProductOrderId: productOrder.OrderId,
|
|
|
PaymentAccount: tradeOrder.PaymentAccount,
|
|
|
PaymentWay: tradeOrder.PaymentWay,
|
|
|
Amount: tradeOrder.Amount,
|