shayu/cai-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

123

Browse Source
This commit is contained in:
张良(004796)
2024-01-03 18:38:58 +08:00
parent b22b4fba48
commit 8dd8f0ab9f
7 changed files with 79 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/RechargeOrderController.java
View File

@@ -3,6 +3,7 @@ package com.ruoyi.cai.controller.admin;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
import com.ruoyi.cai.service.RechargeOrderService;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
@@ -40,8 +41,8 @@ public class RechargeOrderController extends BaseController {
*/
@SaCheckPermission("cai:rechargeOrder:list")
@GetMapping("/list")
public TableDataInfo<RechargeOrder> list(RechargeOrder bo, PageQuery pageQuery) {
Page<RechargeOrder> page = rechargeOrderService.page(pageQuery.build());
public TableDataInfo<RechargeOrderAdminVo> list(RechargeOrderAdminVo bo, PageQuery pageQuery) {
Page<RechargeOrderAdminVo> page = rechargeOrderService.pageAdmin(pageQuery,bo);
return TableDataInfo.build(page);
}

35
ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/vo/RechargeOrderAdminVo.java Normal file
View File

@@ -0,0 +1,35 @@
package com.ruoyi.cai.dto.admin.vo;
import com.ruoyi.cai.domain.RechargeOrder;
import lombok.Data;
@Data
public class RechargeOrderAdminVo extends RechargeOrder {
/**
* 用户号/ID号
*/
private String usercode;
/**
* 昵称
*/
private String nickname;
/**
* 手机号
*/
private String mobile;
/**
* 头像
*/
private String avatar;
/**
* 性别
*/
private Integer gender;
private Integer age;
private Integer isAnchor;
private boolean usedPay;
}

4
ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/RechargeOrderMapper.java
View File

@@ -1,7 +1,10 @@
package com.ruoyi.cai.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
import org.apache.ibatis.annotations.Param;
/**
* 充值订单Mapper接口
@@ -11,4 +14,5 @@ import com.ruoyi.cai.domain.RechargeOrder;
*/
public interface RechargeOrderMapper extends BaseMapper<RechargeOrder> {
Page<RechargeOrderAdminVo> pageAdmin(@Param("build") Page<Object> build, @Param("bo") RechargeOrderAdminVo bo);
}

4
ruoyi-cai/src/main/java/com/ruoyi/cai/service/RechargeOrderService.java
View File

@@ -1,7 +1,10 @@
package com.ruoyi.cai.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
import com.ruoyi.common.core.domain.PageQuery;
/**
* 充值订单Service接口
@@ -11,4 +14,5 @@ import com.ruoyi.cai.domain.RechargeOrder;
*/
public interface RechargeOrderService extends IService<RechargeOrder> {
Page<RechargeOrderAdminVo> pageAdmin(PageQuery pageQuery, RechargeOrderAdminVo bo);
}

7
ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/RechargeOrderServiceImpl.java
View File

@@ -1,9 +1,12 @@
package com.ruoyi.cai.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.cai.domain.RechargeOrder;
import com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo;
import com.ruoyi.cai.mapper.RechargeOrderMapper;
import com.ruoyi.cai.service.RechargeOrderService;
import com.ruoyi.common.core.domain.PageQuery;
import org.springframework.stereotype.Service;
/**
@@ -15,4 +18,8 @@ import org.springframework.stereotype.Service;
@Service
public class RechargeOrderServiceImpl extends ServiceImpl<RechargeOrderMapper,RechargeOrder> implements RechargeOrderService {
@Override
public Page<RechargeOrderAdminVo> pageAdmin(PageQuery pageQuery, RechargeOrderAdminVo bo) {
return baseMapper.pageAdmin(pageQuery.build(),bo);
}
}

23
ruoyi-cai/src/main/resources/mapper/cai/RechargeOrderMapper.xml
View File

@@ -20,6 +20,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="operateIp" column="operate_ip"/>
<result property="admin" column="admin"/>
</resultMap>
<select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.RechargeOrderAdminVo">
select t1.*,t2.usercode,t2.nickname,t2.mobile,t2.avatar,t2.gender,t2.is_anchor,t2.age
from cai_recharge_order t1
left join cai_user t2 on t1.user_id = t2.id
<where>
<if test="bo.mobile != null and bo.mobile != ''">
and t2.mobile = #{bo.mobile}
</if>
<if test="bo.usercode != null and bo.usercode != ''">
and t2.usercode = #{bo.usercode}
</if>
<if test="bo.payStatus != null">
and t1.pay_status = #{bo.payStatus}
</if>
<if test="bo.usedPay">
and t1.pay_status != 0
</if>
<if test="bo.orderNo != null and bo.orderNo != ''">
and t1.order_no = #{bo.orderNo}
</if>
</where>
order by t1.create_time desc
</select>
</mapper>

3
ruoyi-cai/src/main/resources/mapper/cai/VipOrderMapper.xml
View File

@@ -38,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="bo.usedPay">
and t1.pay_status != 0
</if>
<if test="bo.orderNo != null and bo.orderNo != ''">
and t1.order_no = #{bo.orderNo}
</if>
</where>
order by t1.create_time desc
</select>