Merge remote-tracking branch 'origin/master'

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)
 	}
 }

consume/zhios_integral_proxy_recharge.go

@@ -77,18 +77,25 @@ 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 := "代充值"
 	if order.Type == "gift_goods" {
 		str = "购买礼包奖励"
 	}
+	if order.Type == "give" {
+		str = "转赠"
+	}
 	if canalMsg.Type == "" || canalMsg.Type == "first" {
 		amount = order.Amount
 		title = str + "到账"

go.mod

@@ -3,12 +3,12 @@ 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.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.20240104094422-d0d0ef549175
+	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