dianliang/dl_admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
13405411873 2025-06-06 16:45:44 +08:00
parent cb9e98a4de
commit 2d682f75da
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-admin/src/main/java/com/ruoyi/member/service/impl/MemberOrderServiceImpl.java
View File

@ -19,6 +19,7 @@ import com.ruoyi.member.service.IMemberOrderService;
import com.ruoyi.member.service.IMemberPointsService;
import com.ruoyi.member.vo.MemberOrderVO;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
import lombok.SneakyThrows;
import org.springframework.beans.factory.annotation.Autowired;
@ -28,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.Date;
import java.util.Random;
import java.util.Set;
/**
* 订单Service业务层处理
@ -49,6 +51,8 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
private ISysConfigService sysConfigService;
@Autowired
private ISysUserService userService;
@Autowired
private ISysRoleService roleService;
/**
@ -62,6 +66,15 @@ public class MemberOrderServiceImpl extends ServiceImpl<MemberOrderMapper, Membe
**/
@Override
public IPage<MemberOrderVO> queryListPage(MemberOrderVO memberOrder, Page<MemberOrder> page) {
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
// 管理员拥有所有权限
if (!user.isAdmin()) {
Set<String> strings = roleService.selectRolePermissionByUserId(user.getUserId());
if (strings.contains("xsry")){
memberOrder.setUserId(user.getUserId());
}
}
return memberOrderMapper.queryListPage(memberOrder, page);
}

18
ruoyi-admin/src/main/resources/mapper/member/MemberOrderMapper.xml
View File

@ -34,22 +34,28 @@
</resultMap>
<sql id="selectMemberOrderVo">
select id, user_id, user_type, nickname, order_no, order_type, goods_id, goods_num, goods_price, pay_time, content, pay_way, is_pay, is_refund, refund_user_id, refund_way, refund_no, refund_apply_time, refund_receive_time, refund_reason, remark, creator, create_time, updater, update_time, del_flag from dl_member_order
select id, user_id, user_type, nickname, order_no, order_type, goods_id, goods_num, goods_price, pay_time,
content, pay_way, is_pay, is_refund, refund_user_id, refund_way, refund_no, refund_apply_time, refund_receive_time,
refund_reason, remark, creator, create_time, updater, update_time, del_flag from dl_member_order
</sql>
<select id="queryListPage" parameterType="MemberOrder" resultMap="MemberOrderResult">
<include refid="selectMemberOrderVo"/>
select main.id, main.user_id, main.user_type, su.nick_name as nickname, main.order_no, main.order_type, main.goods_id, main.goods_num, main.goods_price, main.pay_time,
main.content, main.pay_way, main.is_pay, main.is_refund, main.refund_user_id, main.refund_way, main.refund_no, main.refund_apply_time, main.refund_receive_time,
main.refund_reason, main.remark, main.creator, main.create_time, main.updater, main.update_time, main.del_flag
from dl_member_order main
left join sys_user su on su.user_id = main.user_id
<where>
<if test="entity.nickname != null and entity.nickname != ''"> and nickname like concat('%', #{entity.nickname}, '%')</if>
<if test="entity.orderNo != null and entity.orderNo != ''"> and order_no like concat('%', #{entity.orderNo}, '%')</if>
<if test="entity.nickname != null and entity.nickname != ''"> and su.nick_name like concat('%', #{entity.nickname}, '%')</if>
<if test="entity.orderNo != null and entity.orderNo != ''"> and main.order_no like concat('%', #{entity.orderNo}, '%')</if>
<if test="entity.userType != null and entity.userType != ''"> and user_type = #{entity.userType}</if>
<if test="entity.orderType != null and entity.orderType != ''"> and order_type = #{entity.orderType}</if>
<if test="entity.payWay != null and entity.payWay != ''"> and pay_way = #{entity.payWay}</if>
<if test="entity.refundWay != null and entity.refundWay != ''"> and refund_way = #{entity.refundWay}</if>
<if test="entity.isPay != null "> and is_pay = #{entity.isPay}</if>
<if test="entity.isRefund != null "> and is_refund = #{entity.isRefund}</if>
<if test="entity.userId != null "> and user_id = #{entity.userId}</if>
<if test="entity.userId != null "> and su.invite_id = #{entity.userId}</if>
</where>
order by create_time desc
</select>
</mapper>
</mapper>