diff --git a/business/jxcallback/orderman/orderman_ext.go b/business/jxcallback/orderman/orderman_ext.go index 1dd7992d0..5459df8dd 100644 --- a/business/jxcallback/orderman/orderman_ext.go +++ b/business/jxcallback/orderman/orderman_ext.go @@ -928,7 +928,7 @@ type GetAfsOrdersResult struct { StoreName string `json:"storeName"` } -func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID, vendorOrderID string, vendorIDList, appealTypeList, storeIDList, statusList, skuIDs []int, fromTime, toTime time.Time, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { +func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID, vendorOrderID string, vendorIDList, appealTypeList, storeIDList, statusList, skuIDs []int, fromTime, toTime time.Time, isDetail bool, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { globals.SugarLogger.Debugf("GetAfsOrders") //权限 if permission.IsRoled(ctx) { @@ -1055,8 +1055,17 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID, if err = dao.GetRowsTx(txDB, &orders, sql, sqlParams...); err == nil { pagedInfo = &model.PagedInfo{ TotalCount: dao.GetLastTotalRowCount2(db, txDB), - Data: orders, + //Data: orders, } + if isDetail { + for _, v := range orders { + skus, _ := dao.GetAfsOrderSkuInfo(db, v.VendorOrderID, v.AfsOrderID, v.VendorID, false) + for _, vv := range skus { + v.Skus = append(v.Skus, &vv.OrderSkuFinancial) + } + } + } + pagedInfo.Data = orders dao.Commit(db, txDB) } return pagedInfo, err diff --git a/controllers/jx_order.go b/controllers/jx_order.go index d318042bd..7a92ae73e 100644 --- a/controllers/jx_order.go +++ b/controllers/jx_order.go @@ -372,7 +372,7 @@ func (c *OrderController) GetAfsOrders() { params.StoreIDs, &storeIDList, params.Statuss, &statusList, params.SkuIDs, &skuIDs); err == nil { retVal, err = orderman.FixedOrderManager.GetAfsOrders(params.Ctx, params.Keyword, params.AfsOrderID, params.VendorOrderID, vendorIDList, appealTypeList, storeIDList, statusList, skuIDs, timeList[0], timeList[1], - params.Offset, params.PageSize) + params.IsDetail, params.Offset, params.PageSize) } } return retVal, "", err