diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 5459df8dd..a0d9652f4 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -310,7 +310,9 @@ func (c *OrderManager) ExportMTWaybills(ctx *jxcontext.Context, fromDateStr, toD } func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fromDateStr, toDateStr string, isDateFinish bool, skuIDs []int, isJxFirst bool, params map[string]interface{}, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { - globals.SugarLogger.Debugf("GetOrders from:%s to:%s", fromDateStr, toDateStr) + var ( + db = dao.GetDB() + ) //权限 if permission.IsRoled(ctx) { if storeIDsMap, err := permission.GetUserStoresResultMap(ctx.GetUserID()); err == nil { @@ -337,12 +339,35 @@ func (c *OrderManager) GetOrders(ctx *jxcontext.Context, isIncludeFake bool, fro } } } - orders, totalCount, err := dao.GetOrders(dao.GetDB(), nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize) + orders, totalCount, err := dao.GetOrders(db, nil, false, isIncludeFake, fromDateStr, toDateStr, isDateFinish, skuIDs, isJxFirst, "", params, offset, pageSize) if err == nil { pagedInfo = &model.PagedInfo{ TotalCount: totalCount, Data: orders, } + //if len(orders) > 0 { + // task := tasksch.NewParallelTask("RefreshOrderFinancial", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, + // func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + // order := batchItemList[0].(*model.GoodsOrderExt) + // afsOrders, _ := dao.GetAfsOrders(db, order.VendorID, order.VendorOrderID, "") + // //tempTotalShopMoney := order.TotalShopMoney + // for _, v := range afsOrders { + // if v.Status == model.AfsOrderStatusFinished { + // //报价的,平台结算重算后,预计收益要减去那个商品的报价 + // //扣点的只用重算平台结算再算预计收益 + // if order.EarningType == model.EarningTypeQuote { + // //tempTotalShopMoney + // } else { + // + // } + // } + // } + // return nil, err + // }, orders) + // tasksch.HandleTask(task, nil, true).Run() + // task.GetResult(0) + //} + //pagedInfo.Data = orders } return pagedInfo, err }