Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

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

@@ -22,6 +22,7 @@ public interface BanksubledgerMapper extends CommonBaseMapper<Banksubledger> {
 //    Long insert(Banksubledger record);
 
     int insertSelective(Banksubledger record);
+    String selectCode(String code);
 
     List<Banksubledger> selectByExample(BanksubledgerExample example);
 

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

@@ -19,6 +19,7 @@ public interface SubledgerMapper {
     int insertSelective(Subledger record);
 
     Subledger selectByPrimaryKey(Integer sl_id);
+    String selectCode(String code);
 
     int updateByPrimaryKeySelective(Subledger record);
 

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

@@ -237,7 +237,11 @@ public class FundtransferServiceImpl implements FundtransferService {
             banksubledger.setBl_spending(fundtransferdetail.getFtd_nowbalance());
             banksubledger.setBl_remark(fundtransferdetail.getFtd_remark());
             banksubledger.setBl_orderamount(fundtransferdetail.getFtd_nowbalance() * -1);
-            banksubledgerMapper.insertSelective(banksubledger);
+            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
+                banksubledgerMapper.insertSelective(banksubledger);
+            }else {
+                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
+            }
         }
     }
 }

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

@@ -239,7 +239,11 @@ public class OthreceiptsServiceImpl implements OthreceiptsService {
             banksubledger.setBl_income(othreceiptsdetail.getOrd_nowbalance());
             banksubledger.setBl_remark(othreceiptsdetail.getOrd_remark());
             banksubledger.setBl_orderamount(othreceiptsdetail.getOrd_nowbalance());
-            banksubledgerMapper.insertSelective(banksubledger);
+            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
+                banksubledgerMapper.insertSelective(banksubledger);
+            }else {
+                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
+            }
         }
     }
 }

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

@@ -233,7 +233,11 @@ public class OthspendingsServiceImpl implements OthspendingsService {
             banksubledger.setBl_income(othspendingsdetail.getOsd_nowbalance());
             banksubledger.setBl_remark(othspendingsdetail.getOsd_remark());
             banksubledger.setBl_orderamount(othspendingsdetail.getOsd_nowbalance() * -1);
-            banksubledgerMapper.insertSelective(banksubledger);
+            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
+                banksubledgerMapper.insertSelective(banksubledger);
+            }else {
+                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
+            }
         }
     }
 }

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

@@ -103,7 +103,11 @@ public class PaybalanceServiceImpl implements PaybalanceService {
         paybalance.setPb_statuscode(Status.AUDITED.name());
         paybalance.setCompanyId(companyId);
         Subledger subledger = this.changSubledgerUntil(paybalance);
-        subledgerMapper.insertSelective(subledger);
+        if (subledger.getSl_code() == null){
+            subledgerMapper.insertSelective(subledger);
+        }else {
+            subledgerMapper.updateByPrimaryKeySelective(subledger);
+        }
         this.changBankUntil(pay);
         System.out.println("新增");
         if ( paybalance == null || "".equals(paybalance)){
@@ -185,6 +189,12 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             paybalance.setPb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             paybalance.setPb_statuscode(Status.AUDITED.name());
             Pay pay = this.select(Math.toIntExact(paybalance.getId()));
+            Subledger subledger = this.changSubledgerUntil(pay.getMain());
+            if (subledger.getSl_code() == null){
+                subledgerMapper.insertSelective(subledger);
+            }else {
+                subledgerMapper.updateByPrimaryKeySelective(subledger);
+            }
             this.changBankUntil(pay);
             paybalanceMapper.updateByPrimaryKeySelective(paybalance);
         }
@@ -303,7 +313,11 @@ public class PaybalanceServiceImpl implements PaybalanceService {
             banksubledger.setBl_manname(paybalance.getPb_manname());
             banksubledger.setBl_remark(paybalancedet.getPd_remark());
             banksubledger.setBl_orderamount(paybalancedet.getPd_amount() * -1);
-            banksubledgerMapper.insertSelective(banksubledger);
+            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
+                banksubledgerMapper.insertSelective(banksubledger);
+            }else {
+                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
+            }
 
         }
     }

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

