提现审核修改

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/sdk/WithdrawSdk.java

@@ -289,7 +289,7 @@ public class WithdrawSdk {
         return BigDecimal.ZERO;
     }
 
-    public static void main(String[] args) throws Exception {
+   /* public static void main(String[] args) throws Exception {
         String privateKey = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBANf/X1s2raYQAmY5VY929XqOIRESFlpLzWbltA08EI2i0jnJY3/kcCpo1sCHqkyWpDFGRgM1WYE90ayzEpS6EdZpyJ2/N5JFJzx4wMil5KHLdtQUmVv9si+xuYNOKfJW6Xn6zI/Wh81J1+hMlUY4WigU5Qci7DjdOjg5OD6e5DO3AgMBAAECgYEAor9ENhII3SsK48MneKWFaQZWW+po9ThQV8uT0rUDM/UOuYPIeMDC0vGTfhW6d2K57Haqohg8jGjr51g2E+HvNV+fARaBfCwy00DGcxjI6N8gEInj2AppsGV6a0ZtzGBh3BxGhEFV7x3NmTylDk3WkGnkGDqDNyrBUgK0BzCJEmECQQD+gYckYRevVfrZEHDQHRNzzMUlV9/ljA9x8dt0LoCNbd/wFvs0Ekjhas/2lUBkewEd4Kr0jaFcYzlUO/qihcpNAkEA2UP5W44yLuIo8ttPpdsfkH/8Ax64IywQHrXWq+thH7I91VwY2vomTduw8x0PafZtp8xryF3LixTZwQ7gsYbwEwJAQbb8SB5x2SogPVALcREw5qOm+/92pnTFwCws+BDRzLLkMcAdWNKn0tybmhXrrIY+QZKzUbYIRiywrtlV3AUjuQJBAJbnFnfX4NUdchGT79Mjyd2kdxZ3rK+JOD0MUWkhWFkahMX/bKgTXK1xLIr/ISiY53rHigkl1Gzqc4Aa5EeJkI8CQFlzlBOfoVnq3fPMZCCZcZSm97L12MgHho0AzoNj9sw9YYn9WPM7bw2HT8GUheiU3aiZGCyGGpYuVHMiBGa7l9U=";
 
         String sign = "zZi6+qN0+6cvyE3TO6BsggISgmZGuEkZYbz6POOJVNqY1r2ZvEL63rjAHoSB0vfrq7DJVdIb2kNWFOqVPNwH3OkTdkALlamxwFxMfL/Wg2VXKDxJpHKSqUPEGprcyIPcI+KZ2QbS9jj2P7NnVXBOlijRg/SZKfyX53zIipitg4uISV/5xuQVIvkLPAlHss1D5N0efRd9eep9PhxKAJ6g6GYgerDoSCAWZqBFCS2KdGQeg9Jvzj15xWsDAXMCgha9TS+YBZPvLpAbioaPO2PLfEEp8GAwHW1zdNw35O/6z3i0CQz6cJYCMRGAtGcnbK22rAiTAB5pZt7CLMdNhkNAGg==";
@@ -297,5 +297,5 @@ public class WithdrawSdk {
         String decryptStr = RSA.decryptPri(sign, privateKey);
         System.out.println(decryptStr);
 
-    }
+    }*/
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/UserWithdrawalServiceImpl.java

@@ -197,23 +197,25 @@ public class UserWithdrawalServiceImpl extends ServiceImpl<UserWithdrawalDao, Us
     public HttpResponseResult<Boolean> batchAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
         List<Long> ids = Arrays.asList(StringUtil.toLongArray(StringPool.COMMA, authOperaReq.getId()));
 
-        List<UserWithdrawal> userWithdrawals = baseMapper.selectList(Wrappers.<UserWithdrawal>lambdaQuery()
-                .in(UserWithdrawal::getId, ids)
-                .eq(UserWithdrawal::getAuthStatus, AuthStatusEnum.DOING));
-
         //先判断三方余额是否充足
-        //总提现金额
-        BigDecimal totalAmount = BigDecimal.ZERO;
-        for (UserWithdrawal withdrawal : userWithdrawals) {
-            if (null != withdrawal.getActualAmount()
-                    && BigDecimal.ZERO.compareTo(withdrawal.getActualAmount()) <= 0) {
-                totalAmount = totalAmount.add(withdrawal.getActualAmount());
+        if(authOperaReq.getPass()){
+            List<UserWithdrawal> userWithdrawals = baseMapper.selectList(Wrappers.<UserWithdrawal>lambdaQuery()
+                    .in(UserWithdrawal::getId, ids)
+                    .eq(UserWithdrawal::getAuthStatus, AuthStatusEnum.DOING));
+            //总提现金额
+            BigDecimal totalAmount = BigDecimal.ZERO;
+            for (UserWithdrawal withdrawal : userWithdrawals) {
+                if (null != withdrawal.getActualAmount()
+                        && BigDecimal.ZERO.compareTo(withdrawal.getActualAmount()) <= 0) {
+                    totalAmount = totalAmount.add(withdrawal.getActualAmount());
+                }
+            }
+            BigDecimal useDecimal = withdrawSdk.balanceQuery();
+            if (useDecimal.compareTo(totalAmount) < 0) {
+                return HttpResponseResult.failed("账户余额不足");
             }
         }
-        BigDecimal useDecimal = withdrawSdk.balanceQuery();
-        if (useDecimal.compareTo(totalAmount) < 0) {
-            return HttpResponseResult.failed("账户余额不足");
-        }
+
         int successNum = 0;
         String msg = "执行完成!";
         for (Long id : ids) {