From ad6b5f31443955ffd9533ab421b3c741acc70581 Mon Sep 17 00:00:00 2001
From: huangjiajun <582604932@qq.com>
Date: Tue, 9 May 2023 14:30:05 +0800
Subject: [PATCH] test

---
 db/db_mall_ord_capital_pool_total.go |  4 ++--
 rule/self_buy_global.go              | 35 +++++++++++++++++-----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/db/db_mall_ord_capital_pool_total.go b/db/db_mall_ord_capital_pool_total.go
index 5227d17..26966cb 100644
--- a/db/db_mall_ord_capital_pool_total.go
+++ b/db/db_mall_ord_capital_pool_total.go
@@ -6,9 +6,9 @@ import (
 	"xorm.io/xorm"
 )
 
-func GetMaxPrice(eg *xorm.Engine, uid string) *model.MallOrdCapitalPoolTotal {
+func GetMaxPrice(eg *xorm.Engine, uid string, price float64) *model.MallOrdCapitalPoolTotal {
 	var data model.MallOrdCapitalPoolTotal
-	get, err := eg.Where("uid=? and type=?", uid, 0).Get(&data)
+	get, err := eg.Where("uid=? and type=? and other_price<?", uid, 0, price).Get(&data)
 	if err != nil {
 		return nil
 	}
diff --git a/rule/self_buy_global.go b/rule/self_buy_global.go
index c2072c6..d3ccb34 100644
--- a/rule/self_buy_global.go
+++ b/rule/self_buy_global.go
@@ -38,22 +38,31 @@ func AddOrder(eg *xorm.Engine, req map[string]string) {
 			eg.Insert(data)
 		}
 	} else {
-		if price < minMOney {
-			return
-		}
-		var data = &model.MallOrdCapitalPoolTotal{
-			Uid:        zhios_order_relate_utils.StrToInt(req["uid"]),
-			OtherPrice: req["price"],
-			LeavePrice: req["price"],
-			Num:        1,
-			UpdateTime: time.Now(),
-			Oid:        req["oid"],
-			Type:       0,
-		}
-		eg.Insert(data)
+		getPrice(eg, req, minMOney*capitalPoolMul, price)
 	}
 	return
 }
+func getPrice(eg *xorm.Engine, req map[string]string, minMoney float64, leavePrice float64) {
+	if leavePrice <= 0 {
+		return
+	}
+	max := db.GetMaxPrice(eg, req["uid"], minMoney)
+	if max != nil {
+		sum := zhios_order_relate_utils.StrToFloat64(max.OtherPrice) + leavePrice
+		if sum >= minMoney { //如果超过了498
+			leavePrice = sum - minMoney
+			if leavePrice > 0 {
+				getPrice(eg, req, minMoney, leavePrice)
+			}
+			leavePrice = minMoney - zhios_order_relate_utils.StrToFloat64(max.OtherPrice)
+			max.Num = 1
+		}
+		max.LeavePrice = zhios_order_relate_utils.Float64ToStrByPrec(zhios_order_relate_utils.StrToFloat64(max.LeavePrice)+leavePrice, 3)
+		max.OtherPrice = zhios_order_relate_utils.Float64ToStrByPrec(zhios_order_relate_utils.StrToFloat64(max.OtherPrice)+leavePrice, 3)
+		max.UpdateTime = time.Now()
+		eg.Where("id=?", max.Id).AllCols().Update(max)
+	}
+}
 
 func Pool(eg *xorm.Engine, price string) error {
 	if zhios_order_relate_utils.StrToFloat64(price) == 0 {