bugfix

controllers/calendar/calendar.go

@@ -3,6 +3,7 @@ package calendar
 import (
 	"encoding/json"
 	"errors"
+	"path/filepath"
 	"spaceofcheng/services/controllers"
 	"spaceofcheng/services/models"
 	"spaceofcheng/services/models/model"
@@ -77,14 +78,19 @@ func (c *CalendarController) DownloadImg() {
 	if err != nil {
 		c.ResponseError(err)
 	}
+	customerCalendar, err := c.dao.GetCalendarFrontDetailById(calendarId)
+	if err != nil {
+		c.ResponseError(err)
+	}
 	var files []utils.NetFile
 	var zf string
 	if imgType == "user" {
 		for i := 0; i < len(list); i++ {
 			if list[i].CustomerImg != "" {
+				ext := filepath.Ext(list[i].ImgName)
 				var file = utils.NetFile{
 					URI:  list[i].CustomerImg,
-					Name: list[i].ImgName + ".jpeg",
+					Name: list[i].ImgName + ext,
 				}
 				if file.URI != "" {
 					files = append(files, file)
@@ -93,13 +99,14 @@ func (c *CalendarController) DownloadImg() {
 			}
 
 		}
-		zf = "客户照片.zip"
+		zf = customerCalendar.Email + "照片.zip"
 	} else {
 		for i := 0; i < len(list); i++ {
 			if list[i].CalendarImg != "" {
+				ext := filepath.Ext(list[i].ImgName)
 				var file = utils.NetFile{
 					URI:  list[i].CalendarImg,
-					Name: list[i].ImgName + ".jpeg",
+					Name: list[i].ImgName + ext,
 				}
 				if file.URI != "" {
 					files = append(files, file)
@@ -107,7 +114,7 @@ func (c *CalendarController) DownloadImg() {
 			}
 
 		}
-		zf = "电子台历.zip"
+		zf = customerCalendar.Email + "台历.zip"
 	}
 	if len(files) <= 0 {
 		c.ResponseError(errors.New("图片为空"))