From 63f96ca4261dacb538d9a69987906408d65e0714 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Wed, 3 Aug 2022 14:09:27 +0800
Subject: [PATCH] pay

---
 business/model/dao/dao_bill.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/business/model/dao/dao_bill.go b/business/model/dao/dao_bill.go
index 1ba3d6c15..0f57aa8ea 100644
--- a/business/model/dao/dao_bill.go
+++ b/business/model/dao/dao_bill.go
@@ -1,7 +1,6 @@
 package dao
 
 import (
-	"git.rosy.net.cn/jx-callback/globals"
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
@@ -148,15 +147,23 @@ type MixPayDetail struct {
 }
 
 //获取混合支付 余额部分信息
-func GetMixPayDetail(orderID string) (info *MixPayDetail, err error) {
-	info = new(MixPayDetail)
-	//info = make([]*MixPayDetail, len(orderID))
+func GetMixPayDetail(orderID string) (details *model.MixPay, err error) {
+	var info []*model.MixPay
 	sqlParams := []interface{}{}
+	sql := ""
 	if orderID != "" {
-		sql := "SELECT * FROM mix_pay WHERE order_id = ?"
+		sql += "SELECT * FROM mix_pay WHERE order_id = ?"
 		sqlParams = append(sqlParams, orderID)
-		err = GetRow(GetDB(), &info, sql, sqlParams)
 	}
-	globals.SugarLogger.Debug("输出mix pay信息", info.OrderID)
-	return info, err
+	if err = GetRow(GetDB(), &info, sql, sqlParams); err == nil {
+		details = &model.MixPay{
+			OrderID:      info[0].OrderID,
+			BalancePrice: info[0].BalancePrice,
+			TotalPrice:   info[0].TotalPrice,
+			WxPrice:      info[0].WxPrice,
+			Status:       info[0].Status,
+		}
+	}
+	//globals.SugarLogger.Debug("输出mix pay信息", info.OrderID)
+	return details, err
 }