liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
gazebo
2019-11-26 16:17:14 +08:00
parent 2d1bfa4c1e 2c4fce2956
commit ca3b8a8907
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
business/jxstore/yonghui/yonghui.go
View File

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