From aaff628b591b3cbc40b72c17cf9cc3321e6b33a2 Mon Sep 17 00:00:00 2001 From: huangjiajun <582604932@qq.com> Date: Fri, 12 Apr 2024 16:31:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/model/o2o_fin_user_flow.go | 1 + rule/consume_integral_settlement.go | 2 +- svc/svc_deal_user_amount.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/db/model/o2o_fin_user_flow.go b/db/model/o2o_fin_user_flow.go index 6099f18..8c3607e 100644 --- a/db/model/o2o_fin_user_flow.go +++ b/db/model/o2o_fin_user_flow.go @@ -29,4 +29,5 @@ type O2oFinUserFlow struct { AliOrdId string `json:"ali_ord_id" xorm:"default '' comment('支付宝订单号') VARCHAR(128)"` CreateAt time.Time `json:"create_at" xorm:"created not null default 'CURRENT_TIMESTAMP' comment('创建时间') TIMESTAMP"` UpdateAt time.Time `json:"update_at" xorm:"updated not null default 'CURRENT_TIMESTAMP' comment('更新时间') TIMESTAMP"` + SubsidyNum int `json:"subsidy_num" xorm:"not null default 1 comment('') INT(11)"` } diff --git a/rule/consume_integral_settlement.go b/rule/consume_integral_settlement.go index c40671a..248a8d5 100644 --- a/rule/consume_integral_settlement.go +++ b/rule/consume_integral_settlement.go @@ -199,7 +199,7 @@ func DailySettlementBlockConsumeIntegral(engine *xorm.Engine, mid string, isTask //加余额流水 if len(storeTotalMap) > 0 { for k, v := range storeTotalMap { - err1 := DealUserStoreAmountFlow(session, k, zhios_order_relate_utils.StrToFloat64(v.String()), mid, zhios_order_relate_utils.IntToStr(experienceTotalCountMap[k])) + err1 := DealUserStoreAmountFlow(session, k, zhios_order_relate_utils.StrToFloat64(v.String()), mid, zhios_order_relate_utils.IntToStr(storeTotalCountMap[k])) if err1 != nil { _ = session.Rollback() return err1, totalMap, storeTotalMap diff --git a/svc/svc_deal_user_amount.go b/svc/svc_deal_user_amount.go index c65d77f..2f48721 100644 --- a/svc/svc_deal_user_amount.go +++ b/svc/svc_deal_user_amount.go @@ -240,7 +240,7 @@ func DealUserStoreAmountFlow(session *xorm.Session, req md.DealUserAmount) (err State: 1, CreateAt: now, UpdateAt: now, - Memo: req.Num, + SubsidyNum: zhios_order_relate_utils.StrToInt(req.Num), Date: now.Format("2006-01-02"), } finUserFlow.Type = 0