1

business/jxstore/financial/financial.go

@@ -271,38 +271,30 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
 
 		//充值会员 增加微信支付处理业务
 		if (order.OrderType == 2 || order.OrderType == 5) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
-			if err := OnWXPayFinished(order); err != nil {
-				return err
-			}
 			return OnWXPayFinished(order)
 		}
+		// 充值话费
+		if order.OrderType == 7 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
+			return OnWxPayTelephone(order)
+		}
 		if order.OrderType == 3 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
-			globals.SugarLogger.Debug("得到微信回调结果，快递流程开始")
 			txdb, _ := dao.Begin(db)
 			defer func() {
 				if r := recover(); r != nil {
 					panic(r)
 				}
 			}()
-			globals.SugarLogger.Debug("更新order")
 			order.TransactionID = call.TrxID
 			order.Status = 110 //支付成功状态
-			globals.SugarLogger.Debug("输出赋值后的order.TransactionID", order.TransactionID)
-			if _, err := dao.UpdateEntityTx(txdb, order, "TransactionID"); err != nil {
+			if _, err := dao.UpdateEntityTx(txdb, order, "TransactionID", "Status"); err != nil {
 				dao.Rollback(db, txdb)
 				return err
 			}
-			if _, err := dao.UpdateEntityTx(txdb, order, "Status"); err != nil {
-				dao.Rollback(db, txdb)
-				return err
-			}
-			globals.SugarLogger.Debug("获取UserVendorOrder")
 			userOrder := model.UserVendorOrder{LocalWayBill: order.OrderID}
 			if err := dao.GetEntity(db, &userOrder, "LocalWayBill"); err != nil {
 				dao.Rollback(db, txdb)
 				return err
 			}
-			globals.SugarLogger.Debug("更新UserVendorOrder")
 			userOrder.OrderStatus = payStatus
 			if _, err := dao.UpdateEntityTx(txdb, &userOrder, "OrderStatus"); err != nil {
 				dao.Rollback(db, txdb)
@@ -310,24 +302,18 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
 			}
 			//1-余额,2-微信,5-混合
 			if order.PayMethod == 5 {
-				globals.SugarLogger.Debug("进入混合支付回调流程")
 				userBill, err := dao.GetUserBill(db, order.UserID, "")
 				if err != nil {
 					return err
 				}
 				//创建混合支付账单
 				totalPrice := order.PayPrice + userBill.AccountBalance
-				globals.SugarLogger.Debug("totalPrice=================", totalPrice)
-				globals.SugarLogger.Debug("进入增加mixpay账单")
 				if err := AddMixPay(txdb, order.OrderID, userBill.AccountBalance, totalPrice, 1); err != nil {
-					globals.SugarLogger.Debug("增加mixpay账单失败")
 					dao.Rollback(db, txdb)
 					return err
 				}
 				//余额清空
-				globals.SugarLogger.Debug("开始清空余额")
 				if err := dao.UpdateUserBill(order.UserID, 0); err != nil {
-					globals.SugarLogger.Debug("修改余额失败")
 					dao.Rollback(db, txdb)
 					return err
 				}

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
+}