From 2b451259fb1697ca1ef68f264d5308392b883592 Mon Sep 17 00:00:00 2001
From: dengbiao <dengbiao@fnuoos.com>
Date: Sun, 28 Apr 2024 11:49:25 +0800
Subject: [PATCH] update

---
 ...coin_auto_exchange_green_energy_consume.go | 20 ++++++++++++------
 ..._exchange_green_energy_for_team_consume.go | 21 +++++++++++++------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/consume/one_circles_activity_coin_auto_exchange_green_energy_consume.go b/consume/one_circles_activity_coin_auto_exchange_green_energy_consume.go
index 164329d..1c01f0e 100644
--- a/consume/one_circles_activity_coin_auto_exchange_green_energy_consume.go
+++ b/consume/one_circles_activity_coin_auto_exchange_green_energy_consume.go
@@ -12,6 +12,7 @@ import (
 	md2 "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/md"
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles"
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles/enum"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles/svc"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -68,16 +69,23 @@ func handleOneCirclesActivityCoinAutoExchangeGreenEnergyConsume(msgData []byte)
 	}
 	engine := db.DBs[msg.MasterId]
 	//2、查找 `one_circles_green_energy_basic_setting` 基础设置
-	oneCirclesGreenEnergyBasicSetting, err := db2.OneCirclesGreenEnergyBasicSettingGetOneByParams(engine, map[string]interface{}{
-		"key":   "is_open",
-		"value": 1,
-	})
+	oneCirclesGreenEnergyBasicSetting, cb, err := svc.GetPrice(engine, msg.MasterId)
 	if err != nil {
 		return err
 	}
-	if oneCirclesGreenEnergyBasicSetting == nil {
-		return nil
+	if cb != nil {
+		defer cb() // 释放锁
 	}
+	//oneCirclesGreenEnergyBasicSetting, err := db2.OneCirclesGreenEnergyBasicSettingGetOneByParams(engine, map[string]interface{}{
+	//	"key":   "is_open",
+	//	"value": 1,
+	//})
+	//if err != nil {
+	//	return err
+	//}
+	//if oneCirclesGreenEnergyBasicSetting == nil {
+	//	return nil
+	//}
 
 	session := engine.NewSession()
 	defer func() {
diff --git a/consume/one_circles_activity_coin_auto_exchange_green_energy_for_team_consume.go b/consume/one_circles_activity_coin_auto_exchange_green_energy_for_team_consume.go
index 607b188..277856b 100644
--- a/consume/one_circles_activity_coin_auto_exchange_green_energy_for_team_consume.go
+++ b/consume/one_circles_activity_coin_auto_exchange_green_energy_for_team_consume.go
@@ -12,6 +12,7 @@ import (
 	md2 "code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/md"
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles"
 	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles/enum"
+	"code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git/rule/one_circles/svc"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -68,16 +69,24 @@ func handleOneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume(msgData [
 	}
 	engine := db.DBs[msg.MasterId]
 	//2、查找 `one_circles_green_energy_basic_setting` 基础设置
-	oneCirclesGreenEnergyBasicSetting, err := db2.OneCirclesGreenEnergyBasicSettingGetOneByParams(engine, map[string]interface{}{
-		"key":   "is_open",
-		"value": 1,
-	})
+	oneCirclesGreenEnergyBasicSetting, cb, err := svc.GetPrice(engine, msg.MasterId)
 	if err != nil {
 		return err
 	}
-	if oneCirclesGreenEnergyBasicSetting == nil {
-		return nil
+	if cb != nil {
+		defer cb() // 释放锁
 	}
+	//
+	//oneCirclesGreenEnergyBasicSetting, err := db2.OneCirclesGreenEnergyBasicSettingGetOneByParams(engine, map[string]interface{}{
+	//	"key":   "is_open",
+	//	"value": 1,
+	//})
+	//if err != nil {
+	//	return err
+	//}
+	//if oneCirclesGreenEnergyBasicSetting == nil {
+	//	return nil
+	//}
 
 	session := engine.NewSession()
 	defer func() {