Compare commits
	
		
			No commits in common. "595726bc602ed73e4607a5dec7208867655d89bf" and "c13634ed089bfd8807a912071c5aa3e67aed6eff" have entirely different histories.
		
	
	
		
			595726bc60
			...
			c13634ed08
		
	
		| 
						 | 
					@ -5,7 +5,6 @@ type OrdersResp struct {
 | 
				
			||||||
	OrderType  int    `json:"order_type"`
 | 
						OrderType  int    `json:"order_type"`
 | 
				
			||||||
	OutTradeNo string `json:"out_trade_no"`
 | 
						OutTradeNo string `json:"out_trade_no"`
 | 
				
			||||||
	Amount     int    `json:"amount"`
 | 
						Amount     int    `json:"amount"`
 | 
				
			||||||
	PayerTotal int    `json:"payer_total"`
 | 
					 | 
				
			||||||
	Desc       string `json:"desc"`
 | 
						Desc       string `json:"desc"`
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	Status     int    `json:"status"`
 | 
						Status     int    `json:"status"`
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -27,7 +27,6 @@ func NewOrdersResp(db *ordersmodel.Orders) *api.OrdersResp {
 | 
				
			||||||
		Status:     db.Status,
 | 
							Status:     db.Status,
 | 
				
			||||||
		OrderType:  db.OrderType,
 | 
							OrderType:  db.OrderType,
 | 
				
			||||||
		Amount:     db.Amount,
 | 
							Amount:     db.Amount,
 | 
				
			||||||
		PayerTotal: db.PayerTotal,
 | 
					 | 
				
			||||||
		Desc:       db.Desc,
 | 
							Desc:       db.Desc,
 | 
				
			||||||
		CreateTime: db.CreateTime.Format("2006-01-02 15:04:05"),
 | 
							CreateTime: db.CreateTime.Format("2006-01-02 15:04:05"),
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -151,7 +151,6 @@ func (o *OrderNotify) updateOrder() {
 | 
				
			||||||
		return
 | 
							return
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	o.order.Status = o.Status
 | 
						o.order.Status = o.Status
 | 
				
			||||||
	o.order.PayerTotal = o.ActualAmount
 | 
					 | 
				
			||||||
	o.Code = services.OrderUpdate(o.order, "status")
 | 
						o.Code = services.OrderUpdate(o.order, "status")
 | 
				
			||||||
	return
 | 
						return
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue