|
@@ -2,6 +2,7 @@ package service
|
|
|
|
|
|
import (
|
|
|
. "api"
|
|
|
+ "encoding/base64"
|
|
|
"encoding/json"
|
|
|
"entity"
|
|
|
"log"
|
|
@@ -10,6 +11,7 @@ import (
|
|
|
"time"
|
|
|
"util"
|
|
|
|
|
|
+ "github.com/SKatiyar/qr"
|
|
|
"github.com/go-xweb/xweb"
|
|
|
)
|
|
|
|
|
@@ -49,6 +51,11 @@ func (this *ReportOrder) GetPayParam() {
|
|
|
if payStr != "" && payway == (*r)["pay_way"] {
|
|
|
prepayTime, err := time.ParseInLocation(qutil.Date_Full_Layout, qutil.ObjToString((*r)["prepay_time"]), time.Local)
|
|
|
surplus_second := prepayTime.Unix() + 7200 - time.Now().Unix()
|
|
|
+ if payway == "wx_pc" {
|
|
|
+ r, _ := qr.Encode(payStr.(string), qr.M)
|
|
|
+ pngdat := r.PNG()
|
|
|
+ payStr = base64.StdEncoding.EncodeToString(pngdat)
|
|
|
+ }
|
|
|
if err == nil && surplus_second > 0 {
|
|
|
return "", map[string]interface{}{
|
|
|
"payStr": payStr,
|
|
@@ -62,6 +69,11 @@ func (this *ReportOrder) GetPayParam() {
|
|
|
log.Println(err)
|
|
|
return "创建订单出错", nil
|
|
|
}
|
|
|
+ if payway == "wx_pc" {
|
|
|
+ r, _ := qr.Encode(payStr.(string), qr.M)
|
|
|
+ pngdat := r.PNG()
|
|
|
+ payStr = base64.StdEncoding.EncodeToString(pngdat)
|
|
|
+ }
|
|
|
return "", map[string]interface{}{
|
|
|
"payStr": payStr,
|
|
|
"timeout": 7200,
|