fix:修改创建活动截止日期

@@ -10,7 +10,7 @@ import (
 type CreateExchangeCashActivityCommand struct {
 type CreateExchangeCashActivityCommand struct {
 	CompanyId int64                                     `json:"companyId" valid:"Required"` // 公司id
 	CompanyId int64                                     `json:"companyId" valid:"Required"` // 公司id
 	ExchangeActivityName string                         `json:"exchangeActivityName"`       // 活动名称
 	ExchangeActivityName string                         `json:"exchangeActivityName"`       // 活动名称
-	Deadline string                                  `json:"deadline"`                   // 活动截止时间
+	Deadline time.Time                                  `json:"deadline"`                   // 活动截止时间
 	ExchangeRate float64                                `json:"exchangeRate"`               // 兑换汇率
 	ExchangeRate float64                                `json:"exchangeRate"`               // 兑换汇率
 	CreateTime time.Time 								`json:"createTime"`					// 创建时间
 	CreateTime time.Time 								`json:"createTime"`					// 创建时间
 }
 }

@@ -320,11 +320,11 @@ func (cashPoolService *CashPoolService) CreateExchangeCashActivity(createExchang
 	// 时间格式化
 	// 时间格式化
 	//dd, _ := time.ParseDuration("24h")
 	//dd, _ := time.ParseDuration("24h")
 	//var deadline = createExchangeCashActivityCommand.Deadline.Add(dd)
 	//var deadline = createExchangeCashActivityCommand.Deadline.Add(dd)
-	//var deadline = createExchangeCashActivityCommand.Deadline
-	deadline, _ := time.ParseInLocation("2006-01-02", createExchangeCashActivityCommand.Deadline, time.Local)
+	deadline := createExchangeCashActivityCommand.Deadline
+	//deadline, _ := time.ParseInLocation("2006-01-02", createExchangeCashActivityCommand.Deadline, time.Local)
 	//deadline := todayZero.Add(dd)
 	//deadline := todayZero.Add(dd)
-	var t1 = time.Now().Local()
-	var t2 = time.Date(deadline.Year(), deadline.Month(), deadline.Day(), 23, 59, 59, 0, time.Local)
+	t1 := time.Now().Local()
+	t2 := time.Date(deadline.Year(), deadline.Month(), deadline.Day(), 23, 59, 59, 0, time.Local)
 
 
 
 
 	// 获取该公司所有兑换现金活动
 	// 获取该公司所有兑换现金活动
@@ -335,7 +335,8 @@ func (cashPoolService *CashPoolService) CreateExchangeCashActivity(createExchang
 	} else {
 	} else {
 		for _, activity := range activities {
 		for _, activity := range activities {
 			//if t2.Format("2006-01-02") == activity.Deadline.UTC().Format("2006-01-02") {
 			//if t2.Format("2006-01-02") == activity.Deadline.UTC().Format("2006-01-02") {
-			if t2.Format("2006-01-02") == activity.Deadline.Local().Format("2006-01-02") {
+			//if t2.Format("2006-01-02") == activity.Deadline.Local().Format("2006-01-02") {
+			if t2.Before(activity.Deadline.Local()) || t2.Equal(activity.Deadline.Local()) {
 				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "兑换活动截止时间不能重合")
 				return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "兑换活动截止时间不能重合")
 			}
 			}
 		}
 		}

@@ -520,6 +520,7 @@ func (controller *SuMoneyController) ImportExchangeList () {
 	return
 	return
 }
 }
 
 
+// 下载日志
 func (controller *SuMoneyController) LogFile() {
 func (controller *SuMoneyController) LogFile() {
 	controller.Ctx.Output.Download("logs/app.log","app.log")
 	controller.Ctx.Output.Download("logs/app.log","app.log")
 }
 }