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

apis/shanghu/merchant.card.go

@@ -262,7 +262,12 @@ func GetMerchantCanvasCard(c *gin.Context) {
 		return
 	}
 
-	outData.MerchantOriginalAmount = outData.MerchantAmount.Add(decimal.NewFromInt(50))
+	outData.MerchantOriginalAmount, err = decimal.NewFromString(merchantCard.CardTotalPrice)
+	if err != nil {
+		app.Error(c, 500, err, err.Error())
+		return
+	}
+	//outData.MerchantOriginalAmount = outData.MerchantAmount.Add(decimal.NewFromInt(50))
 
 	var outQRData models.ClientCardQRReply