@@ -131,7 +131,11 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         recbalance.setRb_statuscode(Status.AUDITED.name());
         recbalance.setCompanyId(companyId);
         Subledger subledger = this.changSubledgerUntil(recbalance);
-        subledgerMapper.insertSelective(subledger);
+        if (subledger.getSl_code() == null){
+            subledgerMapper.insertSelective(subledger);
+        }else {
+            subledgerMapper.updateByPrimaryKeySelective(subledger);
+        }
         this.changBankUntil(rec);
         if ( recbalance == null || "".equals(recbalance)){
             this.insert(rec);
@@ -149,7 +153,7 @@ public class RecbalanceServiceImpl implements RecbalanceService {
         recbalanceMapper.updateByPrimaryKeySelective(recbalance);
 
         //删除中间表
-        recbalance = recbalanceMapper.selectByPrimaryKey(id);
+        recbalance = recbalanceMapper.selectByPrimaryKey(id.intValue());
         subledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind());
         banksubledgerMapper.deleteByPrimaryKey(recbalance.getRb_code(), recbalance.getRb_kind());
     }
@@ -187,6 +191,12 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             recbalance.setRb_status(com.usoftchina.saas.commons.po.Status.AUDITED.getDisplay());
             recbalance.setRb_statuscode(Status.AUDITED.name());
             Rec rec = this.select(Math.toIntExact(recbalance.getId()));
+            Subledger subledger = this.changSubledgerUntil(rec.getMain());
+            if (subledger.getSl_code() == null){
+                subledgerMapper.insertSelective(subledger);
+            }else {
+                subledgerMapper.updateByPrimaryKeySelective(subledger);
+            }
             this.changBankUntil(rec);
             recbalanceMapper.updateByPrimaryKeySelective(recbalance);
         }
@@ -302,7 +312,11 @@ public class RecbalanceServiceImpl implements RecbalanceService {
             banksubledger.setBl_manname(recbalance.getRb_manname());
             banksubledger.setBl_remark(recbalancedet.getRd_remark());
             banksubledger.setBl_orderamount(recbalancedet.getRd_amount());
-            banksubledgerMapper.insertSelective(banksubledger);
+            if (banksubledgerMapper.selectCode(banksubledger.getBl_code()) == null){
+                banksubledgerMapper.insertSelective(banksubledger);
+            }else {
+                banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
+            }
 
         }
     }

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

@@ -403,11 +403,11 @@
             <if test="updaterId != null">
                 updaterId = #{updaterId,jdbcType=INTEGER},
             </if>
-            <if test="updatedate != null">
-                updatedate = #{updatedate,jdbcType=TIMESTAMP},
+            <if test="updateTime != null">
+                updatedate = #{updateTime,jdbcType=TIMESTAMP},
             </if>
         </set>
-        where bl_id = #{bl_id,jdbcType=INTEGER}
+        where bl_id = #{id,jdbcType=INTEGER}
     </update>
     <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Banksubledger">
     update banksubledger
@@ -430,6 +430,10 @@
       updatedate = #{updatedate,jdbcType=TIMESTAMP}
     where bl_id = #{bl_id,jdbcType=INTEGER}
   </update>
-
+    <select id="selectCode" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select bl_code
+        from banksubledger
+        where bl_code = #{bl_code,jdbcType=VARCHAR}
+    </select>
 
 </mapper>

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

@@ -204,7 +204,7 @@
         sl_ym = #{sl_ym,jdbcType=INTEGER},
       </if>
     </set>
-    where sl_id = #{sl_id,jdbcType=INTEGER}
+    where sl_id = #{id,jdbcType=INTEGER}
   </update>
   <update id="updateByPrimaryKey" parameterType="com.usoftchina.saas.money.po.Subledger" >
     update subledger
@@ -241,4 +241,10 @@
     </where>  order by sl_id
   </select>
 
+  <select id="selectCode" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select sl_code
+        from subledger
+        where sl_code = #{sl_code,jdbcType=VARCHAR}
+    </select>
+
 </mapper>