linmadan / mmm-worth · 提交

转到一个项目

作者 陈志颖
提交 870e52c95a6a1a5941be882225a8e57fd91a0ef7 1 个父辈 967dffba

fix:修复返回兑换活动截止时间格式问题

内嵌 并排对比
正在显示 1 个修改的文件 包含 4 行增加 和 1 行删除
@@ -257,7 +257,8 @@ func (cashPoolService *CashPoolService) CreateExchangeCashActivity(createExchang @@ -257,7 +257,8 @@ func (cashPoolService *CashPoolService) CreateExchangeCashActivity(createExchang
257 CompanyId: createExchangeCashActivityCommand.CompanyId, 257 CompanyId: createExchangeCashActivityCommand.CompanyId,
258 ExchangedCash: 0, 258 ExchangedCash: 0,
259 ExchangedSuMoney: 0, 259 ExchangedSuMoney: 0,
260 - Deadline: time.Date(deadline.Year(), deadline.Month(), deadline.Day(), deadline.Hour(), deadline.Minute(), deadline.Second(), 0, time.Local), 260 + //Deadline: time.Date(deadline.Year(), deadline.Month(), deadline.Day(), deadline.Hour(), deadline.Minute(), deadline.Second(), 0, time.Local),
  261 + Deadline: createExchangeCashActivityCommand.Deadline,
261 CountDown: int64(t2.Sub(t1).Hours() / 24), // 计算活动截止倒计时 262 CountDown: int64(t2.Sub(t1).Hours() / 24), // 计算活动截止倒计时
262 Rate: createExchangeCashActivityCommand.ExchangeRate, 263 Rate: createExchangeCashActivityCommand.ExchangeRate,
263 CreateTime: time.Now(), 264 CreateTime: time.Now(),
@@ -368,6 +369,7 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas @@ -368,6 +369,7 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas
368 updateExchangeCashActivity := &command.UpdateExchangeCashActivityCommand { 369 updateExchangeCashActivity := &command.UpdateExchangeCashActivityCommand {
369 ExchangeCashActivityId: activity.ActivityId, 370 ExchangeCashActivityId: activity.ActivityId,
370 CountDown: int64(t2.Sub(t1).Hours() / 24), 371 CountDown: int64(t2.Sub(t1).Hours() / 24),
  372 + Deadline: activity.Deadline,
371 } 373 }
372 374
373 if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil { 375 if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil {
@@ -476,6 +478,7 @@ func (cashPoolService *CashPoolService) GetExchangeCashActivity(getExchangeCashA @@ -476,6 +478,7 @@ func (cashPoolService *CashPoolService) GetExchangeCashActivity(getExchangeCashA
476 updateExchangeCashActivity := &command.UpdateExchangeCashActivityCommand { 478 updateExchangeCashActivity := &command.UpdateExchangeCashActivityCommand {
477 ExchangeCashActivityId: activity.ActivityId, 479 ExchangeCashActivityId: activity.ActivityId,
478 CountDown: int64(t2.Sub(t1).Hours() / 24), 480 CountDown: int64(t2.Sub(t1).Hours() / 24),
  481 + Deadline: activity.Deadline,
479 } 482 }
480 483
481 if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil { 484 if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil {