Merge remote-tracking branch 'origin/master'

app/db/dbs_map.go

@@ -110,7 +110,7 @@ func GetAllDatabaseDev() *[]model.DbMapping {
 	fmt.Println("cfg.Local is: ", cfg.Local)
 	if cfg.Local { // 本地调试 加快速度
 		fmt.Println("notice:LOCAL TEST, only masterId:** 99813608 ** available!")
-		err = Db.Where("deleted_at != ? AND db_master_id=?", 1, 89608884).Find(&m)
+		err = Db.Where("deleted_at != ? AND db_master_id=?", 1, 31585332).Find(&m)
 	} else {
 		err = Db.Where("deleted_at != ? AND is_dev = '1' ", 1).Find(&m)
 	}

consume/init.go

@@ -19,47 +19,47 @@ func Init() {
 func initConsumes() {
 	//jobs[consumeMd.ZhiosGuideStoreOrderFunName] = ZhiosGuideStoreOrder
 
-	jobs[consumeMd.ZhiosIntegralProxyRechargeFunName] = ZhiosIntegralProxyRecharge
-	jobs[consumeMd.ZhiosUserUpLvFunName] = ZhiosUserUpLv
-	jobs[consumeMd.CanalGuideOrderByUserUpLvConsume] = CanalGuideOrderByUserUpLvConsume
-	jobs[consumeMd.ZhiosOrderFreeFunName] = ZhiosOrderFree
-	jobs[consumeMd.ZhiosOrderTotalFunName] = ZhiosOrderTotal
-	jobs[consumeMd.ZhiosOrderTotalSecondFunName] = ZhiosOrderTotalSecond
+	//jobs[consumeMd.ZhiosIntegralProxyRechargeFunName] = ZhiosIntegralProxyRecharge
+	//jobs[consumeMd.ZhiosUserUpLvFunName] = ZhiosUserUpLv
+	//jobs[consumeMd.CanalGuideOrderByUserUpLvConsume] = CanalGuideOrderByUserUpLvConsume
+	//jobs[consumeMd.ZhiosOrderFreeFunName] = ZhiosOrderFree
+	//jobs[consumeMd.ZhiosOrderTotalFunName] = ZhiosOrderTotal
+	//jobs[consumeMd.ZhiosOrderTotalSecondFunName] = ZhiosOrderTotalSecond
+	////
+	//jobs[consumeMd.ZhiosOrderSettleTotalFunName] = ZhiosSettleTotal
+	//jobs[consumeMd.ZhiosOrderHjyFunName] = ZhiosOrderHjy
+	//jobs[consumeMd.ZhiosOrderBuckleFunName] = ZhiosOrderBuckle
+	////
+	//jobs[consumeMd.ZhiosSupplierAfterOrderFunName] = ZhiosSupplierAfterOrder
 	//
-	jobs[consumeMd.ZhiosOrderSettleTotalFunName] = ZhiosSettleTotal
-	jobs[consumeMd.ZhiosOrderHjyFunName] = ZhiosOrderHjy
-	jobs[consumeMd.ZhiosOrderBuckleFunName] = ZhiosOrderBuckle
+	//jobs[consumeMd.ZhiosAppreciationFunName] = ZhiosAppreciation
+	//jobs[consumeMd.ZhiosValidUserFunName] = ZhiosValidUser
 	//
-	jobs[consumeMd.ZhiosSupplierAfterOrderFunName] = ZhiosSupplierAfterOrder
-
-	jobs[consumeMd.ZhiosAppreciationFunName] = ZhiosAppreciation
-	jobs[consumeMd.ZhiosValidUserFunName] = ZhiosValidUser
-
-	jobs[consumeMd.ZhiosAcquisitionConditionFunName] = ZhiosAcquisitionCondition
-
-	jobs[consumeMd.DouShenUserRegisterConsumeForOfficialFunName] = DouShenUserRegisterConsumeForOfficial
-	jobs[consumeMd.DouShenUserRegisterConsumeForOperationCenterFunName] = DouShenUserRegisterConsumeForOperationCenter
-	jobs[consumeMd.DouShenUserRegisterConsumeForMyRecommenderFunName] = DouShenUserRegisterConsumeForMyRecommender
-	jobs[consumeMd.DouShenUserRegisterConsumeForMyFansFunName] = DouShenUserRegisterConsumeForMyFans
-	jobs[consumeMd.DouShenUserRegisterConsumeForUserRegisterUpLvFunName] = DouShenUserRegisterConsumeForUserRegisterUpLv
-
-	jobs[consumeMd.ZhiosFastReturnOrderPayFunName] = ZhiosFastReturnOrderPay
-	jobs[consumeMd.ZhiosFastReturnOrderSuccessFunName] = ZhiosFastReturnOrderSuccess
-	jobs[consumeMd.ZhiosFastReturnOrderRefundFunName] = ZhiosFastReturnOrderRefund
-	jobs[consumeMd.ZhiosFastReturnOrderRefundSecondFunName] = ZhiosFastReturnOrderRefundSecond
-
-	jobs[consumeMd.YoumishangExchangeStoreFunName] = YoumishangExchangeStore
-
-	jobs[consumeMd.ZhiosRechargeOrderFailFunName] = ZhiosRechargeOrderFail
-
-	jobs[consumeMd.CloudIssuanceAsyncMLoginFunName] = CloudIssuanceAsyncMLoginConsume
-	jobs[consumeMd.ZhiosTikTokUpdateFunName] = ZhiosTikTokUpdate
-	jobs[consumeMd.ZhiosTikTokAllUpdateFunName] = ZhiosTikTokAllUpdate
-
-	jobs[consumeMd.ZhiosCapitalPoolOrderTotalFunName] = ZhiosCapitalPoolOrderTotal
-	jobs[consumeMd.ZhiosExpressOrderFail] = ZhiosExpressOrderFail
-	jobs[consumeMd.ZhiosWithdrawReward] = ZhiosWithdrawReward
-	jobs[consumeMd.ZhiosTaskTotal] = ZhiosTaskTotal
+	//jobs[consumeMd.ZhiosAcquisitionConditionFunName] = ZhiosAcquisitionCondition
+	//
+	//jobs[consumeMd.DouShenUserRegisterConsumeForOfficialFunName] = DouShenUserRegisterConsumeForOfficial
+	//jobs[consumeMd.DouShenUserRegisterConsumeForOperationCenterFunName] = DouShenUserRegisterConsumeForOperationCenter
+	//jobs[consumeMd.DouShenUserRegisterConsumeForMyRecommenderFunName] = DouShenUserRegisterConsumeForMyRecommender
+	//jobs[consumeMd.DouShenUserRegisterConsumeForMyFansFunName] = DouShenUserRegisterConsumeForMyFans
+	//jobs[consumeMd.DouShenUserRegisterConsumeForUserRegisterUpLvFunName] = DouShenUserRegisterConsumeForUserRegisterUpLv
+	//
+	//jobs[consumeMd.ZhiosFastReturnOrderPayFunName] = ZhiosFastReturnOrderPay
+	//jobs[consumeMd.ZhiosFastReturnOrderSuccessFunName] = ZhiosFastReturnOrderSuccess
+	//jobs[consumeMd.ZhiosFastReturnOrderRefundFunName] = ZhiosFastReturnOrderRefund
+	//jobs[consumeMd.ZhiosFastReturnOrderRefundSecondFunName] = ZhiosFastReturnOrderRefundSecond
+	//
+	//jobs[consumeMd.YoumishangExchangeStoreFunName] = YoumishangExchangeStore
+	//
+	//jobs[consumeMd.ZhiosRechargeOrderFailFunName] = ZhiosRechargeOrderFail
+	//
+	//jobs[consumeMd.CloudIssuanceAsyncMLoginFunName] = CloudIssuanceAsyncMLoginConsume
+	//jobs[consumeMd.ZhiosTikTokUpdateFunName] = ZhiosTikTokUpdate
+	//jobs[consumeMd.ZhiosTikTokAllUpdateFunName] = ZhiosTikTokAllUpdate
+	//
+	//jobs[consumeMd.ZhiosCapitalPoolOrderTotalFunName] = ZhiosCapitalPoolOrderTotal
+	//jobs[consumeMd.ZhiosExpressOrderFail] = ZhiosExpressOrderFail
+	//jobs[consumeMd.ZhiosWithdrawReward] = ZhiosWithdrawReward
+	//jobs[consumeMd.ZhiosTaskTotal] = ZhiosTaskTotal
 
 	//
 
@@ -79,13 +79,13 @@ func initConsumes() {
 	//jobs[consumeMd.CanalUserVirtualCcoinFlowFunName] = CanalUserVirtualCoinFlowConsume
 
 	//////////////////////////////////////// oneCircles /////////////////////////////////////////////////////
-	//
-	//jobs[consumeMd.OneCirclesSignInGreenEnergyFunName] = OneCirclesSignInGreenEnergyConsume
-	//jobs[consumeMd.OneCirclesStartLevelDividendFunName] = OneCirclesStartLevelDividendConsume
-	//jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyConsume
-	//jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume
-	//jobs[consumeMd.OneCirclesSettlementPublicGiveActivityCoinFunName] = OneCirclesSettlementPublicGiveActivityCoinConsume
-	////jobs[consumeMd.OneCirclesSignInCopyGreenEnergyFunName] = OneCirclesSignInCopyGreenEnergyConsume
+
+	jobs[consumeMd.OneCirclesSignInGreenEnergyFunName] = OneCirclesSignInGreenEnergyConsume
+	jobs[consumeMd.OneCirclesStartLevelDividendFunName] = OneCirclesStartLevelDividendConsume
+	jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyConsume
+	jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume
+	jobs[consumeMd.OneCirclesSettlementPublicGiveActivityCoinFunName] = OneCirclesSettlementPublicGiveActivityCoinConsume
+	//jobs[consumeMd.OneCirclesSignInCopyGreenEnergyFunName] = OneCirclesSignInCopyGreenEnergyConsume
 
 	//////////////////////////////////////// withdraw /////////////////////////////////////////////////////
 	//jobs[consumeMd.WithdrawConsumeFunName] = WithdrawConsume

consume/md/consume_key.go

@@ -436,10 +436,10 @@ var RabbitMqQueueKeyList = []*MqQueue{
 	},
 	{
 		ExchangeName:   "one.circles",
-		Name:           "one_circles_auto_exchange_green_energy_to_person",
+		Name:           "one_circles_auto_exchange_green_energy_to_person_1",
 		Type:           TopicQueueType,
 		IsPersistent:   false,
-		RoutKey:        "auto_exchange_green_energy_to_person",
+		RoutKey:        "auto_exchange_green_energy_to_person_1",
 		BindKey:        "",
 		ConsumeFunName: "OneCirclesActivityCoinAutoExchangeGreenEnergyConsume",
 	},
@@ -498,6 +498,7 @@ var RabbitMqQueueKeyList = []*MqQueue{
 		ConsumeFunName: "FlexibleEmploymentWithdrawForPupiaoConsume",
 	},
 }
+
 const (
 	ZhiosUserRelateFunName                                      = "ZhiosUserRelate"
 	ZhiosIntegralProxyRechargeFunName                           = "ZhiosIntegralProxyRecharge"
@@ -553,6 +554,5 @@ const (
 	WithdrawConsumeFunName                                      = "WithdrawConsume"
 	FlexibleEmploymentWithdrawForGongMaoConsumeFunName          = "FlexibleEmploymentWithdrawForGongMaoConsume"
 	FlexibleEmploymentWithdrawForPupiaoConsumeFunName           = "FlexibleEmploymentWithdrawForPupiaoConsume"
-	ZhiosTaskTotal                                       = "zhiosTaskTotal"
-
+	ZhiosTaskTotal                                              = "zhiosTaskTotal"
 )

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() {

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() {

go.mod

@@ -6,7 +6,7 @@ require (
 	code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240222023917-c31b53f7e8cb
 	code.fnuoos.com/go_rely_warehouse/zyos_go_es.git v1.0.0
 	code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.4
-	code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240426110740-80d1b204e6a4
+	code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240429101230-96c8156e4695
 	code.fnuoos.com/go_rely_warehouse/zyos_go_pay.git v1.6.2-0.20231116085701-9ba6e19f877b
 	code.fnuoos.com/go_rely_warehouse/zyos_go_third_party_api.git v1.1.21-0.20240126015516-38ca248db2fd
 	github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5