1.资金账户中间表添加条件companyid

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/BanksubledgerMapper.java

@@ -19,7 +19,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
 //    Long insert(Banksubledger record);
 
     int insertSelective(Banksubledger record);
-    List<String> selectCode(String code);
+    List<String> selectCode(@Param("code") String code, @Param("companyid") Long companyid);
 
     Banksubledger selectByPrimaryKey(Integer bl_id);
 
@@ -28,6 +28,6 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
     int updateByPrimaryKey(Banksubledger record);
 
     int updateBankcode(@Param("bk_thisamount") Double bk_thisamount, @Param("nowbalance") Double nowbalance,
-                       @Param("bankcode") String bankcode, @Param("symbol") String symbol);
-    Double selectThisamount(String bankcode);
+                       @Param("bankcode") String bankcode, @Param("symbol") String symbol, @Param("companyId") Long companyId);
+    Double selectThisamount(String bankcode, @Param("companyId") Long companyId);
 }

applications/document/document-server/src/main/resources/mapper/BanksubledgerMapper.xml

@@ -348,18 +348,18 @@
     <select id="selectCode" parameterType="java.lang.String" resultType="java.lang.String">
         select bl_code
         from banksubledger
-        where bl_code = #{bl_code,jdbcType=VARCHAR}
+        where bl_code = #{bl_code,jdbcType=VARCHAR} and companyId = #{companyid}
     </select>
 
     <update id="updateBankcode">
     update bankinformation
     set bk_thisamount = (IFNULL(#{bk_thisamount,jdbcType=DOUBLE},0) ${symbol} #{nowbalance})
-    where bk_bankcode = #{bankcode,jdbcType=VARCHAR}
+    where bk_bankcode = #{bankcode,jdbcType=VARCHAR} and companyId = #{companyId}
   </update>
 
     <select id="selectThisamount" resultType="java.lang.Double" parameterType="java.lang.String">
    select bk_thisamount from bankinformation
-    where bk_bankcode = #{bankcode,jdbcType=VARCHAR}
+    where bk_bankcode = #{bankcode,jdbcType=VARCHAR} and companyId = #{companyId}
   </select>
 
 </mapper>

applications/money/money-server/src/main/java/com/usoftchina/saas/money/mapper/BanksubledgerMapper.java

@@ -22,7 +22,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
 //    Long insert(Banksubledger record);
 
     int insertSelective(Banksubledger record);
-    List<String> selectCode(String code);
+    List<String> selectCode(@Param("code") String code, @Param("companyid") Long companyid);
 
     List<Banksubledger> selectByExample(BanksubledgerExample example);
 
@@ -37,7 +37,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
     int updateByPrimaryKey(Banksubledger record);
 
     int updateBankcode(@Param("bk_thisamount") Double bk_thisamount, @Param("nowbalance") Double nowbalance,
-                       @Param("bankcode") String bankcode, @Param("symbol") String symbol);
+                       @Param("bankcode") String bankcode, @Param("symbol") String symbol, @Param("companyId") Long companyId);
     Double selectThisamount(@Param("bankcode") String bankcode, @Param("companyId") Long companyId);
 
 

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

@@ -220,9 +220,9 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             Double amount = banksubledgerMapper.selectThisamount(fundtransferdetail.getFtd_bankcode(), BaseContextHolder.getCompanyId());
             Double inamount = banksubledgerMapper.selectThisamount(fundtransferdetail.getFtd_inbankcode(), BaseContextHolder.getCompanyId());
             banksubledgerMapper.updateBankcode(amount, fundtransferdetail.getFtd_nowbalance(),
-                    fundtransferdetail.getFtd_bankcode(), "+");
+                    fundtransferdetail.getFtd_bankcode(), "+", BaseContextHolder.getCompanyId());
             banksubledgerMapper.updateBankcode(inamount, fundtransferdetail.getFtd_nowbalance(),
-                    fundtransferdetail.getFtd_bankcode(), "-");
+                    fundtransferdetail.getFtd_bankcode(), "-", BaseContextHolder.getCompanyId());
 
             //资金账号表
             int bk_id = fundtransferdetail.getFtd_bankid();
@@ -418,7 +418,7 @@ public class FundtransferServiceImpl extends CommonBaseServiceImpl<FundtransferM
             banksubledger.setBl_spending(fundtransferdetail.getFtd_nowbalance());
             banksubledger.setBl_remark(fundtransferdetail.getFtd_remark());
             banksubledger.setBl_orderamount(fundtransferdetail.getFtd_nowbalance() * -1);
-            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
+            if (banksubledgerMapper.selectCode(banksubledger.getBl_code(), BaseContextHolder.getCompanyId()) == null){
                 banksubledgerMapper.insertSelective(banksubledger);
             }else {
                 banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);

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

@@ -127,7 +127,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         while (isList.hasNext()){
             Othreceiptsdetail othreceiptsdetail = (Othreceiptsdetail) isList.next();
             banksubledgerMapper.updateBankcode(amount, othreceiptsdetail.getOrd_nowbalance(),
-                    othreceipts.getOr_bankcode(), "+");
+                    othreceipts.getOr_bankcode(), "+", companyId);
 
         }
 
@@ -226,7 +226,7 @@ public class OthreceiptsServiceImpl extends CommonBaseServiceImpl<OthreceiptsMap
         while (isList.hasNext()){
             Othreceiptsdetail othreceiptsdetail = (Othreceiptsdetail) isList.next();
             banksubledgerMapper.updateBankcode(amount, othreceiptsdetail.getOrd_nowbalance(),
-                    othreceipts.getOr_bankcode(), "-");
+                    othreceipts.getOr_bankcode(), "-", BaseContextHolder.getCompanyId());
         }
 
         //资金账号表

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

@@ -167,7 +167,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         while (isList.hasNext()){
             Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isList.next();
             banksubledgerMapper.updateBankcode(amount, othspendingsdetail.getOsd_nowbalance(),
-                    othspendings.getOs_bankcode(), "+");
+                    othspendings.getOs_bankcode(), "+", BaseContextHolder.getCompanyId());
         }
 
         //资金账号表
@@ -261,7 +261,7 @@ public class OthspendingsServiceImpl extends CommonBaseServiceImpl<OthspendingsM
         while (isList.hasNext()){
             Othspendingsdetail othspendingsdetail = (Othspendingsdetail) isList.next();
             banksubledgerMapper.updateBankcode(amount, othspendingsdetail.getOsd_nowbalance(),
-                    othspendings.getOs_bankcode(), "-");
+                    othspendings.getOs_bankcode(), "-", BaseContextHolder.getCompanyId());
         }
 
         //资金账号表

applications/money/money-server/src/main/resources/mapper/BanksubledgerMapper.xml

@@ -434,13 +434,13 @@
     <select id="selectCode" parameterType="java.lang.String" resultType="java.lang.String">
         select bl_code
         from banksubledger
-        where bl_code = #{bl_code,jdbcType=VARCHAR}
+        where bl_code = #{bl_code,jdbcType=VARCHAR} and companyId = #{companyid}
     </select>
 
     <update id="updateBankcode">
     update bankinformation
     set bk_thisamount = (IFNULL(#{bk_thisamount,jdbcType=DOUBLE},0) ${symbol} #{nowbalance})
-    where bk_bankcode = #{bankcode,jdbcType=VARCHAR}
+    where bk_bankcode = #{bankcode,jdbcType=VARCHAR} and companyId = #{companyId}
   </update>
 
     <select id="selectThisamount" resultType="java.lang.Double">