Merge remote-tracking branch 'origin/mark' into su

business/jxutils/jxutils.go

@@ -12,9 +12,11 @@ import (
 	"strings"
 	"time"
 
+	"git.rosy.net.cn/baseapi"
 	"git.rosy.net.cn/baseapi/platformapi/autonavi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/baseapi/utils/routinepool"
+	"git.rosy.net.cn/jx-callback/business/jxutils/excel"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
@@ -39,6 +41,8 @@ var (
 	}
 )
 
+const fileExt = ".xlsx"
+
 type OrderSkuList []*model.OrderSku
 
 func (l OrderSkuList) Len() int {
@@ -564,6 +568,15 @@ func UploadExportContent(content []byte, key string) (downloadURL string, err er
 	return downloadURL, err
 }
 
+func UploadExeclAndPushMsg(sheetList []*excel.Obj2ExcelSheetConfig, name string) (downloadURL, fileName string, err error) {
+	excelBin := excel.Obj2Excel(sheetList)
+	timeStr := utils.Int64ToStr(time.Now().Unix())
+	fileName = name + timeStr + fileExt
+	baseapi.SugarLogger.Debugf("WriteToExcel:save %s success", fileName)
+	downloadURL, err = UploadExportContent(excelBin, fileName)
+	return downloadURL, fileName, err
+}
+
 func TaskResult2Hint(resultList []interface{}) (hint string) {
 	strList := make([]string, len(resultList))
 	for k, v := range resultList {