fix:导入

@@ -1884,9 +1884,22 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
 					continue
 				}
 
+				//// 判断是否超过平台未兑换现金
+				//if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
+				//	if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
+				//		row := []interface{}{
+				//			createExchangeCashPersonCommand.PersonName,
+				//			createExchangeCashPersonCommand.PersonAccount,
+				//			createExchangeCashPersonCommand.ExchangedSuMoney,
+				//			"已超过现金池未兑换现金",
+				//		}
+				//		failureDataList = append(failureDataList, row)
+				//		continue
+				//	}
+				//}
+
 				// 判断是否超过平台未兑换现金
-				if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
-					if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
+				if createExchangeCashPersonCommand.ExchangedSuMoney * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
 					row := []interface{}{
 						createExchangeCashPersonCommand.PersonName,
 						createExchangeCashPersonCommand.PersonAccount,
@@ -1896,7 +1909,6 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
 					failureDataList = append(failureDataList, row)
 					continue
 				}
-				}
 
 				// 获取平台素币兑换情况
 				systemSuMoneyStatistics, err := employeeDao.CalculateSystemSuMoney(activityFound.CompanyId)
@@ -2085,9 +2097,22 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
 				continue
 			}
 
+			//// 判断是否超过平台未兑换现金
+			//if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
+			//	if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
+			//		row := []interface{}{
+			//			createExchangeCashPersonCommand.PersonName,
+			//			createExchangeCashPersonCommand.PersonAccount,
+			//			createExchangeCashPersonCommand.ExchangedSuMoney,
+			//			"已超过现金池未兑换现金",
+			//		}
+			//		failureDataList = append(failureDataList, row)
+			//		continue
+			//	}
+			//}
+
 			// 判断是否超过平台未兑换现金
-			if activityUpdated.ExchangedSuMoney > activityFoundExchangedSuMoney {
-				if (activityUpdated.ExchangedSuMoney - activityFoundExchangedSuMoney) * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
+			if createExchangeCashPersonCommand.ExchangedSuMoney * activityUpdated.Rate > cashPoolFoundUnExchangeCash {
 				row := []interface{}{
 					createExchangeCashPersonCommand.PersonName,
 					createExchangeCashPersonCommand.PersonAccount,
@@ -2096,7 +2121,7 @@ func (cashPoolService *CashPoolService) ImportCreateExchangeCashPerson(createExc
 				}
 				failureDataList = append(failureDataList, row)
 				continue
-				}
+				//return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "已超过投入现金池的未兑换现金")
 			}
 
 			// 获取平台素币兑换情况