Merge remote-tracking branch 'origin/dev/dev1.0' into dev/dev1.0

app/services/thirdpay/api/api_res_data.go

@@ -5,6 +5,7 @@ type OrdersResp struct {
 	OrderType  int    `json:"order_type"`
 	OutTradeNo string `json:"out_trade_no"`
 	Amount     int    `json:"amount"`
+	PayerTotal int    `json:"payer_total"`
 	Desc       string `json:"desc"`
 
 	Status     int    `json:"status"`

app/services/thirdpay/pay.go

@@ -27,6 +27,7 @@ func NewOrdersResp(db *ordersmodel.Orders) *api.OrdersResp {
 		Status:     db.Status,
 		OrderType:  db.OrderType,
 		Amount:     db.Amount,
+		PayerTotal: db.PayerTotal,
 		Desc:       db.Desc,
 		CreateTime: db.CreateTime.Format("2006-01-02 15:04:05"),
 	}

app/services/thirdpay/thirdpay_notify/notify.go

@@ -151,6 +151,7 @@ func (o *OrderNotify) updateOrder() {
 		return
 	}
 	o.order.Status = o.Status
+	o.order.PayerTotal = o.ActualAmount
 	o.Code = services.OrderUpdate(o.order, "status")
 	return
 }