Selaa lähdekoodia

bugfix:正确显示首页的个人信息-余额未正常显示

bing 1 vuosi sitten
vanhempi
commit
087276a15a

+ 7 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfConsumeDetailController.java

@@ -10,6 +10,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.backstage.consumption.domain.bo.XfConsumeDetailBo;
 import org.dromara.backstage.consumption.domain.vo.XfConsumeAnalyzeVo;
 import org.dromara.backstage.consumption.domain.vo.XfConsumeDetailVo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -48,6 +49,12 @@ public class XfConsumeDetailController extends BaseController {
         return xfConsumeDetailService.queryPageList(bo, pageQuery);
     }
 
+    @GetMapping("/selfList")
+    public TableDataInfo<XfConsumeDetailVo> selfList(XfConsumeDetailBo bo, PageQuery pageQuery) {
+        bo.setUserId(LoginHelper.getUserId());
+        return xfConsumeDetailService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 导出消费明细列表
      */

+ 7 - 0
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfCreditaccountController.java

@@ -8,6 +8,7 @@ import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.backstage.consumption.domain.bo.XfCreditAccountBo;
 import org.dromara.backstage.consumption.domain.vo.XfCreditAccountVo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -46,6 +47,12 @@ public class XfCreditaccountController extends BaseController {
         return xfCreditaccountService.queryPageList(bo, pageQuery);
     }
 
+    @GetMapping("/selfList")
+    public TableDataInfo<XfCreditAccountVo> selfList(XfCreditAccountBo bo, PageQuery pageQuery) {
+        bo.setUserId(LoginHelper.getUserId());
+        return xfCreditaccountService.queryPageList(bo, pageQuery);
+    }
+
     /**
      * 导出资金收支明细列表
      */

+ 5 - 3
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/payment/controller/PtBagController.java

@@ -27,6 +27,7 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.web.core.BaseController;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -57,9 +58,10 @@ public class PtBagController extends BaseController {
 
     //根据userId查询账户余额
 //    @SaCheckPermission("payment:ptBag:query")
-    @GetMapping("/selectAccountBalanceByIds")
-    public R<String> selectAccountBalanceByIds(@RequestParam("userIds") String userIds) {
-        return R.ok(ptBagService.selectAccountBalanceByIds(userIds));
+    @GetMapping("/selectSelfAccountBalance")
+    public R<String> selectAccountBalanceByIds() {
+        String userIds = String.valueOf(LoginHelper.getUserId());
+        return R.ok("",ptBagService.selectAccountBalanceByIds(userIds));
     }
 
     /**

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysMenuServiceImpl.java

@@ -137,7 +137,6 @@ public class SysMenuServiceImpl implements ISysMenuService {
                 s.setRoutePath(s.getPath()+"/"+menu.getRoutePath());
                 return getRouterPath(s, menus);
             }else{
-                System.err.println(rs);
                 return rs;
             }
         }