|
|
@@ -367,20 +367,21 @@ func GetMerchantCanvasCard(c *gin.Context) {
|
|
|
//3.空的 官方邀请码
|
|
|
|
|
|
//返回邀请码
|
|
|
-
|
|
|
+ var qrCode string
|
|
|
if inData.Code == "yuanshima" && inData.Openid == "" { //商家平台 可以分享 code 等于自己的与yuanshima的都给平台
|
|
|
outData.IsShare = true
|
|
|
outData.InvitationCode = "yuanshima"
|
|
|
+ qrCode = "yuanshima"
|
|
|
} 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
|
|
|
+ qrCode = userInfoReply.Code
|
|
|
+ outData.InvitationCode = inData.Code
|
|
|
} else if inData.Code != "yuanshima" && inData.Openid != "" && inData.Code != "" { //查询购买记录，没有购买过不让分享
|
|
|
var payTrans shanghu.ClientPayTrans
|
|
|
- //var userInfo shanghu.MerchantClientUser
|
|
|
+ var userInfo shanghu.MerchantClientUser
|
|
|
|
|
|
payTrans.MerchantCardID = inData.MerchantId
|
|
|
payTrans.ClientOpenID = inData.Openid
|
|
|
@@ -393,6 +394,9 @@ func GetMerchantCanvasCard(c *gin.Context) {
|
|
|
|
|
|
outData.InvitationCode = inData.Code
|
|
|
|
|
|
+ userInfo.ClientOpenID = inData.Openid
|
|
|
+ userInfoReply, _ := userInfo.GetUserInfo()
|
|
|
+ qrCode = userInfoReply.Code
|
|
|
} else {
|
|
|
app.Error(c, 500, errors.New("code 错误"), "code 错误")
|
|
|
return
|
|
|
@@ -403,7 +407,7 @@ func GetMerchantCanvasCard(c *gin.Context) {
|
|
|
qr.CheckPath = true
|
|
|
qr.Page = "pages/home/home"
|
|
|
qr.EnvVersion = "release"
|
|
|
- qr.Scene = "id-" + strconv.FormatInt(inData.MerchantId, 10) + "-c-" + outData.InvitationCode
|
|
|
+ qr.Scene = "id-" + strconv.FormatInt(inData.MerchantId, 10) + "-c-" + qrCode
|
|
|
|
|
|
fmt.Println(qr.Scene)
|
|
|
data, err := json.Marshal(&qr)
|
