Merge branch 'yun-test' of k.zhang/duoduo into yun-master

models/shanghu/merchant.client.ticket.go

@@ -75,6 +75,11 @@ func (u *MerchantClientTicket) Recharge(recharge MerchantRecharge, clientOpenId
 		if err != nil {
 			return err
 		}
+
+		accountAmount, err := decimal.NewFromString(recharge.Amount)
+		if err != nil {
+			return err
+		}
 		clientAccount.ClientOpenID = clientOpenId
 		clientAccount.MerchantOpenID = recharge.MerchantOpenID
 		clientAccount.UpdatedAt = time.Now()
@@ -85,8 +90,8 @@ func (u *MerchantClientTicket) Recharge(recharge MerchantRecharge, clientOpenId
 		}
 
 		//充值记录
-		accountLog.Amount = account.Amount
-		accountLog.AmountAfter = account.Amount
+		accountLog.Amount = accountAmount
+		accountLog.AmountAfter = accountAmount
 		accountLog.ClientOpenID = clientOpenId
 		accountLog.MerchantOpenID = recharge.MerchantOpenID //充值商户
 		accountLog.TransType = 1                            //充值