10.16修改状态

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);

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<String> market; // 地区列表
     private String markets; // 地区
-
+    private String roleKey;
     private String postiton; // 职位
     private String remark; // 备注
 

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<Integer> statuses;
 
     private String processInstanceId; // 流程实例ID
     private String currentTaskId; // 当前任务ID

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -165,6 +165,12 @@
                     #{markets}
                 </foreach>
             </if>
+            <if test="statuses!= null and statuses.size > 0">
+                AND cr.status IN
+                <foreach collection="statuses" item="statuses" open="(" separator="," close=")">
+                    #{statuses}
+                </foreach>
+            </if>
         <if test="paymentCurrency!= null and paymentCurrency.length() > 0">
             AND cr.payment_currency = #{paymentCurrency}
         </if>
@@ -181,6 +187,9 @@
             <if test="startTime != null and endTime != null">
                 and cr.`pay_time` BETWEEN #{startTime} AND #{endTime}
             </if>
+        <if test=" submitterId!= null">
+            and cr.submitter_id = #{submitterId}
+        </if>
         </where>
     </select>
 </mapper>