1

business/jxstore/financial/pay.go

@@ -2,13 +2,13 @@ package financial
 
 import (
 	"fmt"
+	"git.rosy.net.cn/baseapi/platformapi/recharge_phone_bill"
 	"git.rosy.net.cn/baseapi/utils"
-	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/client/orm"
-
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
+	"git.rosy.net.cn/jx-callback/globals"
+	"git.rosy.net.cn/jx-callback/globals/api"
 )
 
 type PayHandler struct {
@@ -106,11 +106,17 @@ func OnCashFinished(order *model.Order) (err error) {
 //微信支付充值会员
 func OnWXPayFinished(order *model.Order) (err error) {
 	var (
-		db   = dao.GetDB()
-		ctx  *jxcontext.Context
-		txDB orm.TxOrmer
+		db      = dao.GetDB()
+		ctx     *jxcontext.Context
+		txDB, _ = dao.Begin(db)
 	)
-	globals.SugarLogger.Debugf("OnWXPayFinished begin modify account order: %v", utils.Format4Output(order, false))
+	defer func() {
+		if r := recover(); r != nil {
+			dao.Rollback(db, txDB)
+			panic(r)
+		}
+	}()
+
 	//判断是新会员充值还是老会员续费
 	userMembers, err := dao.GetUserMember(db, order.UserID, model.MemberTypeNormal)
 	if err != nil {
@@ -131,12 +137,34 @@ func OnWXPayFinished(order *model.Order) (err error) {
 		order.Status = model.OrderStatusFinished
 		//更新order状态
 		if _, err := dao.UpdateEntityTx(txDB, &order, "Status"); err != nil {
+			dao.Rollback(db, txDB)
 			return err
 		}
 	} else {
-		globals.SugarLogger.Debugf("OnWXPayFinished 暂不支持此订单类型 order: %v", utils.Format4Output(order, false))
 		return fmt.Errorf("暂不支持此订单类型！")
 	}
-	globals.SugarLogger.Debug("OnWXPayFinished end modify account ...", err)
 	return err
 }
+
+// OnWxPayTelephone 微信充值话费
+func OnWxPayTelephone(order *model.Order) error {
+	orderNumber, err := api.TelephoneAPI.RechargePhoneBill(&recharge_phone_bill.RechargePhoneBillBase{
+		FlowCode:    order.FlowCode,
+		Mobile:      order.Mobile,
+		OrderNumber: order.OrderID,
+		CallbackURL: "http://callback.rsm.jxc4.com/recharge/msg",
+		ChargeType:  "1",
+	})
+	if err != nil {
+		order.Comment = err.Error()
+		order.RechargeStatus = -1 // 充值失败
+	}
+	order.RechargeStatus = 1 // 充值中
+	order.Comment = orderNumber
+	//更新order状态
+	order.Status = model.OrderStatusFinished
+	if _, err := dao.UpdateEntity(dao.GetDB(), &order, "Status", "RechargeStatus", "Comment"); err != nil {
+		return err
+	}
+	return nil
+}