fix:返回兑换活动时更新活动倒计时

@@ -51,18 +51,15 @@ func (cashPoolService *CashPoolService) CreateCashPool(createCashPoolCommand *co
 	if systemSuMoneyStatistics == nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的公司")
 	}
-
 	systemExchangedSuMoney := systemSuMoneyStatistics["systemExchangedSuMoney"].(float64)
 	systemUnExchangeSuMoney := systemSuMoneyStatistics["systemUnExchangeSuMoney"].(float64)
 	systemCashStatistics, err := employeeDao.CalculateSystemCash(createCashPoolCommand.CompanyId)
-
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	if systemCashStatistics == nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的公司")
 	}
-
 	systemExchangedCash := systemCashStatistics["systemExchangedCash"].(float64)
 	systemUnExchangeCash := systemCashStatistics["systemUnExchangeCash"].(float64)
 	var cashPoolRepository domain.CashPoolRepository
@@ -268,12 +265,12 @@ func (cashPoolService *CashPoolService) ListExchangeCashActivity(listExchangeCas
 	} else {
 		exchangeActivityRepository = value
 	}
-
-	// TODO 需要更新兑换活动结束倒计时
-
 	if count, activities, err := exchangeActivityRepository.Find(tool_funs.SimpleStructToMap(listExchangeCashActivityQuery)); err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
+		// TODO 需要更新兑换活动结束倒计时
+
+
 		if err := transactionContext.CommitTransaction(); err != nil {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		}
@@ -347,21 +344,56 @@ func (cashPoolService *CashPoolService) GetExchangeCashActivity(getExchangeCashA
 	} else {
 		exchangeCashActivityRepository = value
 	}
-
-	// TODO 需要更新兑换活动结束倒计时
-
-	activity, err := exchangeCashActivityRepository.FindOne(map[string]interface{}{"exchangeCashActivityId": getExchangeCashActivityQuery.ExchangeCashActivityId})
+	// 需要更新兑换活动结束倒计时
+	activity, err := exchangeCashActivityRepository.FindOne(map[string]interface{}{"activityId": getExchangeCashActivityQuery.ExchangeCashActivityId})
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
 	if activity == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(getExchangeCashActivityQuery.ExchangeCashActivityId)))
+	}
+	var timeNow = time.Now()
+	var deadline = activity.Deadline
+	var t1 = time.Date(timeNow.Year(), timeNow.Month(), timeNow.Day(), 0, 0, 0, 0, time.Local)
+	var t2 = time.Date(deadline.Year(), deadline.Month(), deadline.Day(), 0, 0, 0, 0, time.Local)
+	updateExchangeCashActivity := &command.UpdateExchangeCashActivityCommand {
+		ExchangeCashActivityId: activity.ActivityId,
+		//ExchangeActivityName: activity.ExchangeActivityName,
+		//Deadline: activity.Deadline,
+		CountDown: int64(t2.Sub(t1).Hours() / 24),
+		//ExchangedSuMoney: activity.ExchangedSuMoney,
+		//ExchangedCash: activity.ExchangedCash,
+		//ExchangeRate: activity.Rate,
+	}
+	if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivity)); err != nil {
+		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
+	}
+	activityFound, err := exchangeCashActivityRepository.Save(activity)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	// 返回兑换现金活动
+	if activityFound == nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	} else {
 		if err := transactionContext.CommitTransaction(); err != nil {
 			return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
 		}
-		return activity, nil
+		return activityFound, nil
 	}
+	// 返回兑换现金活动
+	//activityFound, err := exchangeCashActivityRepository.FindOne(map[string]interface{}{"exchangeCashActivityId": getExchangeCashActivityQuery.ExchangeCashActivityId})
+	//if err != nil {
+	//	return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	//}
+	//if activityFound == nil {
+	//	return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(getExchangeCashActivityQuery.ExchangeCashActivityId)))
+	//} else {
+	//	if err := transactionContext.CommitTransaction(); err != nil {
+	//		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	//	}
+	//	return activityFound, nil
+	//}
 }
 
 // 更新兑换现金活动，名称，截止日期、汇率
@@ -379,6 +411,7 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 	defer func() {
 		transactionContext.RollbackTransaction()
 	}()
