Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysUserCashAccountDao.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 public interface SysUserCashAccountDao extends BaseDAO<Integer, SysUserCashAccount> {
@@ -27,9 +28,10 @@ public interface SysUserCashAccountDao extends BaseDAO<Integer, SysUserCashAccou
      */
     List<SysUserCashAccount> findByUserIds(@Param("userIds") Set<Integer> userIds);
 
+
     /**
      * 获取预收余额
      * @return
      */
-    BigDecimal getTotalUserBalance();
+    BigDecimal getTotalUserBalance(Map<String, Object> params);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentPaymentOrderServiceImpl.java

@@ -285,7 +285,8 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
 
         List<StudentPaymentOrder> dataList = new ArrayList<>();
         int count = this.findCount(params);
-        BigDecimal totalUserBalance = sysUserCashAccountDao.getTotalUserBalance();
+
+        BigDecimal totalUserBalance = sysUserCashAccountDao.getTotalUserBalance(params);
         pageInfo.setTotalUserBalance(totalUserBalance);
         if (count > 0) {
             pageInfo.setTotal(count);

mec-biz/src/main/resources/config/mybatis/SysUserCashAccountMapper.xml

@@ -94,8 +94,15 @@
         </foreach>
     </select>
 
-    <select id="getTotalUserBalance" resultType="java.math.BigDecimal">
-        SELECT SUM(balance_) FROM sys_user_cash_account
+    <!-- 获取用户预收余额 -->
+    <select id="getTotalUserBalance" resultType="java.math.BigDecimal" parameterType="map">
+        SELECT SUM(suca.balance_) FROM sys_user_cash_account suca
+        LEFT JOIN sys_user su ON su.id_ = suca.user_id_
+        <where>
+        <if test="organId != null">
+            FIND_IN_SET(su.organ_id_,#{organId})
+        </if>
+        </where>
     </select>
 
 </mapper>