|
@@ -74,7 +74,8 @@ func (p *DataExportPayAction) SacnPay_WaitPay() error {
|
|
|
}
|
|
|
}
|
|
|
} else if pay_way == "支付宝" {
|
|
|
- if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(orderMoney)); err == nil {
|
|
|
+ payOutTime := now.Add(time.Minute * 2)
|
|
|
+ if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(orderMoney), util.FormatDate(&payOutTime, util.Date_Full_Layout)); err == nil {
|
|
|
if public.Mysql.Update("dataexport_order", map[string]interface{}{
|
|
|
"id": orderid,
|
|
|
}, map[string]interface{}{
|
|
@@ -228,8 +229,8 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
|
|
|
}
|
|
|
order_money := int(order_money_ * 100)
|
|
|
original_price := int(original_price_ * 100)
|
|
|
- order_money = 1
|
|
|
- original_price = 1
|
|
|
+ //order_money = 1
|
|
|
+ //original_price = 1
|
|
|
filter_keys, filter_publishtime, filter := "", "", ""
|
|
|
//
|
|
|
isPass := func() bool {
|
|
@@ -304,8 +305,9 @@ func (p *DataExportPayAction) SacnPay_CreateOrder() {
|
|
|
log.Println("生成微信预支付交易单失败", ret)
|
|
|
}
|
|
|
} else if pay_way == "支付宝" {
|
|
|
- if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(order_money)); err == nil {
|
|
|
- now := time.Now()
|
|
|
+ now := time.Now()
|
|
|
+ payOutTime := now.Add(time.Minute * 2)
|
|
|
+ if qr_url, tradeno, err := Alipay.GetPayUrl(util.Float64All(order_money), util.FormatDate(&payOutTime, util.Date_Full_Layout)); err == nil {
|
|
|
ordercode := public.GetOrderCode(openId)
|
|
|
orderid := public.Mysql.Insert("dataexport_order", map[string]interface{}{
|
|
|
"order_money": order_money,
|