1.资金转存修改

applications/money/money-server/src/main/java/com/usoftchina/saas/money/service/impl/FundtransferServiceImpl.java

@@ -132,6 +132,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
         while (isList.hasNext()){
             Fundtransferdetail fundtransferdetail = (Fundtransferdetail) isList.next();
             Double amount = fundtransferdetail.getFtd_nowbalance();
+            Double inamount = fundtransferdetail.getFtd_innowbalance();
             //收款
             Banksubledger banksubledger = new Banksubledger();
             banksubledger.setCompanyId(BaseContextHolder.getCompanyId());
@@ -143,7 +144,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 
             banksubledger.setBl_kind("资金转账");
             banksubledger.setBl_date(fundtransfer.getFt_date());
-            banksubledger.setBl_income(fundtransferdetail.getFtd_nowbalance());
+            banksubledger.setBl_income(inamount);
             banksubledger.setBl_remark(fundtransferdetail.getFtd_remark());
             banksubledgerMapper.insertSelective(banksubledger);
 
@@ -157,7 +158,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             banksubledger1.setBl_code(fundtransfer.getFt_code());
             banksubledger1.setBl_kind("资金转账");
             banksubledger1.setBl_date(fundtransfer.getFt_date());
-            banksubledger1.setBl_spending(fundtransferdetail.getFtd_nowbalance());
+            banksubledger1.setBl_spending(amount);
             banksubledger1.setBl_remark(fundtransferdetail.getFtd_remark());
             banksubledgerMapper.insertSelective(banksubledger1);
 
@@ -165,7 +166,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             int bk_id = fundtransferdetail.getFtd_bankid();
             int bk_inid = fundtransferdetail.getFtd_inbankid();
 
-            Double bk_amount = fundtransferdetail.getFtd_nowbalance();
+//            Double bk_amount = fundtransferdetail.getFtd_nowbalance();
             //付款方
             Bankinformation bankinformation = bankinformationMapper.selectByPrimaryKey(bk_id);
             Double beginamount = bankinformation.getBk_beginamount() == null ? new Double(0) : bankinformation.getBk_beginamount();
@@ -175,9 +176,9 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             Double spending = bankinformation.getBk_spending() == null ? new Double(0) : bankinformation.getBk_spending();
             Double incomme = bankinformation.getBk_income() == null ? new Double(0) : bankinformation.getBk_income();
             Bankinformation newbankinformation = new Bankinformation();
-            newbankinformation.setBk_thisamount(beginamount + incomme - (spending + bk_amount));
+            newbankinformation.setBk_thisamount(beginamount + incomme - (spending + amount));
             newbankinformation.setBk_income(incomme);
-            newbankinformation.setBk_spending(spending + bk_amount);
+            newbankinformation.setBk_spending(spending + amount);
             newbankinformation.setId(bankinformation.getId());
             newbankinformation.setCompanyId(BaseContextHolder.getCompanyId());
             bankinformationMapper.updateByPrimaryKeySelective(newbankinformation);
@@ -188,8 +189,8 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             Double inspending = inbankinformation.getBk_spending() == null ? new Double(0) : inbankinformation.getBk_spending();
             Double inincomme = inbankinformation.getBk_income() == null ? new Double(0) : inbankinformation.getBk_income();
             Bankinformation newinbankinformation = new Bankinformation();
-            newinbankinformation.setBk_thisamount(inbeginamount + (inincomme + bk_amount) - inspending );
-            newinbankinformation.setBk_income(inincomme + bk_amount);
+            newinbankinformation.setBk_thisamount(inbeginamount + (inincomme + inamount) - inspending );
+            newinbankinformation.setBk_income(inincomme + inamount);
             newinbankinformation.setBk_spending(inspending);
             newinbankinformation.setId(inbankinformation.getId());
             newinbankinformation.setCompanyId(BaseContextHolder.getCompanyId());
@@ -420,9 +421,16 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
 //                banksubledger.setBl_asstype(null);
 //            }
             banksubledger.setBl_assid(0);
-            banksubledger.setBl_spending(fundtransferdetail.getFtd_nowbalance());
             banksubledger.setBl_remark(fundtransferdetail.getFtd_remark());
-            banksubledger.setBl_orderamount(fundtransferdetail.getFtd_nowbalance() * -1);
+
+            //判断转入转出
+            if(fundtransferdetail.getFtd_bankname().equals(banksubledger.getBl_bankname())){
+                banksubledger.setBl_spending(fundtransferdetail.getFtd_nowbalance());
+                banksubledger.setBl_orderamount(fundtransferdetail.getFtd_nowbalance() * -1);
+            }else {
+                banksubledger.setBl_spending(fundtransferdetail.getFtd_innowbalance());
+                banksubledger.setBl_orderamount(fundtransferdetail.getFtd_innowbalance() * -1);
+            }
             if (banksubledgerMapper.selectCode(banksubledger.getBl_code(), BaseContextHolder.getCompanyId()) == null){
                 banksubledgerMapper.insertSelective(banksubledger);
             }else {