mixpay

business/jxstore/financial/financial.go

@@ -292,13 +292,30 @@ func onTLpayFinished(call *tonglianpayapi.CallBackResult) (err error) {
 				dao.Rollback(db, txdb)
 				return err
 			}
+			//1-余额,2-微信,5-混合
+			if order.PayMethod == 5 {
+				userBill, err := dao.GetUserBill(db, order.UserID, "")
+				if err != nil {
+					return err
+				}
+				//创建混合支付账单
+				totalPrice := order.PayPrice + userBill.AccountBalance
+				if err := AddMixPay(txdb, order.OrderID, userBill.AccountBalance, totalPrice, 5); err != nil {
+					dao.Rollback(db, txdb)
+					return err
+				}
+				//余额清空
+				if err := dao.UpdateUserBill(order.UserID, 0); err != nil {
+					globals.SugarLogger.Debug("修改余额失败")
+					dao.Rollback(db, txdb)
+					return err
+				}
+			}
 			dao.Commit(db, txdb)
 			if call.TrxStatus == tonglianpayapi.TrxStatusSuccess {
 				switch order.OrderType {
 				case model.PayType4Express:
 					err = q_bida.CreateOrder2QBiDa(&userOrder, order.OrderID)
-				case model.PayType4Member, model.PayType4Recharge:
-					err = OnPayFinished(order)
 				}
 			}
 			return err