pay重构

docs/doc.adoc

@@ -152,7 +152,7 @@ config = OrderInput{
   Body:"支付"
 }
 
-wxPayConfig, err := pay.GetJsAPIConfig(config)
+wxPayInfo, err := pay.GetJsAPIConfig(config)
 
 ----
 

docs/doc.html

@@ -682,7 +682,7 @@ config = OrderInput{
   Body:"支付"
 }
 
-wxPayConfig, err := pay.GetJsAPIConfig(config)</code></pre>
+wxPayInfo, err := pay.GetJsAPIConfig(config)</code></pre>
 </div>
 </div>
 </div>

mch/pay/jssdk.go

@@ -19,12 +19,18 @@ type OrderInput struct {
 	TotalFee    int    //分为单位
 	IP          string
 	NotifyURL   string //异步接收微信支付结果通知的回调地址，通知url必须为外网可访问的url，不能携带参数
-	TradeType   string //JSAPI，NATIVE，APP
 	ProductID   string //trade_type=NATIVE时（即扫码支付），此参数必传
+
+	tradeType string //JSAPI，NATIVE，APP
+}
+
+//SetTradeType 设置TradeType
+func (c *OrderInput) setTradeType(tradeType string) {
+	c.tradeType = tradeType
 }
 
-//Config jssdk支付时需要的配置
-type WxPayConfig struct {
+//WxPayInfo 统一下单后，返回的信息，这些信息是前端jssdk支付时需要的配置
+type WxPayInfo struct {
 	AppID     string `json:"appId"`
 	TimeStamp string `json:"timeStamp"`
 	NonceStr  string `json:"nonceStr"`
@@ -35,7 +41,7 @@ type WxPayConfig struct {
 }
 
 //ToString wx.chooseWXPay content
-func (c *WxPayConfig) ToString() (str string) {
+func (c *WxPayInfo) ToString() (str string) {
 	return fmt.Sprintf(`
 		timestamp: %s,
     nonceStr: '%s',
@@ -46,7 +52,7 @@ func (c *WxPayConfig) ToString() (str string) {
 }
 
 //ToJSON WeixinJSBridge  json content
-func (c *WxPayConfig) ToJSON() (str string) {
+func (c *WxPayInfo) ToJSON() (str string) {
 	js, err := json.Marshal(c)
 	if err == nil {
 		return string(js)
@@ -55,13 +61,14 @@ func (c *WxPayConfig) ToJSON() (str string) {
 }
 
 //ToMap result map[string]string
-func (c *WxPayConfig) ToMap() (m map[string]string) {
+func (c *WxPayInfo) ToMap() (m map[string]string) {
 	return c.resultMap
 }
 
 /*GetJsAPIConfig 前端JsAPI支付时,需要提交的信息
  */
-func (c *Pay) GetJsAPIConfig(order OrderInput) (config *WxPayConfig, err error) {
+func (c *Pay) GetJsAPIConfig(order OrderInput) (config *WxPayInfo, err error) {
+	order.setTradeType("JSAPI")
 	err = c.checkOrder(order)
 	if err != nil {
 		return
@@ -85,7 +92,7 @@ func (c *Pay) GetJsAPIConfig(order OrderInput) (config *WxPayConfig, err error)
 	sign := base.Sign(result, c.MchAPIKey, nil)
 	result["paySign"] = sign
 
-	config = new(WxPayConfig)
+	config = new(WxPayInfo)
 	config.NonceStr = util.RandomStr(8)
 	config.TimeStamp = fmt.Sprint(time.Now().Unix())
 	config.AppID = c.AppID
@@ -98,6 +105,20 @@ func (c *Pay) GetJsAPIConfig(order OrderInput) (config *WxPayConfig, err error)
 	return
 }
 
+//GetNativePayQrcodePicURL native支付时二维码图片的url
+func (c *Pay) GetNativePayQrcodePicURL(order OrderInput) (qrcodeURL string, err error) {
+	order.setTradeType("NATIVE")
+	input := c.createUnifiedOrderMap(order)
+	var result map[string]string
+	if result, err = c.UnifiedOrder(input); err == nil { //有prepay_id
+		qrcodeURL = result["code_url"]
+		if len(qrcodeURL) == 0 {
+			err = fmt.Errorf("native pay Qrcode url is empty")
+		}
+	}
+	return
+}
+
 // 调用 UnifiedOrder 获得 prepayID
 func (c *Pay) getPrepayID(order OrderInput) (prepayID string, err error) {
 	input := c.createUnifiedOrderMap(order)
@@ -124,7 +145,7 @@ func (c *Pay) createUnifiedOrderMap(order OrderInput) (input map[string]string)
 	input["spbill_create_ip"] = order.IP            //设置APP和网页支付提交用户端ip，Native支付填调用微信支付API的机器IP。
 	input["notify_url"] = order.NotifyURL           //设置接收微信支付异步通知回调地址
 
-	input["trade_type"] = order.TradeType
+	input["trade_type"] = order.tradeType
 	//设置取值如下：JSAPI，NATIVE，APP，详细说明见参数规定
 
 	if order.ProductID != "" {
@@ -140,7 +161,7 @@ func (c *Pay) createUnifiedOrderMap(order OrderInput) (input map[string]string)
 }
 
 func (c *Pay) checkOrder(order OrderInput) (err error) {
-	tradeType := order.TradeType
+	tradeType := order.tradeType
 	if tradeType != "JSAPI" && tradeType != "APP" && tradeType != "NATIVE" {
 		return fmt.Errorf("tradeType is invalid")
 	}

mp/bridge/page_auth_handler.go

@@ -6,6 +6,7 @@ import (
 	"net/url"
 
 	"github.com/yaotian/gowechat/mp/oauth"
+	"github.com/yaotian/gowechat/mp/user"
 	"github.com/yaotian/gowechat/wxcontext"
 )
 
@@ -21,8 +22,8 @@ type PageOAuthHandler struct {
 	openIDExisting          bool
 	checkOpenIDExistingFunc func(openID string) bool
 
-	oauth.UserInfo
-	afterGetUserInfoFunc func(user oauth.UserInfo) bool
+	user.Info
+	afterGetUserInfoFunc func(user user.Info) bool
 }
 
 //NewPageOAuthHandler PageOAuthHandler初始化
@@ -66,14 +67,13 @@ handler:
 
 
 */
-func (c *PageOAuthHandler) SetFuncAfterGetUserInfo(handler func(oauth.UserInfo) bool) {
+func (c *PageOAuthHandler) SetFuncAfterGetUserInfo(handler func(user.Info) bool) {
 	c.afterGetUserInfoFunc = handler
 }
 
 //Handle handler
 func (c *PageOAuthHandler) Handle() (err error) {
 	code := c.Query("code")
-	state := c.Query("state")
 	c.urlNeedOAuth = c.Query("target")
 	if code != "" {
 		var acsTkn oauth.ResAccessToken
@@ -86,16 +86,12 @@ func (c *PageOAuthHandler) Handle() (err error) {
 			http.Redirect(c.Writer, c.Request, c.urlNeedOAuth, 302)
 			return
 		}
-		if state == "base" {
-			c.Redirect(c.getCallbackURL(), "snsapi_userinfo", "userinfo")
-			return
-		}
-		c.UserInfo, err = c.GetUserInfo(acsTkn.AccessToken, openID)
+		//用 user模块的，没用oauth模板，可以获得更多信息
+		u, err := user.NewUser(c.Oauth.Context).GetUserInfo(openID)
 		if err == nil {
-			if !c.afterGetUserInfoFunc(c.UserInfo) {
+			if !c.afterGetUserInfoFunc(*u) {
 				http.Redirect(c.Writer, c.Request, c.urlNeedOAuth, 302)
 			}
-			return
 		}
 	}
 	c.Redirect(c.getCallbackURL(), "snsapi_base", "base")

mp/oauth/oauth.go

@@ -121,7 +121,7 @@ type UserInfo struct {
 
 	OpenID     string   `json:"openid"`
 	Nickname   string   `json:"nickname"`
-	Sex        int32    `json:"sex"`
+	Sex        int      `json:"sex"`
 	Province   string   `json:"province"`
 	City       string   `json:"city"`
 	Country    string   `json:"country"`

mp/user/user.go

@@ -32,13 +32,13 @@ type Info struct {
 	Subscribe     int32    `json:"subscribe"`
 	OpenID        string   `json:"openid"`
 	Nickname      string   `json:"nickname"`
-	Sex           int32    `json:"sex"`
+	Sex           int      `json:"sex"`
 	City          string   `json:"city"`
 	Country       string   `json:"country"`
 	Province      string   `json:"province"`
 	Language      string   `json:"language"`
 	Headimgurl    string   `json:"headimgurl"`
-	SubscribeTime int32    `json:"subscribe_time"`
+	SubscribeTime int64    `json:"subscribe_time"`
 	UnionID       string   `json:"unionid"`
 	Remark        string   `json:"remark"`
 	GroupID       int32    `json:"groupid"`