From ec599b1f18d2635a1237e4a0327f2972bc8c6180 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 12 Dec 2023 09:22:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E7=94=9F=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E4=BD=8D=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/dto/DoctorAccount.go    | 21 +++++++++++----------
 api/service/OrderInquiry.go |  4 ++--
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/api/dto/DoctorAccount.go b/api/dto/DoctorAccount.go
index 70a5103..759d496 100644
--- a/api/dto/DoctorAccount.go
+++ b/api/dto/DoctorAccount.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"hospital-admin-api/api/model"
 	"hospital-admin-api/utils"
+	"math"
 )
 
 type DoctorAccountDto struct {
@@ -26,11 +27,11 @@ func GetDoctorAccountDto(m *model.DoctorAccount) *DoctorAccountDto {
 	return &DoctorAccountDto{
 		AccountId:               fmt.Sprintf("%d", m.AccountId),
 		DoctorId:                fmt.Sprintf("%d", m.DoctorId),
-		TotalAmount:             m.TotalAmount,
-		BalanceAccount:          m.BalanceAccount,
-		AppliedWithdrawalAmount: m.AppliedWithdrawalAmount,
-		ActualWithdrawalAmount:  m.ActualWithdrawalAmount,
-		IncomeTax:               m.IncomeTax,
+		TotalAmount:             math.Floor(m.TotalAmount*100) / 100,
+		BalanceAccount:          math.Floor(m.BalanceAccount*100) / 100,
+		AppliedWithdrawalAmount: math.Floor(m.AppliedWithdrawalAmount*100) / 100,
+		ActualWithdrawalAmount:  math.Floor(m.ActualWithdrawalAmount*100) / 100,
+		IncomeTax:               math.Floor(m.IncomeTax*100) / 100,
 		CreatedAt:               m.CreatedAt,
 		UpdatedAt:               m.UpdatedAt,
 	}
@@ -45,11 +46,11 @@ func GetDoctorAccountListDto(m []*model.DoctorAccount) []*DoctorAccountDto {
 			response := &DoctorAccountDto{
 				AccountId:               fmt.Sprintf("%d", v.AccountId),
 				DoctorId:                fmt.Sprintf("%d", v.DoctorId),
-				TotalAmount:             v.TotalAmount,
-				BalanceAccount:          v.BalanceAccount,
-				AppliedWithdrawalAmount: v.AppliedWithdrawalAmount,
-				ActualWithdrawalAmount:  v.ActualWithdrawalAmount,
-				IncomeTax:               v.IncomeTax,
+				TotalAmount:             math.Floor(v.TotalAmount*100) / 100,
+				BalanceAccount:          math.Floor(v.BalanceAccount*100) / 100,
+				AppliedWithdrawalAmount: math.Floor(v.AppliedWithdrawalAmount*100) / 100,
+				ActualWithdrawalAmount:  math.Floor(v.ActualWithdrawalAmount*100) / 100,
+				IncomeTax:               math.Floor(v.IncomeTax*100) / 100,
 				CreatedAt:               v.CreatedAt,
 				UpdatedAt:               v.UpdatedAt,
 			}
diff --git a/api/service/OrderInquiry.go b/api/service/OrderInquiry.go
index 47e52c0..966c372 100644
--- a/api/service/OrderInquiry.go
+++ b/api/service/OrderInquiry.go
@@ -401,8 +401,8 @@ func (r *OrderInquiryService) GetOrderInquiryDoctorAmount(inquiryStatus int, amo
 	if inquiryStatus == 4 || inquiryStatus == 5 || inquiryStatus == 6 {
 		doctorAmount, _ = decimal.NewFromFloat(amountTotal).
 			Mul(decimal.NewFromFloat(0.75)).
-			Mul(decimal.NewFromFloat(100000)).Floor().
-			Div(decimal.NewFromFloat(100000)).Float64()
+			Mul(decimal.NewFromFloat(100)).Floor().
+			Div(decimal.NewFromFloat(100)).Float64()
 	}
 
 	return doctorAmount