This commit is contained in:
邹宗楠
2024-02-22 16:19:21 +08:00
parent b9c56ada98
commit 25c88e1e5a

View File

@@ -1133,6 +1133,7 @@ func (c *OrderManager) GetStoresOrderSaleInfoNew(ctx *jxcontext.Context, storeID
type GetAfsOrdersResult struct { type GetAfsOrdersResult struct {
model.AfsOrder model.AfsOrder
StoreName string `json:"storeName"` StoreName string `json:"storeName"`
OrderSeq int `json:"orderSeq"`
} }
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) { 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) {
@@ -1162,9 +1163,10 @@ func (c *OrderManager) GetAfsOrders(ctx *jxcontext.Context, keyword, afsOrderID,
offset = jxutils.FormalizePageOffset(offset) offset = jxutils.FormalizePageOffset(offset)
sql := ` sql := `
SELECT SQL_CALC_FOUND_ROWS SELECT SQL_CALC_FOUND_ROWS
t1.*, t2.name store_name t1.*, t2.name store_name,g.order_seq order_seq
FROM afs_order t1 FROM afs_order t1
LEFT JOIN store t2 ON t2.id = IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id) LEFT JOIN store t2 ON t2.id = IF(t1.jx_store_id != 0, t1.jx_store_id, t1.store_id)
LEFT JOIN goods_order g ON t1.vendor_order_id = g.vendor_order_id
` `
var ( var (
sqlWhere string sqlWhere string