1
This commit is contained in:
@@ -258,7 +258,7 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
|
||||
t1, _ := time.ParseInLocation("20060102150405", call.PayTime, loc)
|
||||
order.PayFinishedAt = t1
|
||||
order.OriginalData = utils.Format4Output(call, true)
|
||||
payStatus := 0
|
||||
payStatus := model.PayStatusNo
|
||||
//order.PayMethod = 2 // 通联微信支付
|
||||
if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
order.Status = model.OrderStatusFinished
|
||||
@@ -269,19 +269,19 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
|
||||
}
|
||||
|
||||
//充值会员 增加微信支付处理业务
|
||||
if (order.OrderType == 2 || order.OrderType == 5) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
if (order.OrderType == model.OrderTypeMember || order.OrderType == model.OrderTypeMemberYear) && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
return OnWXPayFinished(order)
|
||||
}
|
||||
// 充值话费
|
||||
if order.OrderType == 7 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
if order.OrderType == model.OrderTypeMobile && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
return OnWxPayTelephone(order)
|
||||
}
|
||||
// 发快递
|
||||
if order.OrderType == 3 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
if order.OrderType == model.OrderTypeDelivery && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
return OnWxPaySendPage(db, order, call, payStatus)
|
||||
}
|
||||
//需要充值到余额方式 购买的
|
||||
if order.OrderType == 6 && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
if order.OrderType == model.OrderTypeBalance && call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
|
||||
if err := dao.UpdateUserBill(order.UserID, order.PayPrice); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ func OnWxPaySendPage(db *dao.DaoDB, order *model.Order, call *tonglianpayapi.Cal
|
||||
return err
|
||||
}
|
||||
//1-余额,2-微信,5-混合
|
||||
if order.PayMethod == 5 {
|
||||
if order.PayMethod == model.OrderPayMethodMix {
|
||||
userBill, err := dao.GetUserBill(db, order.UserID, "")
|
||||
if err != nil {
|
||||
return err
|
||||
|
||||
Reference in New Issue
Block a user