Merge branch 'master' into feature/v4.9.89

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -20,7 +20,6 @@ import (
 
 	. "app.yhyue.com/moapp/jybase/api"
 	. "app.yhyue.com/moapp/jybase/date"
-	"app.yhyue.com/moapp/jypkg/public"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/google/uuid"
 
@@ -793,12 +792,12 @@ func (this *CommonAction) GetWxReturnPayParam() {
 			err               error
 			openId            string
 		)
-		expire, dateErr := time.ParseInLocation("time.DateTime", expireTime, time.Local)
+		expire, dateErr := time.ParseInLocation(time.DateTime, expireTime, time.Local)
 		if dateErr == nil {
 
 		}
 		if time.Now().After(expire) {
-			go public.Mysql.Update("return_money_online", map[string]interface{}{"token": token, "status": 0}, map[string]interface{}{"status": -1})
+			go util.Mysql.Update("return_money_online", map[string]interface{}{"token": token, "status": 0}, map[string]interface{}{"status": -1})
 			return nil, fmt.Errorf("回款单已过期,请重新联系销售")
 		}
 
@@ -864,7 +863,7 @@ func (this *CommonAction) GetReturnResult() {
 			r["transaction_id"] = rData["transaction_id"]
 			r["return_money"] = rData["return_money"]
 			if payTime := gconv.String(rData["pay_time"]); payTime != "" {
-				if t, e := time.ParseInLocation("time.DateTime", payTime, time.Local); e == nil {
+				if t, e := time.ParseInLocation(time.DateTime, payTime, time.Local); e == nil {
 					r["pay_time"] = t.Unix()
 				}
 			}