Przeglądaj źródła

Merge branch 'dev'

xiongzhu 4 lat temu
rodzic
commit
07be6a5517

+ 4 - 1
src/main/java/com/izouma/nineth/service/UserBalanceService.java

@@ -191,7 +191,10 @@ public class UserBalanceService {
                 "upload/" + DateTimeUtils.format(LocalDateTime.now(), "yyyyMMddHHmm") + "_" + RandomStringUtils.randomNumeric(8) + ".zip");
 
         ExportWithdraw exportWithdraw = exportWithdrawRepo.save(new ExportWithdraw(url, remark));
-        for (UserBalance userBalance : balanceList) {
+        for (UserWithdraw withdraw : withdrawList) {
+            UserBalance userBalance = balanceList.stream()
+                    .filter(i -> i.getUserId().equals(withdraw.getUserId()))
+                    .findFirst().get();
             BigDecimal amount = userBalance.getBalance();
             userBalance.setLastBalance(userBalance.getBalance());
             userBalance.setBalance(BigDecimal.ZERO);