合并分支 'dev' 到 'test'

Dev



查看合并请求 !24

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"fmt"
 	"github.com/linmadan/egglib-go/core/application"
 	"github.com/linmadan/egglib-go/core/application"
 	"strconv"
 	"strconv"
+	"time"
 
 
 	"github.com/astaxie/beego/logs"
 	"github.com/astaxie/beego/logs"
 
 
@@ -961,6 +962,8 @@ func (service OrderInfoService) ListOrderForExcel(listOrderQuery query.ListOrder
 	}
 	}
 	var resultMaps []map[string]string
 	var resultMaps []map[string]string
 	for i := range ordersData {
 	for i := range ordersData {
+		t, _ := time.ParseInLocation("2006-01-02 15:04:05", ordersData[i].SaleDate, time.Local)
+		fmt.Print(t, "\n")
 		m := map[string]string{
 		m := map[string]string{
 			//"num":               fmt.Sprint(i + 1),
 			//"num":               fmt.Sprint(i + 1),
 			//"order_code":        ordersData[i].OrderCode,
 			//"order_code":        ordersData[i].OrderCode,
@@ -982,7 +985,7 @@ func (service OrderInfoService) ListOrderForExcel(listOrderQuery query.ListOrder
 			"partner":         ordersData[i].PartnerName,
 			"partner":         ordersData[i].PartnerName,
 			"update_time":     ordersData[i].UpdateTime,
 			"update_time":     ordersData[i].UpdateTime,
 			"create_time":     ordersData[i].CreateTime,
 			"create_time":     ordersData[i].CreateTime,
-			"saleDate":        ordersData[i].SaleDate,
+			"saleDate":        t.Format("2006-01-02"),
 			"orderNum":        fmt.Sprint(ordersData[i].PlanOrderCount),
 			"orderNum":        fmt.Sprint(ordersData[i].PlanOrderCount),
 			"quantityControl": "",
 			"quantityControl": "",
 			"orderDist":       fmt.Sprint(ordersData[i].RegionName),
 			"orderDist":       fmt.Sprint(ordersData[i].RegionName),

@@ -751,7 +751,7 @@ func (c *OrderInfoController) DownloadTemplate() {
 	}
 	}
 
 
 	// 获取导入模板
 	// 获取导入模板
-	req := httplib.Get("http://suplus-file-dev.fjmaimaimai.com/upload/file/2021010803305336443.xlsx")
+	req := httplib.Get("http://suplus-file-dev.fjmaimaimai.com/upload/file/2021020111293523855.xlsx")
 	err = req.ToFile(constant.IMPORT_EXCEL)
 	err = req.ToFile(constant.IMPORT_EXCEL)
 	if err != nil {
 	if err != nil {
 		logs.Error("could not save to file: ", err)
 		logs.Error("could not save to file: ", err)