u

code/base-project/base-go-v2/internal/api/money/index.go

@@ -111,8 +111,8 @@ func queryMoneyRecords(c *router.Context) error {
 		if dayDataI == nil {
 			dayData = mapx.New().
 				Set("records", mapx.NewArr()).
-				Set("income", decimal.NewFromInt(0).String()).
-				Set("expense", decimal.NewFromInt(0).String())
+				Set("income", "0.00").
+				Set("expense", "0.00")
 		} else {
 			dayData = dayDataI.(mapx.M)
 		}
@@ -132,16 +132,17 @@ func queryMoneyRecords(c *router.Context) error {
 		dayIncome, _ := decimal.NewFromString(dayData.GetString("income"))
 		dayExpense, _ := decimal.NewFromString(dayData.GetString("expense"))
 
-		if categoryType == 0 {
+		if categoryType == 1 {
 			dayIncome = dayIncome.Add(amount)
 			totalIncome = totalIncome.Add(amount)
-		} else if categoryType == 1 {
+		} else if categoryType == 0 {
 			dayExpense = dayExpense.Add(amount)
 			totalExpense = totalExpense.Add(amount)
 		}
 
-		dayData.Set("income", dayIncome.String())
-		dayData.Set("expense", dayExpense.String())
+		// ⭐ 保留两位小数
+		dayData.Set("income", dayIncome.Round(2).StringFixed(2))
+		dayData.Set("expense", dayExpense.Round(2).StringFixed(2))
 
 		grouped.Set(day, dayData)
 	}
@@ -152,7 +153,7 @@ func queryMoneyRecords(c *router.Context) error {
 		dates = append(dates, k)
 	}
 	sort.Slice(dates, func(i, j int) bool {
-		return dates[i] > dates[j] // 倒序
+		return dates[i] > dates[j]
 	})
 
 	// 构建最终 records 数组
@@ -166,10 +167,11 @@ func queryMoneyRecords(c *router.Context) error {
 			Set("records", dayData.GetArray("records")))
 	}
 
+	// ⭐ 最终总收入/支出保留两位小数
 	result := mapx.New().
 		Set("records", recordsArr).
-		Set("total_income", totalIncome.String()).
-		Set("total_expense", totalExpense.String())
+		Set("total_income", totalIncome.Round(2).StringFixed(2)).
+		Set("total_expense", totalExpense.Round(2).StringFixed(2))
 
 	return response.Success(c).Data(result).Send()
 }
@@ -195,9 +197,9 @@ func getUserCategory(c *router.Context) error {
 
 	for _, cat := range userCategories {
 		t := cat.GetInt("type")
-		if t == 0 {
+		if t == 1 {
 			result["income"] = append(result["income"], cat)
-		} else if t == 1 {
+		} else if t == 0 {
 			result["expense"] = append(result["expense"], cat)
 		}
 	}
@@ -301,13 +303,10 @@ func deleteMoneyRecord(c *router.Context) error {
 	}
 	recordId := bodyData.GetInt64("id")
 
-	deleteOne, err := db.DeleteOne("money_record", "id", recordId)
+	_, err = db.DeleteOne("money_record", "id", recordId)
 	if err != nil {
 		return c.AddError(err)
 	}
-	if deleteOne != 1 {
-		return response.Fail(c).Message("删除失败").Send()
-	}
 
 	return response.Success(c).Message("删除成功").Send()
 }