|
...
|
...
|
@@ -578,12 +578,14 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas |
|
|
|
//endTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 23, 59, 59, 0, currentTime.Location())
|
|
|
|
for _, activity := range activities {
|
|
|
|
if activity.Deadline.UnixNano() / 1e6 >= currentTime.UnixNano() / 1e6 {
|
|
|
|
cash, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", activity.ExchangedCash), 64)
|
|
|
|
suMoney, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", activity.ExchangedSuMoney), 64)
|
|
|
|
activityWithTs := map[string]interface{} {
|
|
|
|
"activityId": activity.ActivityId,
|
|
|
|
"exchangeActivityName": activity.ExchangeActivityName,
|
|
|
|
"companyId": activity.CompanyId,
|
|
|
|
"exchangedCash": activity.ExchangedCash,
|
|
|
|
"exchangedSuMoney": activity.ExchangedSuMoney,
|
|
|
|
"exchangedCash": cash,
|
|
|
|
"exchangedSuMoney": suMoney,
|
|
|
|
"deadline": activity.Deadline.UnixNano() / 1e6, // 秒级时间戳转换
|
|
|
|
"countDown": activity.CountDown,
|
|
|
|
"rate": activity.Rate,
|
...
|
...
|
|
