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

models/shanghu/pay.go

@@ -43,7 +43,7 @@ func (m *ClientPayTrans) GetPayTransByOpenid() (ClientPayTrans, error) {
 	var doc ClientPayTrans
 
 	table := orm.ShMysql.Table(m.TableName())
-	table = table.Where("merchant_card_id = ? and  client_open_id = ? ", m.MerchantCardID, m.ClientOpenID)
+	table = table.Where("merchant_card_id = ? and  client_open_id = ? and status = 2 ", m.MerchantCardID, m.ClientOpenID)
 
 	if err := table.Select("*").First(&doc).Error; err != nil {
 		return doc, err