Merge branch 'mark' of e.coding.net:rosydev/jx-callback into mark

business/jxstore/yonghui/yonghui.go

@@ -85,6 +85,11 @@ type OrderList struct {
 	OrderNo int64  `json:"orderNo"`
 }
 
+type WeimobOrderSkusExcelResult struct {
+	DownloadUrlFine  string `json:"downloadUrlFine,omitempty"`
+	DownloadUrlHairy string `json:"downloadUrlHairy,omitempty"`
+}
+
 var (
 	sheetMap = map[string]*SheetParam{
 		"蔬菜": &SheetParam{
@@ -898,7 +903,7 @@ func ContainsKeyword(v *weimobapi.OrderInfo, keyword string) bool {
 	return strings.Contains(v.ReceiverName, keyword) || strings.Contains(utils.Int64ToStr(v.OrderNo), keyword) || strings.Contains(v.ReceiverMobile, keyword)
 }
 
-func GetWeimobOrdersExcel(ctx *jxcontext.Context, OrderNo string) (result []string, err error) {
+func GetWeimobOrdersExcel(ctx *jxcontext.Context, OrderNo string) (result *WeimobOrderSkusExcelResult, err error) {
 	var (
 		DataFineList  []*Data //精品
 		DataHairyList []*Data //毛菜
@@ -934,11 +939,9 @@ func GetWeimobOrdersExcel(ctx *jxcontext.Context, OrderNo string) (result []stri
 		return result, errors.New(fmt.Sprintf("此订单中无商品信息，请检查！订单号：[%v]", OrderNo))
 	}
 	downloadURL1, downloadURL2, err := WriteToExcel2(ctx, DataFineList, DataHairyList)
-	if downloadURL1 != "" {
-		result = append(result, downloadURL1)
-	}
-	if downloadURL2 != "" {
-		result = append(result, downloadURL2)
+	result = &WeimobOrderSkusExcelResult{
+		DownloadUrlFine: downloadURL1,
+		DownloadUrlHairy: downloadURL2,
 	}
 	return result, err
 }