nnnn

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/RechargeOrderController.java

@@ -2,11 +2,14 @@ package com.ruoyi.web.controller.cai.admin;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.cai.domain.RechargeOrder;
 import com.ruoyi.cai.domain.User;
 import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
+import com.ruoyi.cai.dto.admin.vo.order.RechargeOrderCountAdminVo;
+import com.ruoyi.cai.mapper.RechargeOrderMapper;
 import com.ruoyi.cai.service.PayTrdConfigService;
 import com.ruoyi.cai.service.RechargeOrderService;
 import com.ruoyi.cai.service.UserService;
@@ -17,6 +20,7 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.utils.BeanConvertUtil;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -25,6 +29,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -37,6 +42,7 @@ import javax.validation.constraints.NotNull;
 @RequiredArgsConstructor
 @RestController
 @RequestMapping("/cai/rechargeOrder")
+@Slf4j
 public class RechargeOrderController extends BaseController {
 
     private final RechargeOrderService rechargeOrderService;
@@ -45,6 +51,19 @@ public class RechargeOrderController extends BaseController {
     private TrdPayManager trdPayManager;
     @Autowired
     private PayTrdConfigService payTrdConfigService;
+    @Resource
+    private RechargeOrderMapper rechargeOrderMapper;
+    @Autowired
+    private IdentifierGenerator identifierGenerator;
+    /**
+     * 查询充值订单列表
+     */
+    @SaCheckPermission("cai:rechargeOrder:list")
+    @GetMapping("/totalPage")
+    public TableDataInfo<RechargeOrderCountAdminVo> totalPage(RechargeOrderCountAdminVo bo, PageQuery pageQuery) {
+        Page<RechargeOrderCountAdminVo> page = rechargeOrderMapper.totalPage(pageQuery.build(),bo);
+        return TableDataInfo.build(page);
+    }
 
     /**
      * 查询充值订单列表
@@ -52,6 +71,8 @@ public class RechargeOrderController extends BaseController {
     @SaCheckPermission("cai:rechargeOrder:list")
     @GetMapping("/list")
     public TableDataInfo<RechargeOrderAdminVo> list(RechargeOrderAdminVo bo, PageQuery pageQuery) {
+        String string = identifierGenerator.nextId(null).toString();
+        log.info("ID============{}",string);
         Page<RechargeOrderAdminVo> page = rechargeOrderService.pageAdmin(pageQuery,bo);
         return TableDataInfo.build(page);
     }