+	// 更新兑换活动
 	var exchangeCashActivityRepository domain.ExchangeActivityRepository
 	if value, err := factory.CreateExchangeCashActivityRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
@@ -397,7 +430,9 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 	if err := activity.Update(tool_funs.SimpleStructToMap(updateExchangeCashActivityCommand)); err != nil {
 		return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
 	}
+	// 更新兑换活动兑换汇率
 	if updateExchangeCashActivityCommand.ExchangeRate != 0 {
+		// 获取当前现金池
 		var cashPoolRepository domain.CashPoolRepository
 		if value, err  := factory.CreateCashPoolRepository(map[string] interface{} {
 			"transactionContext": transactionContext,
@@ -415,7 +450,7 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 		if cashPools == nil {
 			return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(activity.CompanyId)))
 		}
-		// 修改汇率时判断兑换活动清单中现金总金额是否超过平台未兑换现金值
+		// 判断兑换活动清单中现金总金额是否超过平台未兑换现金值
 		var cashPoolDao *dao.CashPoolDao
 		if value, err := factory.CreateCashPoolDao(map[string]interface{}{
 			"transactionContext": transactionContext,
@@ -429,13 +464,13 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		}
 		if activitySuMoneyStatistics == nil {
-			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的公司")
+			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的企业")
 		}
 		activitySuMoney := activitySuMoneyStatistics["activityExchangedSuMoney"].(float64)
 		if activitySuMoney * updateExchangeCashActivityCommand.ExchangeRate > cashPools[0].UnExchangeCash {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已超过投入现金池的未兑换现金")
 		}
-		// 计算系统平均兑换汇率
+		// 计算系统平均兑换汇率并更新现金池
 		var employeeDao *dao.EmployeeDao
 		if value, err := factory.CreateEmployeeDao(map[string]interface{}{
 			"transactionContext": transactionContext,
@@ -452,7 +487,6 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的公司")
 		}
 		systemExchangedSuMoney := systemSuMoneyStatistics["systemExchangedSuMoney"].(float64)
-		//systemUnExchangeSuMoney := systemSuMoneyStatistics["systemUnExchangeSuMoney"].(float64)
 		systemCashStatistics, err := employeeDao.CalculateSystemCash(activity.CompanyId)
 		if err != nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
@@ -462,14 +496,18 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 		}
 		systemExchangedCash := systemCashStatistics["systemExchangedCash"].(float64)
 		systemUnExchangeCash := systemCashStatistics["systemUnExchangeCash"].(float64)
-		rate, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", systemExchangedCash / systemExchangedSuMoney), 64)   // 平均兑换汇率
-		// 更新现金池
+		// 平均兑换汇率
+		var rate float64
+		if systemExchangedSuMoney == 0 {
+			rate = 0
+		} else {
+			rate, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", systemExchangedCash / systemExchangedSuMoney), 64)
+		}
+		// TODO 更新现金池
 		updateCashPoolCommand := &command.UpdateCashPoolCommand{
 			CashPoolId: cashPools[0].CashPoolId,
-			//ExchangedSuMoney: systemExchangedSuMoney,
 			ExchangedCash: systemExchangedCash,
 			UnExchangeCash: systemUnExchangeCash,
-			//UnExchangeSuMoney: systemUnExchangeSuMoney,
 			Rate: rate,
 		}
 		if err := cashPools[0].Update(tool_funs.SimpleStructToMap(updateCashPoolCommand)); err != nil {
@@ -482,8 +520,7 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashActivity(updateExchang
 		if cashPoolUpdated == nil {
 			return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 		}
-
-		// TODO 更新兑换清单中已兑换现金值
+		// TODO 批量更新兑换清单中已兑换现金值
 
 	}
 
@@ -621,11 +658,37 @@ func (cashPoolService *CashPoolService) CreateExchangeCashPerson(createExchangeC
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(createExchangeCashPersonCommand.ExchangeCashActivityId)))
 	}
 
-	// TODO 判断清单中现金总额超过现金池未兑换现金时创建失败，提示：“已超过投入现金池的未兑换现金”
+	// 判断清单中现金总额超过平台未兑换现金
+	var cashPoolDao *dao.CashPoolDao
+	if value, err := factory.CreateCashPoolDao(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	} else {
+		cashPoolDao = value
+	}
+	activitySuMoneyStatistics, err := cashPoolDao.CalculateActivityExchangedSuMoney(activityFound.CompanyId)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if activitySuMoneyStatistics == nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的企业")
+	}
+	activitySuMoney := activitySuMoneyStatistics["activityExchangedSuMoney"].(float64)
+	var employeeDao *dao.EmployeeDao
+	if value, err := factory.CreateEmployeeDao(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	} else {
+		employeeDao = value
+	}
+	systemCashStatistics, err := employeeDao.CalculateSystemCash(activityFound.CompanyId)
+	if activitySuMoney * updateExchangeCashActivityCommand.ExchangeRate > systemCashStatistics["systemUnExchangeCash"].(float64) {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已超过投入现金池的未兑换现金")
+	}
 
 	// TODO 更新现金池
