From 0e45aa62fac07d33d4ee5dde65e7c43bf7f0578b Mon Sep 17 00:00:00 2001 From: dengbiao Date: Sat, 11 May 2024 16:13:14 +0800 Subject: [PATCH] update --- consume/init.go | 10 +++++----- consume/md/md_one_circles.go | 1 + consume/one_circles_sign_in_consume.go | 2 +- go.mod | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/consume/init.go b/consume/init.go index 46da7b8..0863cee 100644 --- a/consume/init.go +++ b/consume/init.go @@ -80,11 +80,11 @@ func initConsumes() { //////////////////////////////////////// oneCircles ///////////////////////////////////////////////////// - //jobs[consumeMd.OneCirclesSignInGreenEnergyFunName] = OneCirclesSignInGreenEnergyConsume - //jobs[consumeMd.OneCirclesStartLevelDividendFunName] = OneCirclesStartLevelDividendConsume - //jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyConsume - //jobs[consumeMd.OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamFunName] = OneCirclesActivityCoinAutoExchangeGreenEnergyForTeamConsume - //jobs[consumeMd.OneCirclesSettlementPublicGiveActivityCoinFunName] = OneCirclesSettlementPublicGiveActivityCoinConsume + 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 ///////////////////////////////////////////////////// diff --git a/consume/md/md_one_circles.go b/consume/md/md_one_circles.go index c67ea09..f9f793f 100644 --- a/consume/md/md_one_circles.go +++ b/consume/md/md_one_circles.go @@ -4,6 +4,7 @@ type OneCirclesStructForSignIn struct { MasterId string `json:"master_id"` Uid int `json:"uid"` Id int64 `json:"id"` + EndTime string `json:"end_time"` } type OneCirclesStructForStarLevelDividends struct { diff --git a/consume/one_circles_sign_in_consume.go b/consume/one_circles_sign_in_consume.go index c0af23c..83f12ae 100644 --- a/consume/one_circles_sign_in_consume.go +++ b/consume/one_circles_sign_in_consume.go @@ -57,7 +57,7 @@ func handleOneCirclesSignInGreenEnergy(msgData []byte) error { } engine := db.DBs[msg.MasterId] - err = one_circles.HandleSettlementSignInGreenEnergy(engine, msg.MasterId, msg.Id, msg.Uid) + err = one_circles.HandleSettlementSignInGreenEnergy(engine, msg.MasterId, msg.Id, msg.Uid, msg.EndTime) fmt.Println("err::::", err) if err != nil { return err diff --git a/go.mod b/go.mod index d3c945d..912986d 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240508035221-a15bc382bb05 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.20240429101230-96c8156e4695 + code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240511075833-e9b3fce2f763 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