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)