From 48f210e35ca18da886de5ffd5a5c8d60f97a9ba1 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Wed, 17 Jan 2024 13:54:36 +0800 Subject: [PATCH 1/4] =?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_integral_proxy_recharge.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/consume/zhios_integral_proxy_recharge.go b/consume/zhios_integral_proxy_recharge.go index 6ef5c92..5a9c430 100644 --- a/consume/zhios_integral_proxy_recharge.go +++ b/consume/zhios_integral_proxy_recharge.go @@ -89,6 +89,9 @@ func handleZhiosIntegralProxyRecharge(msg []byte) error { if order.Type == "gift_goods" { str = "购买礼包奖励" } + if order.Type == "give" { + str = "转赠" + } if canalMsg.Type == "" || canalMsg.Type == "first" { amount = order.Amount title = str + "到账" From 8fd52b85b0d93cfe4030cc78845fbc62e2c6dde2 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 19 Jan 2024 14:06:29 +0800 Subject: [PATCH 2/4] =?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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 87aef65..1404e1e 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module applet go 1.18 require ( - code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20231117125527-cb06c9e24f3f + code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240119060559-97043af747f2 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.20240104094422-d0d0ef549175 + code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240118152737-08e0d2709655 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.20231221064048-3937c0824e59 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 From d75407120aaea8a6407babd78242e4edb81b021f Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Sat, 20 Jan 2024 09:12:54 +0800 Subject: [PATCH 3/4] =?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/canal_mall_ord_for_you_mi_shang.go | 2 +- consume/zhios_integral_proxy_recharge.go | 4 ++++ go.mod | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/consume/canal_mall_ord_for_you_mi_shang.go b/consume/canal_mall_ord_for_you_mi_shang.go index cef4404..e8aab3d 100644 --- a/consume/canal_mall_ord_for_you_mi_shang.go +++ b/consume/canal_mall_ord_for_you_mi_shang.go @@ -115,6 +115,6 @@ func FindUser(eg *xorm.Engine, uid string, dbName string, levelList []*model2.Us var info model.User copier.Copy(&info, &oneUser) fmt.Println(DataDetail1) - zyos_go_condition_hdl.CommUplv("", eg, dbName, &info, oneUser.Level, DataDetail1) + zyos_go_condition_hdl.CommUplv(map[string]string{}, "", eg, dbName, &info, oneUser.Level, DataDetail1) } } diff --git a/consume/zhios_integral_proxy_recharge.go b/consume/zhios_integral_proxy_recharge.go index 5a9c430..f3c59cb 100644 --- a/consume/zhios_integral_proxy_recharge.go +++ b/consume/zhios_integral_proxy_recharge.go @@ -77,12 +77,16 @@ func handleZhiosIntegralProxyRecharge(msg []byte) error { sess.Rollback() return nil } + day := order.Time.Format("02") if order.SendTime == 0 { order.SendTime = int(utils.TimeStdParseUnix(order.PayTime.Format("2006-01-02") + " 00:00:00")) } else if order.SendTime < int(time.Now().Unix()) { order.SendTime = int(utils.TimeStdParseUnix(time.Now().Format("2006-01-02") + " 00:00:00")) } order.SendTime += 30 * 86400 + date := time.Unix(int64(order.SendTime), 0).Format("2006-01") + order.SendTime = int(utils.TimeStdParseUnix(date + "-" + day + " 00:00:00")) + amount := "0" title := "" str := "代充值" diff --git a/go.mod b/go.mod index 1404e1e..e73a969 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module applet go 1.18 require ( - code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240119060559-97043af747f2 + code.fnuoos.com/go_rely_warehouse/zyos_go_condition_statistics.git v1.1.2-0.20240119081432-583bfc0a6098 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.20240118152737-08e0d2709655 + code.fnuoos.com/go_rely_warehouse/zyos_go_order_relate_rule.git v1.9.10-0.20240119104238-05c3962029ff 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.20231221064048-3937c0824e59 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 From bdf72949e1940c62bd71a37771e15e3b3b7d419e Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 26 Jan 2024 09:56:08 +0800 Subject: [PATCH 4/4] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e73a969..4d20b55 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( 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.20240119104238-05c3962029ff 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.20231221064048-3937c0824e59 + 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 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 github.com/boombuler/barcode v1.0.1