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/PaybalanceMapper.java

@@ -50,4 +50,5 @@ public interface PaybalanceMapper extends CommonBaseMapper<Paybalance> {
     String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
 
     String validateAudit(List<DocBaseDTO> baseDTOs);
+    Double updateByAmount(@Param("id") Long id, @Param("companyId") Long companyId);
 }

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

@@ -57,4 +57,6 @@ public interface RecbalanceMapper extends CommonBaseMapper<Recbalance> {
     String validateBatchUnAudit(List<DocBaseDTO> baseDTOs);
 
     String validateAudit(List<DocBaseDTO> baseDTOs);
+
+    Double updateByAmount(@Param("id") Long id, @Param("companyId") Long companyId);
 }

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

@@ -120,6 +120,7 @@ public class PaybalanceServiceImpl extends CommonBaseServiceImpl<PaybalanceMappe
                 paybalancedetailMapper.insertSelective(paybalancedetail1);
             }
         }
+        paybalanceMapper.updateByAmount(pbId, BaseContextHolder.getCompanyId());
         return baseDTO;
     }
 

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

@@ -121,6 +121,7 @@ public class RecbalanceServiceImpl extends CommonBaseServiceImpl<RecbalanceMappe
                 recbalancedetailMapper.insertSelective(recbalancedetail1);
             }
         }
+        recbalanceMapper.updateByAmount(rbId, BaseContextHolder.getCompanyId());
         return baseDTO;
     }
 

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

@@ -137,6 +137,13 @@
       <include refid="Example_Where_Clause" />
     </if>
   </delete>
+
+  <update id="updateByAmount">
+    update paybalance set pb_amount = (select sum(ifnull(pd_amount,0.0)) from paybalancedet where pd_pbid = pb_id )
+ where  pb_id = #{id,jdbcType=INTEGER} and companyId =#{companyId}
+  exists (select 1 from  paybalancedet where pd_pbid = pb_id );
+  </update>
+
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalance">
     insert into paybalance (pb_code, pb_kind,
       pb_date, pb_vendid, pb_vendcode, 
@@ -211,9 +218,6 @@
       <if test="updaterId != null">
         updaterId,
       </if>
-      <if  test="pb_amount != null">
-        pb_amount,
-      </if>
       <if test="pb_text1 != null">
         pb_text1,
       </if>
@@ -235,6 +239,9 @@
       <if test="createTime != null" >
         createTime,
       </if>
+      <if test="pb_amount != null" >
+        pb_amount,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="pb_code != null">

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

@@ -44,6 +44,12 @@
     where pd_pbid = #{id,jdbcType=INTEGER}
   </delete>
 
+  <update id="updateByAmount">
+    update recbalance set rb_amount = (select sum(ifnull(rd_amount,0.0)) from recbalancedet where rd_rbid = rb_id )
+ where  rb_id = #{id,jdbcType=INTEGER} and companyId =#{companyId}
+  exists (select 1 from  recbalancedet where rd_rbid = rb_id );
+  </update>
+
   <!--<insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >-->
   <insert id="insert" parameterType="com.usoftchina.saas.money.po.Paybalancedet" >
     insert into paybalancedet (pd_id, pd_pbid, pd_detno,