diff --git a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java
index 36c1f3f..b4d3f5a 100644
--- a/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java
+++ b/src/main/java/com/example/demo/controller/bean/BeanConsumeController.java
@@ -40,6 +40,11 @@ public class BeanConsumeController {
     @Autowired
     private TranslationService translationService;
 
+    //获取角色的权限
+    @PostMapping("/getRoleChannel")
+    public Result getRoleChannel(@RequestBody Integer roleId){
+       return Result.success(beanConsumeService.getRoleChannel(roleId));
+    }
     //获取消费用户分部信息
     @PostMapping("/getDept")
     public Result getDept(@RequestHeader(defaultValue = "zh_CN") String lang){
diff --git a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java
index 45c9faa..1116db2 100644
--- a/src/main/java/com/example/demo/service/bean/BeanConsumeService.java
+++ b/src/main/java/com/example/demo/service/bean/BeanConsumeService.java
@@ -39,4 +39,6 @@ public interface BeanConsumeService {
 
     //筛选查询小黄车消费
     Object selectCartBy(Integer pageNum, Integer pageSize, BeanConsumeCartDTO beanConsumeCartDTO);
+    //根据角色id获取角色频道
+    Object getRoleChannel(Integer roleId);
 }
diff --git a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
index 36f49a7..1f9ff95 100644
--- a/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/bean/BeanConsumeServiceImpl.java
@@ -209,6 +209,12 @@ public class BeanConsumeServiceImpl implements BeanConsumeService {
 
         return new PageInfo<>(beanConsumeCarts);
     }
+    //根据角色id获取角色频道
+    @Override
+    public Object getRoleChannel(Integer roleId) {
+        return roleMapper.getChannel(roleId);
+    }
+
     @Override
     public BeanConsumeGold sumConsumeGold(Page page) {
         BeanConsumeGold gold = new BeanConsumeGold();
diff --git a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
index adec204..9d5546c 100644
--- a/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/cash/CashCollectionServiceImpl.java
@@ -33,6 +33,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
 import java.util.stream.Collectors;
 
@@ -350,6 +351,11 @@ public class CashCollectionServiceImpl implements CashCollectionService {
     public String complete(CashRecord cashRecord) {
 
 
+        if (!Objects.equals(cashRecord.getPaymentCurrency(), cashRecord.getReceivedCurrency())
+            && ("Stripe".equals(cashRecord.getPayType()) || "Paypal".equals(cashRecord.getPayType()))) {
+            return "支付币种与收款币种不一致";
+        }
+
         int rows = cashCollectionMapper.complete(cashRecord);
 
         return rows > 0 ? "编辑成功" : "编辑失败";
diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml
index 4ffe6df..100f3a2 100644
--- a/src/main/resources/cashMapper/CashRefundMapper.xml
+++ b/src/main/resources/cashMapper/CashRefundMapper.xml
@@ -224,7 +224,7 @@
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>
-                ORDER BY crr.create_time DESC
+                ORDER BY crr.update_time DESC
             </otherwise>
         </choose>
     </select>
@@ -247,6 +247,7 @@
         crr.free_gold,
         crr.audit_id,
         crr.related_id,
+        crr.reject_reason,
         la.area_servise,
         la.area_finance,
         la.area_charge,
@@ -304,7 +305,7 @@
                 ORDER BY ${sortField} ${sortOrder}
             </when>
             <otherwise>
-                ORDER BY crr.create_time DESC
+                ORDER BY crr.update_time DESC
             </otherwise>
         </choose>
     </select>
@@ -333,10 +334,13 @@
         crr.refund_voucher,
         crr.refund_time,
         crr.executor,
+        crr.permanent_gold,
+        crr.free_gold,
         crr.status,
         crr.audit_id,
         crr.submitter_id,
         crr.related_id,
+        crr.refund_reason,
        la.area_servise,
        la.area_finance,
        la.area_charge,
diff --git a/src/main/resources/mapper/WorkBenchMapper.xml b/src/main/resources/mapper/WorkBenchMapper.xml
index b45bc45..a272d4d 100644
--- a/src/main/resources/mapper/WorkBenchMapper.xml
+++ b/src/main/resources/mapper/WorkBenchMapper.xml
@@ -185,7 +185,7 @@
         WHERE cr.received_currency IN (2,3,4,5,6,7,8)  -- 只统计这7种币
         AND m.name IN
         <foreach item="market" collection="markets" open="(" separator="," close=")">#{market}</foreach>
-        AND cr.audit_time BETWEEN #{startDate} AND #{endDate}
+        AND cr.received_time BETWEEN #{startDate} AND #{endDate}
         AND cr.order_type=1
         AND cr.status IN (0,1,3,4,6)
         GROUP BY m.name;