diff --git a/src/main/java/com/example/demo/controller/coin/AdminController.java b/src/main/java/com/example/demo/controller/coin/AdminController.java index 0b6f52e..704c7ef 100644 --- a/src/main/java/com/example/demo/controller/coin/AdminController.java +++ b/src/main/java/com/example/demo/controller/coin/AdminController.java @@ -64,8 +64,6 @@ public class AdminController { String token = token1; try { - - return JWTUtil.getUserDetailsList(String.valueOf(token), Admin.class); } catch (Exception e) { throw new RuntimeException(e); diff --git a/src/main/java/com/example/demo/domain/entity/Admin.java b/src/main/java/com/example/demo/domain/entity/Admin.java index ca18e81..495193e 100644 --- a/src/main/java/com/example/demo/domain/entity/Admin.java +++ b/src/main/java/com/example/demo/domain/entity/Admin.java @@ -27,7 +27,7 @@ public class Admin implements UserDetails, Serializable { private Byte adminStatus; // 状态(启用/不启用) private List market; // 地区列表 private String markets; // 地区 - + private String roleKey; private String postiton; // 职位 private String remark; // 备注 diff --git a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java index 0adb9aa..b9afe75 100644 --- a/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java +++ b/src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java @@ -98,6 +98,7 @@ public class CashRecordDone { private String refundCurrency; private String refundAmount; private String marketName; + private List statuses; private String processInstanceId; // 流程实例ID private String currentTaskId; // 当前任务ID diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index a2524ad..e4386fd 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -165,6 +165,12 @@ #{markets} + + AND cr.status IN + + #{statuses} + + AND cr.payment_currency = #{paymentCurrency} @@ -181,6 +187,9 @@ and cr.`pay_time` BETWEEN #{startTime} AND #{endTime} + + and cr.submitter_id = #{submitterId} + \ No newline at end of file