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

刷新历史订单结算价修改

Browse Source
This commit is contained in:
苏尹岚
2019-11-08 11:54:06 +08:00
parent 406c3e56e4
commit 0854c131cb
5 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
business/jxcallback/orderman/order.go
View File

@@ -613,18 +613,36 @@ func (c *OrderManager) UpdateOrderFields(order *model.GoodsOrder, fieldList []st
return err
}
func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context, vendorOrderID string, actIDs, vendorIDs []int, storeID int, fromDate, toDate string, isAsync, isContinueWhenError bool) (hint string, err error) {
func (c *OrderManager) RefreshHistoryOrdersEarningPrice(ctx *jxcontext.Context, vendorOrderID string, actID int, vendorIDs []int, storeID int, fromDate, toDate string, isAsync, isContinueWhenError bool) (hint string, err error) {
var (
orderList []*model.GoodsOrder
fromDateParam time.Time
toDateParam time.Time
)
db := dao.GetDB()
fromDateParam := utils.Str2Time(fromDate)
toDateParam := utils.Str2Time(toDate)
//若时间间隔大于10天则不允许查询
if math.Ceil(toDateParam.Sub(fromDateParam).Hours()/24) > 10 {
return "", errors.New(fmt.Sprintf("查询间隔时间不允许大于10天！时间范围：[%v] 至 [%v]", fromDate, toDate))
if actID > 0 {
actList, _ := dao.QueryActs(db, actID, 0, math.MaxInt32, 0, "", 0, nil, nil, nil, 0, 0, 0, time.Time{}, time.Time{}, time.Time{}, time.Time{})
if len(actList.Data) > 0 {
orderList, _ = dao.QueryOrders(db, vendorOrderID, actID, vendorIDs, storeID, actList.Data[0].BeginAt, actList.Data[0].EndAt)
} else {
return "", errors.New(fmt.Sprintf("未查询到相关结算活动，活动ID：[%d]", actID))
}
} else {
if fromDate != "" && toDate != "" {
fromDateParam = utils.Str2Time(fromDate)
toDateParam = utils.Str2Time(toDate)
//若未传入活动ID,且时间间隔大于10天则不允许查询
if math.Ceil(toDateParam.Sub(fromDateParam).Hours()/24) > 10 {
return "", errors.New(fmt.Sprintf("查询间隔时间不允许大于10天！时间范围：[%v] 至 [%v]", fromDate, toDate))
}
// orderList, _ := dao.QueryOrders(db, vendorOrderID, vendorIDs, storeID, fromDateParam, toDateParam)
orderList, _ = dao.QueryOrders(db, vendorOrderID, actID, vendorIDs, storeID, fromDateParam, toDateParam)
} else {
return "", errors.New(fmt.Sprintf("若不按活动查询则间隔时间必须完整！时间范围：[%v] 至 [%v]", fromDate, toDate))
}
}
// orderList, _ := dao.QueryOrders(db, vendorOrderID, vendorIDs, storeID, fromDateParam, toDateParam)
orderList, _ := dao.QueryOrders(db, vendorOrderID, actIDs, vendorIDs, storeID, fromDateParam, toDateParam)
if len(orderList) <= 0 {
return "", errors.New(fmt.Sprintf("未查询到订单！,vendorOrderID : %s, 时间范围：[%v] 至 [%v]", vendorOrderID, fromDate, toDate))
return "", errors.New(fmt.Sprintf("未查询到订单！,vendorOrderID : %s, actID : %d, 时间范围：[%v] 至 [%v]", vendorOrderID, actID, fromDate, toDate))
}
task := tasksch.NewParallelTask("刷新历史订单结算价", tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx,
func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {

2
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1169,7 +1169,7 @@ func (c *OrderManager) AmendMissingOrders(ctx *jxcontext.Context, vendorIDs []in
if err = err2; err != nil && !isContinueWhenError {
return "", err
}
localOrders, err2 := dao.QueryOrders(db, "", []int{}, vendorIDs, storeID, fromDate, toDate.Add(24*time.Hour-time.Second))
localOrders, err2 := dao.QueryOrders(db, "", 0, vendorIDs, storeID, fromDate, toDate.Add(24*time.Hour-time.Second))
if err = err2; err != nil {
return "", err
}