|
@@ -614,7 +614,7 @@ func subStockAddLog(drawProductInfo shanghu.MerchantActiveDrawProduct, clientOpe
|
|
|
|
|
|
func GetClientActiveQR(c *gin.Context) {
|
|
func GetClientActiveQR(c *gin.Context) {
|
|
var inData models.ClientActiveQRRequest
|
|
var inData models.ClientActiveQRRequest
|
|
- //var sqlData shanghu.MerchantClientCard
|
|
|
|
|
|
+ var sqlData shanghu.ActiveUser
|
|
var outData models.ClientCardQRReply
|
|
var outData models.ClientCardQRReply
|
|
var qr models.QRRequest
|
|
var qr models.QRRequest
|
|
var getQR models.GetQRRequest
|
|
var getQR models.GetQRRequest
|
|
@@ -626,12 +626,14 @@ func GetClientActiveQR(c *gin.Context) {
|
|
}
|
|
}
|
|
// sqlData.ID = inData.ActiveConfigId
|
|
// sqlData.ID = inData.ActiveConfigId
|
|
|
|
|
|
- val, err := pdd.DuoDuoGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wx8595c589dd736486&secret=668f87d2bc24199688e53ee8a88434b8")
|
|
|
|
|
|
+ val, err := pdd.DuoDuoGet("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=wx43e320d3ffaa4d7b&secret=97d811cde197515ed03b7c7a6e24d4e8")
|
|
if err != nil {
|
|
if err != nil {
|
|
app.Error(c, 500, err, err.Error())
|
|
app.Error(c, 500, err, err.Error())
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //fmt.Println("val:", val)
|
|
|
|
+
|
|
err = tools.JsonUnmarshal(val, &outData)
|
|
err = tools.JsonUnmarshal(val, &outData)
|
|
if err != nil {
|
|
if err != nil {
|
|
app.Error(c, 500, err, err.Error())
|
|
app.Error(c, 500, err, err.Error())
|
|
@@ -641,12 +643,26 @@ func GetClientActiveQR(c *gin.Context) {
|
|
app.Error(c, 500, err, "token error")
|
|
app.Error(c, 500, err, "token error")
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ code := ""
|
|
|
|
+ if inData.Code == "yuanshima" {
|
|
|
|
+ code = "yuanshima"
|
|
|
|
+ } else { //根据openid查code
|
|
|
|
+ sqlData.OpenID = inData.OpenId
|
|
|
|
+ userInfo, err := sqlData.GetUserInfo()
|
|
|
|
+ if err != nil {
|
|
|
|
+ app.Error(c, 500, err, err.Error())
|
|
|
|
+ return
|
|
|
|
+ }
|
|
|
|
+ code = userInfo.Code
|
|
|
|
+ }
|
|
|
|
+
|
|
url := "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + outData.AccessToken
|
|
url := "https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + outData.AccessToken
|
|
|
|
|
|
- qr.CheckPath = true
|
|
|
|
|
|
+ qr.CheckPath = false
|
|
qr.Page = "pages/home/home"
|
|
qr.Page = "pages/home/home"
|
|
- qr.EnvVersion = "release"
|
|
|
|
- qr.Scene = strconv.FormatInt(inData.ActiveConfigId, 10)
|
|
|
|
|
|
+ qr.EnvVersion = "develop"
|
|
|
|
+ qr.Scene = "id-" + strconv.FormatInt(inData.ActiveConfigId, 10) + "-c-" + code
|
|
|
|
|
|
data, err := json.Marshal(&qr)
|
|
data, err := json.Marshal(&qr)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -747,13 +763,18 @@ func GroupByUnifiedOrder(c *gin.Context) {
|
|
bm.Set("out_trade_no", sqlData.OutTradeNo)
|
|
bm.Set("out_trade_no", sqlData.OutTradeNo)
|
|
bm.Set("total_fee", inData.Amount.Mul(decimal.NewFromInt(100)).IntPart())
|
|
bm.Set("total_fee", inData.Amount.Mul(decimal.NewFromInt(100)).IntPart())
|
|
bm.Set("spbill_create_ip", "127.0.0.1")
|
|
bm.Set("spbill_create_ip", "127.0.0.1")
|
|
- bm.Set("notify_url", "https://tao1024.com/v1/client/pay/callback")
|
|
|
|
|
|
+ bm.Set("notify_url", "https://tao1024.com/v1/active/pay/callback")
|
|
bm.Set("device_info", "WEB")
|
|
bm.Set("device_info", "WEB")
|
|
bm.Set("trade_type", "JSAPI")
|
|
bm.Set("trade_type", "JSAPI")
|
|
bm.Set("sign_type", wechat.SignType_MD5)
|
|
bm.Set("sign_type", wechat.SignType_MD5)
|
|
bm.Set("openid", inData.ClientOpenId)
|
|
bm.Set("openid", inData.ClientOpenId)
|
|
|
|
|
|
- client := NewWechatService()
|
|
|
|
|
|
+ appid := "wx43e320d3ffaa4d7b"
|
|
|
|
+ mchId := "1670841410"
|
|
|
|
+ apiKey := "33c424fAa69942086f82A003e283E9C8"
|
|
|
|
+
|
|
|
|
+ client := NewWechatServiceTwo(appid, mchId, apiKey)
|
|
|
|
+ //client := NewWechatService()
|
|
//请求支付下单,成功后得到结果
|
|
//请求支付下单,成功后得到结果
|
|
wxResp, err := client.UnifiedOrder(c, bm)
|
|
wxResp, err := client.UnifiedOrder(c, bm)
|
|
if err != nil {
|
|
if err != nil {
|