diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java index 05d6da6cc..b96106dbb 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/MemberBasicInfoController.java @@ -321,6 +321,7 @@ public class MemberBasicInfoController extends BaseController { } return result; } + /** * 查询会员明细 * @param dto @@ -351,6 +352,11 @@ public class MemberBasicInfoController extends BaseController { */ @PostMapping("/exportMemberWalletLog") public void exportMemberWalletLog(HttpServletResponse response, UniAppQueryMemberBalanceDTO dto){ + AuthorizedDeptVO authorizedMap = UserUtils.getAuthorizedMap(); + if (authorizedMap == null) { + // 为空表示没有权限,返回空数组 + return; + } List memberWalletLogVO2 = memberWalletLogService.getByMemberId(dto.getMemberId()); ExcelUtil util = new ExcelUtil(MemberWalletLogVO2.class); util.exportExcel(response, memberWalletLogVO2, "会员钱包流水"); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java index ef05e7f48..5556fb009 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/customer/MemberWalletLogVO.java @@ -31,6 +31,8 @@ public class MemberWalletLogVO { /** * 子类型 10-充值, 11-赠送, 12-订单结算退款,20-后管扣款, 21-订单付款, 22-用户退款 */ + @Excel(name = "操作类型(10-充值, 11-赠送, 12-订单结算退款,20-后管扣款, 21-订单付款, 22-用户退款)", + readConverterExp = "10=充值,11=赠送,12=订单结算退款,20=后管扣款,21=订单付款,22=用户退款") private String subType; /** @@ -42,6 +44,7 @@ public class MemberWalletLogVO { /** * 出账/入账金额 */ + @Excel(name = "金额") private BigDecimal amount; /** @@ -53,6 +56,7 @@ public class MemberWalletLogVO { /** * 余额类型(1-本金,2-赠送) */ + @Excel(name = "余额类型(1-本金,2-赠送)", readConverterExp = "1=本金,2=赠送") private String category; /** @@ -94,6 +98,7 @@ public class MemberWalletLogVO { /** * 操作人员 */ + @Excel(name = "操作人员") private String createBy; public String getSubTypeName() {