Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWalletBiz.java

@@ -270,16 +270,17 @@ public class MyWalletBiz extends BaseBiz<MyWalletMapper, MyWallet> {
         if (restResponse.getStatus()!=ResultCode.SUCCESS_CODE){
               return  restResponse;
         }
-        WalletCathSumDto sumDto=JSONUtil.toBean( restResponse.getData().toString(),WalletCathSumDto.class);
+        String data=JSONObject.toJSONString(restResponse.getData());
+        WalletCathSumDto sumDto=JSONUtil.toBean( data,WalletCathSumDto.class);
         if (sumDto==null){
             return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE, "参数不能为空");
         }
-        BigDecimal commission=amount.divide(sumDto.getProceduReates()).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal commission=amount.multiply(sumDto.getProceduReates()).divide(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP);
         BigDecimal balnece=sumDto.getBalance();
         //到账金额
-        BigDecimal realAmount=balnece.subtract(commission);
+        BigDecimal realAmount=amount;
         if (amount.compareTo(realAmount)>0){
-            realAmount=amount;
+            realAmount=balnece.subtract(commission);
         }
         log.info("-----提现申请-----proceduReates==="+sumDto.getProceduReates()+"----commission===="+commission+"---realAmount==="+realAmount);
         //添加账号

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MyWalletController.java

@@ -105,6 +105,7 @@ public class MyWalletController {
     public ObjectRestResponse  applyCath(@RequestBody ApplyCathVo applyCathVo, HttpServletRequest request){
         try {
             Integer userId=Integer.parseInt(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getId());
+            applyCathVo.setUserId(userId);
             return   myWalletBiz.applyCath(applyCathVo);
         }catch (Exception e) {
             throw new BaseException(e);