Merge branch 'develop' of k.zhang/duoduo into master

models/shanghu/pay.go

@@ -54,7 +54,6 @@ func (u *ClientPayTrans) Create() (ClientPayTrans, error) {
 	var err error
 
 	doc = *u
-
 	err = orm.ShMysql.Table(u.TableName()).Create(&doc).Error
 	if err != nil {
 		return doc, err
@@ -63,30 +62,15 @@ func (u *ClientPayTrans) Create() (ClientPayTrans, error) {
 	return doc, nil
 }
 
-//var data biz.EbankAccountVa
-//err := c.data.mysql.WithContext(ctx).Table(req.TableName()).Where("open_id = ? and pay_agency = ? and  account_no = ?", req.OpenID, req.PayAgency, req.AccountNo).Select("id").First(&data).Error
-//
-//if err != nil && !errors.Is(err, gorm.ErrRecordNotFound) {
-//return err
-//}
-//req.ID = data.ID
-//err = c.data.mysql.Clauses(clause.OnConflict{
-//UpdateAll: true,
-//}).Table(req.TableName()).Create(&req).Error
-//if err != nil {
-//return err
-//}
-//return nil
-
 func (m *ClientPayTrans) UpdatePayTransByTradeNo() error {
 
 	if err := orm.ShMysql.Table(m.TableName()).Model(&m).Where("out_trade_no = ? ", m.OutTradeNo).Updates(
 		map[string]interface{}{
 			"third_trade_no": m.ThirdTradeNo,
 			"pay_time":       m.PayTime,
+			"status":         m.Status,
 			"updated_at":     time.Now()}).Error; err != nil {
 		return err
 	}
-
 	return nil
 }