From 753e810b030a0e3698cb5c2f1421f5c8df164278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Fri, 28 Aug 2020 08:40:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E7=AE=97=E6=98=AF=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxutils/jxutils.go | 4 ++++ business/partner/purchase/jx/localjx/order.go | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/business/jxutils/jxutils.go b/business/jxutils/jxutils.go index 91ab4b880..beb7601aa 100644 --- a/business/jxutils/jxutils.go +++ b/business/jxutils/jxutils.go @@ -970,3 +970,7 @@ func GetDefendPriceIssue() (issue int) { } return issue } + +func GetLastDefendPriceIssue() (issue int) { + return utils.Str2Int(time.Now().AddDate(0, 0, 1).Format("20060102")) +} diff --git a/business/partner/purchase/jx/localjx/order.go b/business/partner/purchase/jx/localjx/order.go index f6956b744..7deb9cb19 100644 --- a/business/partner/purchase/jx/localjx/order.go +++ b/business/partner/purchase/jx/localjx/order.go @@ -1955,7 +1955,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) { userOrderMap = make(map[int64][]*model.PriceDefendOrder) ) globals.SugarLogger.Debugf("CreateOrderByPriceDefend Begin:") - priceDefends, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 1, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) + priceDefends, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetLastDefendPriceIssue()}, 0, -1, 1, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) if len(priceDefends) > 0 { for _, v := range priceDefends { userOrderMap[v.AddressID] = append(userOrderMap[v.AddressID], v) @@ -2004,7 +2004,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) { } } } - priceDefends2, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetDefendPriceIssue()}, 0, -1, 0, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) + priceDefends2, _ := dao.GetPriceDefendOrder(db, "", nil, nil, []int{jxutils.GetLastDefendPriceIssue()}, 0, -1, 0, 1, "", utils.ZeroTimeValue, utils.ZeroTimeValue, false) if len(priceDefends2) > 0 { for _, v := range priceDefends2 { err = SettleDiscountActByPriceDefend(ctx, v, true)