正在显示
1 个修改的文件
包含
4 行增加
和
2 行删除
| @@ -578,12 +578,14 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas | @@ -578,12 +578,14 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas | ||
| 578 | //endTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 23, 59, 59, 0, currentTime.Location()) | 578 | //endTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 23, 59, 59, 0, currentTime.Location()) |
| 579 | for _, activity := range activities { | 579 | for _, activity := range activities { |
| 580 | if activity.Deadline.UnixNano() / 1e6 >= currentTime.UnixNano() / 1e6 { | 580 | if activity.Deadline.UnixNano() / 1e6 >= currentTime.UnixNano() / 1e6 { |
| 581 | + cash, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", activity.ExchangedCash), 64) | ||
| 582 | + suMoney, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", activity.ExchangedSuMoney), 64) | ||
| 581 | activityWithTs := map[string]interface{} { | 583 | activityWithTs := map[string]interface{} { |
| 582 | "activityId": activity.ActivityId, | 584 | "activityId": activity.ActivityId, |
| 583 | "exchangeActivityName": activity.ExchangeActivityName, | 585 | "exchangeActivityName": activity.ExchangeActivityName, |
| 584 | "companyId": activity.CompanyId, | 586 | "companyId": activity.CompanyId, |
| 585 | - "exchangedCash": activity.ExchangedCash, | ||
| 586 | - "exchangedSuMoney": activity.ExchangedSuMoney, | 587 | + "exchangedCash": cash, |
| 588 | + "exchangedSuMoney": suMoney, | ||
| 587 | "deadline": activity.Deadline.UnixNano() / 1e6, // 秒级时间戳转换 | 589 | "deadline": activity.Deadline.UnixNano() / 1e6, // 秒级时间戳转换 |
| 588 | "countDown": activity.CountDown, | 590 | "countDown": activity.CountDown, |
| 589 | "rate": activity.Rate, | 591 | "rate": activity.Rate, |
-
请 注册 或 登录 后发表评论