1

business/jxcallback/orderman/orderman_ext.go

@@ -443,7 +443,7 @@ type AfsOrderExt struct {
 	ShopPrice int64 `json:"shopPrice"`
 }
 
-func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, mapParams map[string]interface{}) (hint string, err error) {
+func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateStr string, mapParams map[string]interface{}, isAsync bool) (hint string, err error) {
 	var (
 		orders    []*model.GoodsOrderExt
 		afsSkuMap map[string]map[int]*model.OrderSkuFinancial
@@ -638,11 +638,23 @@ func (c *OrderManager) ExportOrders(ctx *jxcontext.Context, fromDateStr, toDateS
 				if err = err2; err == nil {
 					task.SetNoticeMsg(excelURL)
 				}
+				return excelURL, nil
 			}
 			return nil, err
 		}, 5)
 	tasksch.ManageTask(task).Run()
-	hint = task.GetID()
+	if !isAsync {
+		resultList, err2 := task.GetResult(0)
+		if err = err2; err == nil {
+			if len(resultList) == 0 {
+				hint = "1" // todo 暂时这样
+			} else {
+				hint = jxutils.TaskResult2Hint(resultList)
+			}
+		}
+	} else {
+		hint = task.GetID()
+	}
 	return hint, err
 }