From 97717a1512402f7008ea106233d59b6ec433be03 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 21 Jun 2024 09:49:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 4a8fb2d..6065986 100644 --- a/go.mod +++ b/go.mod @@ -5,8 +5,8 @@ go 1.18 require ( code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240607091816-3df1433a2f0d 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.20240618132631-a4325da1c2fb + code.fnuoos.com/go_rely_warehouse/zyos_go_mq.git v0.0.5 + code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240620102048-79bb08d3d798 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 @@ -45,6 +45,7 @@ require ( ) require ( + code.fnuoos.com/go_rely_warehouse/zyos_model.git v0.0.4-0.20240620100400-9ebf54e21441 // indirect filippo.io/edwards25519 v1.1.0 // indirect github.com/KyleBanks/depth v1.2.1 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect From 78dfb470582301a1d3b260e373b04d051829ea67 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 21 Jun 2024 09:51:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consume/init.go | 1 + 1 file changed, 1 insertion(+) diff --git a/consume/init.go b/consume/init.go index 91c3517..dfd1ead 100644 --- a/consume/init.go +++ b/consume/init.go @@ -95,6 +95,7 @@ func initConsumes() { //jobs[consumeMd.ZhiosMallGreenCoinConsumeFunName] = ZhiosMallGreenCoinConsume //绿色双链积分 //jobs[consumeMd.ZhiosOneCirclesCoinConsumeFunName] = ZhiosOneCirclesCoinConsume //一个圈圈虚拟币变化 + //////////////////////////////////////// autoRepaid ///////////////////////////////////////////////////// jobs[consumeMd.InstallmentPaymentAutoRepaidConsumeFunName] = InstallmentPaymentAutoRepaidConsume //分期付 - 自动扣款 } From c2540aa4878c88dcf26b5c337cd3f11239b8ebbf Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 21 Jun 2024 09:55:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- consume/zhios_installment_payment_auto_repaid_consume.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/consume/zhios_installment_payment_auto_repaid_consume.go b/consume/zhios_installment_payment_auto_repaid_consume.go index d61b87b..ab3fbd1 100644 --- a/consume/zhios_installment_payment_auto_repaid_consume.go +++ b/consume/zhios_installment_payment_auto_repaid_consume.go @@ -35,7 +35,7 @@ func InstallmentPaymentAutoRepaidConsume(queue md.MqQueue) { if ok == true { //fmt.Println(string(res.Body)) fmt.Println(">>>>>>>>>>>>>>>>InstallmentPaymentAutoRepaidConsume<<<<<<<<<<<<<<<<<<<<<<<<<") - err = handleInstallmentPaymentAutoRepaidConsume(res.Body) + err = handleInstallmentPaymentAutoRepaidConsume(ch, res.Body) if err != nil { fmt.Println("handleInstallmentPaymentAutoRepaidConsumeERR:::::", err.Error()) } @@ -49,7 +49,7 @@ func InstallmentPaymentAutoRepaidConsume(queue md.MqQueue) { fmt.Println("get msg done") } -func handleInstallmentPaymentAutoRepaidConsume(msgData []byte) error { +func handleInstallmentPaymentAutoRepaidConsume(ch *rabbit.Channel, msgData []byte) error { time.Sleep(time.Duration(1) * time.Millisecond) //休眠1毫秒 //1、解析mq中queue的数据结构体 @@ -61,6 +61,6 @@ func handleInstallmentPaymentAutoRepaidConsume(msgData []byte) error { engine := db.DBs[msg.MasterId] //2、调用 `DealInstallmentPaymentAutoRepaid` 制度方法进行扣款 - err = installment_payment.DealInstallmentPaymentAutoRepaid(engine, *msg, msg.MasterId) + err = installment_payment.DealInstallmentPaymentAutoRepaid(engine, ch, *msg, msg.MasterId) return nil }