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

apis/shanghu/merchant.card.go

@@ -368,15 +368,22 @@ func GetMerchantCanvasCard(c *gin.Context) {
 
 	//返回邀请码
 
-	if inData.Code == "yuanshima" { //可以分享   code 等于自己的与yuanshima的都给平台
+	if inData.Code == "yuanshima" && inData.Openid == "" { //商家平台 可以分享   code 等于自己的与yuanshima的都给平台
 		outData.IsShare = true
 		outData.InvitationCode = "yuanshima"
-	} else { //查询购买记录，没有购买过不让分享
-		var payTrans shanghu.ClientPayTrans
+	} else if inData.Code == "yuanshima" && inData.Openid != "" { // 原始码 c端用户调用
 		var userInfo shanghu.MerchantClientUser
+		outData.IsShare = true
+		userInfo.ClientOpenID = inData.Openid
+		userInfoReply, _ := userInfo.GetUserInfo()
+
+		outData.InvitationCode = userInfoReply.Code
+	} else if inData.Code != "yuanshima" && inData.Openid != "" && inData.Code != "" { //查询购买记录，没有购买过不让分享
+		var payTrans shanghu.ClientPayTrans
+		//var userInfo shanghu.MerchantClientUser
 
 		payTrans.MerchantCardID = inData.MerchantId
-		payTrans.ClientOpenID = inData.Code
+		payTrans.ClientOpenID = inData.Openid
 		payInfo, _ := payTrans.GetPayTransByOpenid()
 		if payInfo.ID <= 0 {
 			outData.IsShare = false
@@ -384,11 +391,11 @@ func GetMerchantCanvasCard(c *gin.Context) {
 			outData.IsShare = true
 		}
 
-		userInfo.ClientOpenID = inData.Code
-		userInfoReply, _ := userInfo.GetUserInfo()
-
-		outData.InvitationCode = userInfoReply.Code
+		outData.InvitationCode = inData.Code
 
+	} else {
+		app.Error(c, 500, errors.New("code 错误"), "code 错误")
+		return
 	}
 
 	//点击购买的时候把code给进去把 原始码购买属于平台

apis/shanghu/models/card.go

@@ -25,7 +25,8 @@ type CreateMerchantCardRequest struct {
 
 type GetMerchantCardRequest struct {
 	MerchantId int64  `json:"merchant_card_id"` //商户卡id
-	Code       string `json:"code"`             //b邀请码
+	Openid     string `json:"openid"`
+	Code       string `json:"code"` //b邀请码
 }
 
 type GetMerchantCardReply struct {

report/shang.hu.ka.go

@@ -55,7 +55,13 @@ func ClientAccount() {
 		//计算金额
 		fmt.Println(merchantCard.RebateRate)
 		fmt.Println(clientTrans.Amount)
-		clientAmount := clientTrans.Amount.Mul(decimal.NewFromInt(merchantCard.RebateRate)).Div(decimal.NewFromInt(100)).Round(2)
+		var clientAmount decimal.Decimal
+		if clientTrans.InvitationCode == "yuanshima" {
+			clientAmount = decimal.NewFromInt(0)
+		} else {
+			clientAmount = clientTrans.Amount.Mul(decimal.NewFromInt(merchantCard.RebateRate)).Div(decimal.NewFromInt(100)).Round(2)
+
+		}
 		fmt.Println(clientAmount)
 		merchantAmount := clientTrans.Amount.Sub(clientAmount).Round(2)
 		fmt.Println(merchantAmount)