liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

结算是上一期

Browse Source
This commit is contained in:
苏尹岚
2020-08-28 08:40:47 +08:00
parent b057521ed0
commit 753e810b03
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxutils/jxutils.go
View File

@@ -970,3 +970,7 @@ func GetDefendPriceIssue() (issue int) {
} }
return issue return issue
} }
func GetLastDefendPriceIssue() (issue int) {
return utils.Str2Int(time.Now().AddDate(0, 0, 1).Format("20060102"))
}

4
business/partner/purchase/jx/localjx/order.go
View File

@@ -1955,7 +1955,7 @@ func CreateOrderByPriceDefend(ctx *jxcontext.Context) (err error) {
userOrderMap = make(map[int64][]*model.PriceDefendOrder) userOrderMap = make(map[int64][]*model.PriceDefendOrder)
) )
globals.SugarLogger.Debugf("CreateOrderByPriceDefend Begin:") 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 { if len(priceDefends) > 0 {
for _, v := range priceDefends { for _, v := range priceDefends {
userOrderMap[v.AddressID] = append(userOrderMap[v.AddressID], v) 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 { if len(priceDefends2) > 0 {
for _, v := range priceDefends2 { for _, v := range priceDefends2 {
err = SettleDiscountActByPriceDefend(ctx, v, true) err = SettleDiscountActByPriceDefend(ctx, v, true)