10-13-修改收款查询

src/main/java/com/example/demo/serviceImpl/coin/AuditServiceImpl.java

@@ -52,26 +52,26 @@ public class AuditServiceImpl implements AuditService {
     @Transactional
     @Override
     public boolean auditOrder(String token, String orderCode, Integer auditId, Integer action,String rejectReason) {
-        UserGoldRecord order=auditMapper.selectOrderByOrderCode(orderCode);
-        Date date =new Date();
-        if (order == null || order.getAuditStatus() != 0) {
-            throw new IllegalArgumentException("订单不存在或已被审核");
-        }
-        //更新订单的审核状态和审核人
-        UserGoldRecord updateOrder = new UserGoldRecord();
-        updateOrder.setOrderCode(orderCode);
-        updateOrder.setAuditId(auditId);
-        String auditName = auditMapper.getName(auditId);
-        //判断是通过还是驳回
-        if (action==2){     //驳回
+                        UserGoldRecord order=auditMapper.selectOrderByOrderCode(orderCode);
+                        Date date =new Date();
+                        if (order == null || order.getAuditStatus() != 0) {
+                            throw new IllegalArgumentException("订单不存在或已被审核");
+                        }
+                        //更新订单的审核状态和审核人
+                        UserGoldRecord updateOrder = new UserGoldRecord();
+                        updateOrder.setOrderCode(orderCode);
+                        updateOrder.setAuditId(auditId);
+                        String auditName = auditMapper.getName(auditId);
+                        //判断是通过还是驳回
+                        if (action==2){     //驳回
 
-            if (order.getType()==2) {  //退款
-                //2.获取对应的订单（退款订单号去掉开头"TK"即为对应原始订单）
-                String oldOrderCode = order.getOrderCode().replaceFirst("TK_", "");
-                //3.更新消费订单是否已退款状态为0
-                UserGoldRecord oldOrder = auditMapper.selectAllOrderByOrderCode(oldOrderCode);
-                if (oldOrderCode != null&&(oldOrder.getType()==1||oldOrder.getType()==0)){   //确保是消费或充值订单
-                    auditMapper.updateOrderRefund(oldOrderCode,(byte)0);
+                            if (order.getType()==2) {  //退款
+                                //2.获取对应的订单（退款订单号去掉开头"TK"即为对应原始订单）
+                                String oldOrderCode = order.getOrderCode().replaceFirst("TK_", "");
+                                //3.更新消费订单是否已退款状态为0
+                                UserGoldRecord oldOrder = auditMapper.selectAllOrderByOrderCode(oldOrderCode);
+                                if (oldOrderCode != null&&(oldOrder.getType()==1||oldOrder.getType()==0)){   //确保是消费或充值订单
+                                    auditMapper.updateOrderRefund(oldOrderCode,(byte)0);
                 }else {
                     throw new IllegalArgumentException("找不到对应的订单或不是有效订单");
                 }  }

src/main/resources/cashMapper/CashCollectionMapper.xml

@@ -76,7 +76,7 @@
                cr.received_market,cr.pay_type,cr.pay_time,cr.received_time,
                cr.status,cr.submitter_id,cr.voucher,cr.remark,cr.reject_reason,
                cr.create_time,cr.update_time,cr.audit_time,
-               a.admin_name as submitterName,
+               a1.admin_name as submitterName,
                a2.admin_name as auditName
 
         from cash_record cr