|
|
@@ -97,14 +97,14 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
|
|
|
}
|
|
|
}
|
|
|
record.setPayMethod(a.toString());
|
|
|
- if (record.getPayoutAmount() == null) {
|
|
|
- record.setPayoutAmount("0");
|
|
|
- }
|
|
|
- double applyAmount = Double.parseDouble(record.getApplyAmount());
|
|
|
- double payoutAmount = Double.parseDouble(record.getPayoutAmount());
|
|
|
- if (applyAmount == payoutAmount) {
|
|
|
- record.setTransferFlag("0");
|
|
|
- }
|
|
|
+// if (record.getPayoutAmount() == null) {
|
|
|
+// record.setPayoutAmount("0");
|
|
|
+// }
|
|
|
+// double applyAmount = Double.parseDouble(record.getApplyAmount());
|
|
|
+// double payoutAmount = Double.parseDouble(record.getPayoutAmount());
|
|
|
+// if (applyAmount == payoutAmount) {
|
|
|
+// record.setTransferFlag("0");
|
|
|
+// }
|
|
|
}
|
|
|
invAccountExcelIPage.setRecords(records);
|
|
|
return HttpResult.ok("", invAccountExcelIPage);
|
|
|
@@ -138,8 +138,8 @@ public class InvAccountExcelServiceImpl extends ServiceImpl<InvAccountExcelMappe
|
|
|
InvAccountCard enterAccountCard = invAccountCardService.getById(invAccountExcel.getEnterCardNum());
|
|
|
InvAccount outAccount = insAccountService.getById(outAccountCard.getAccountId());
|
|
|
InvAccount enterAccount = insAccountService.getById(enterAccountCard.getAccountId());
|
|
|
- Double applyAmount = Double.parseDouble(invAccountExcel.getApplyAmount());
|
|
|
- Double payoutAmount1 = Double.parseDouble(invAccountExcel.getPayoutAmount());
|
|
|
+ double applyAmount = Double.parseDouble(invAccountExcel.getApplyAmount());
|
|
|
+ double payoutAmount1 = Double.parseDouble(invAccountExcel.getPayoutAmount());
|
|
|
|
|
|
//判断是转账给内部还是外部
|
|
|
if (invAccountExcel.getOutFlag().equals("0")) {
|