-	// 获取现金池
-	// 更新现金池
 
 	if err := transactionContext.CommitTransaction(); err != nil {
 		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -721,6 +784,7 @@ func (cashPoolService *CashPoolService) RemoveExchangeCashPerson(removeExchangeC
 	defer func() {
 		transactionContext.RollbackTransaction()
 	}()
+	// 移除兑换素币清单
 	var exchangeCashPersonListRepository domain.ExchangeCashPersonListRepository
 	if value, err := factory.CreateExchangeCashPersonListRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
@@ -736,12 +800,11 @@ func (cashPoolService *CashPoolService) RemoveExchangeCashPerson(removeExchangeC
 	if person == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(removeExchangeCashPersonCommand.ListId)))
 	}
-	// 移除兑换素币清单
 	personDeleted, err := exchangeCashPersonListRepository.Remove(person)
 	if err != nil {
 		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
 	}
-	// 生成素币流水，更新个人素币
+	// 生成素币流水，还原个人素币值
 	var operationSuMoneyService service.OperationSuMoneyService
 	if value, err := factory.CreateOperationSuMoneyService(map[string]interface{}{
 		"transactionContext": transactionContext,
@@ -764,7 +827,7 @@ func (cashPoolService *CashPoolService) RemoveExchangeCashPerson(removeExchangeC
 	if task == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(operationSuMoneyCommand.Uid)))
 	}
-	// 更新兑换活动
+	// 更新兑换活动兑换情况
 	var exchangeCashActivityRepository domain.ExchangeActivityRepository
 	if value, err := factory.CreateExchangeCashActivityRepository(map[string]interface{}{
 		"transactionContext": transactionContext,
@@ -878,8 +941,35 @@ func (cashPoolService *CashPoolService) UpdateExchangeCashPerson(updateExchangeC
 	if activityUpdated == nil {
 		return nil, application.ThrowError(application.RES_NO_FIND_ERROR, fmt.Sprintf("%s", string(updateExchangeCashActivityCommand.ExchangeCashActivityId)))
 	}
-
-	// TODO 判断现金池未兑换现金
+	// 判断是否超过平台未兑换现金
+	var cashPoolDao *dao.CashPoolDao
+	if value, err := factory.CreateCashPoolDao(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	} else {
+		cashPoolDao = value
+	}
+	activitySuMoneyStatistics, err := cashPoolDao.CalculateActivityExchangedSuMoney(activityFound.CompanyId)
+	if err != nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
+	}
+	if activitySuMoneyStatistics == nil {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "无效的企业")
+	}
+	activitySuMoney := activitySuMoneyStatistics["activityExchangedSuMoney"].(float64)
+	var employeeDao *dao.EmployeeDao
+	if value, err := factory.CreateEmployeeDao(map[string]interface{}{
+		"transactionContext": transactionContext,
+	}); err != nil {
+		return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
+	} else {
+		employeeDao = value
+	}
+	systemCashStatistics, err := employeeDao.CalculateSystemCash(activityFound.CompanyId)
+	if activitySuMoney * updateExchangeCashActivityCommand.ExchangeRate > systemCashStatistics["systemUnExchangeCash"].(float64) {
+		return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已超过投入现金池的未兑换现金")
+	}
 
 	// TODO 更新现金池