diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java
index 82d6621..4f95e9f 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/controller/StClientMemberBalanceController.java
@@ -483,8 +483,8 @@ public class StClientMemberBalanceController {
             }
         }
         query.setCanteenIdList(canteenIdList);
-        query.setStatus(1);//消费=101
-        List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
+        query.setStatus(101);
+        List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryListNew(query);
         StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
 
         StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额
@@ -523,8 +523,8 @@ public class StClientMemberBalanceController {
             }
         }
         query.setCanteenIdList(canteenIdList);
-        query.setStatus(1);//消费=101
-        List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryList(query);
+        query.setStatus(101);
+        List<StClientMemberTransactionRecordVO> statisticsCanteenBusiness = iStClientMemberTransactionRecordService.queryListNew(query);
 
         StClientMemberTransactionRecordVO sumResult = GenericSumUtil.sumList(statisticsCanteenBusiness, StClientMemberTransactionRecordVO.class);
         StClientMemberTransactionRecordVO stClientMemberTransactionRecordVO = new StClientMemberTransactionRecordVO();//只汇总交易金额
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java
index afda1f4..2b06d43 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/listUtils/OrderUtils.java
@@ -1,9 +1,12 @@
 package org.jeecg.payment.listUtils;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Random;
+import java.util.UUID;
 
 /**
  * * 订单编码码生成器，生成32位数字编码，
@@ -107,26 +110,10 @@ public class OrderUtils {
      */
 
     public static String getOrderCodeV2() {
-        return ORDER_CODE + getDateTimeV2();
+        return getDateTime() + IdWorker.get32UUID();
     }
 
 
-    /**
-     * 生成退货单号编码（调用方法）
-     * @param userId 网站中该用户唯一ID 防止重复
-     */
-    public static String getReturnCode(Integer userId) {
-        return RETURN_ORDER + getCode(userId);
-    }
-
-
-    /**
-     * 生成退款单号编码(调用方法)
-     * @param userId  网站中该用户唯一ID 防止重复
-     */
-    public static String getRefundCode(Integer userId) {
-        return REFUND_ORDER + getCode(userId);
-    }
 
 
 }
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java
index 5f06025..ab5ce1e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/StClientMemberTransactionRecordMapper.java
@@ -25,7 +25,7 @@ public interface StClientMemberTransactionRecordMapper extends BaseMapper<StClie
 
     long pageListCount(@Param("vo") StClientMemberTransactionRecordDTO query);
     IPage<StClientMemberTransactionRecordVO> pageList2(Page<StClientMemberTransactionRecordVO> page, @Param("vo") StClientMemberTransactionRecordDTO query);
-
+    List<StClientMemberTransactionRecordVO> pageList2( @Param("vo") StClientMemberTransactionRecordDTO query);
     /**
      * 列表查询
      * @return
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml
index 3926afe..372e596 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StBbzxOrderInfoMapper.xml
@@ -309,8 +309,8 @@
         ) AS totalNum
         FROM
         st_bbzx_order_info oi
-        JOIN sys_user_sub u ON oi.member_id = u.id
-        JOIN sys_user_sub pay ON oi.pay_member_id = pay.id
+        LEFT JOIN sys_user_sub u ON oi.member_id = u.id
+        LEFT JOIN sys_user_sub pay ON oi.pay_member_id = pay.id
         LEFT JOIN st_base_restaurant AS sr ON  sr.id = oi.canteen_id
         LEFT JOIN sys_pay_depart direct_depart ON pay.depart_ids = direct_depart.id AND direct_depart.del_flag = '0'
         LEFT JOIN sys_pay_depart parent_depart ON direct_depart.parent_id = parent_depart.id AND parent_depart.del_flag = '0'
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
index 805f33c..eb89388 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/mapper/xml/StClientMemberTransactionRecordMapper.xml
@@ -200,7 +200,7 @@
 
     </select>
     <select id="pageList2" resultType="org.jeecg.payment.vo.StClientMemberTransactionRecordVO">
-        SELECT
+        SELECT DISTINCT
             a.id,
             a.serial_no as serialNo,
             a.order_no as orderNo,
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/IStClientMemberTransactionRecordService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/IStClientMemberTransactionRecordService.java
index 8bdd95b..eb1c5a8 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/IStClientMemberTransactionRecordService.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/IStClientMemberTransactionRecordService.java
@@ -34,6 +34,14 @@ public interface IStClientMemberTransactionRecordService extends JeecgService<St
      */
     List<StClientMemberTransactionRecordVO> queryList(StClientMemberTransactionRecordDTO query);
 
+    /**
+     * 列表查询导出
+     *
+     * @param query
+     * @return
+     */
+    List<StClientMemberTransactionRecordVO> queryListNew(StClientMemberTransactionRecordDTO query);
+
     IPage<StClientMemberTransactionRecordVO> pageBalanceRefundList(Page<StClientMemberTransactionRecordVO> page, StClientMemberTransactionRecordDTO query);
 
     InOutRecordInfoVo getOneInOutInfo(String recordId);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java
index e1fc975..64cba5e 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StBbzxOrderInfoServiceImpl.java
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xkcoding.http.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -752,7 +753,7 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl<StBbzxOrderInfo
     public StBbzxOrderInfo buildOrderInfoNew(Date dateTime,String restId,String dinnerType,String plateNumber,String userId,String memberName,String memberPhone,Integer deductionType,StClientMemberLevelDeductRuleVo levelDeductRuleVo , String remark,StRfidVo stRfidVo){
         StBbzxOrderInfo stBbzxOrderInfo = new StBbzxOrderInfo();
         stBbzxOrderInfo.setOrderType(3);
-        String orderNo = OrderUtils.getOrderCode(10);
+        String orderNo = OrderUtils.getOrderCodeV2();
         stBbzxOrderInfo.setOrderNo(orderNo);
         stBbzxOrderInfo.setSerialNo(stRfidVo.getCardCode());
         stBbzxOrderInfo.setDinnerType(dinnerType);
@@ -815,7 +816,7 @@ public class StBbzxOrderInfoServiceImpl extends JeecgServiceImpl<StBbzxOrderInfo
         StBbzxOrderInfo stBbzxOrderInfo = new StBbzxOrderInfo();
         stBbzxOrderInfo.setDeviceCode(stRfidVo.getDeviceCode());
         stBbzxOrderInfo.setOrderType(3);
-        String orderNo = OrderUtils.getOrderCode(10);
+        String orderNo = OrderUtils.getOrderCodeV2();
         stBbzxOrderInfo.setOrderNo(orderNo);
         stBbzxOrderInfo.setSerialNo(miniMineBalanceVo.getCardCode());
         stBbzxOrderInfo.setDinnerType(dinnerType);
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberTransactionRecordServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberTransactionRecordServiceImpl.java
index 11394f5..a7b12e0 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberTransactionRecordServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/payment/service/impl/StClientMemberTransactionRecordServiceImpl.java
@@ -144,6 +144,25 @@ public class StClientMemberTransactionRecordServiceImpl extends JeecgServiceImpl
         return pageList;
     }
 
+    @Override
+    public List<StClientMemberTransactionRecordVO> queryListNew(StClientMemberTransactionRecordDTO query) {
+        List<StClientMemberTransactionRecordVO> pageList = baseMapper.pageList2(query);
+        if (CollectionUtils.isNotEmpty(pageList)) {
+            for (StClientMemberTransactionRecordVO model : pageList) {
+                model.setStatusName(MemberTransactionTypeEnum.getName(model.getStatus()));
+                model.setPaymentMethodName(MemberEnum.getXcxName(model.getPaymentMethod()));
+                model.setUpdateStatusName(null != model.getUpdateStatus() && 1 == model.getUpdateStatus() ? "前端":"后台");
+                if(null != model.getBusinessModel()&& 1 == model.getBusinessModel() ){
+                    model.setBusinessModelName("定值模式");//扣费类型（1：固定扣费，2：固定+补贴扣费，3：按量扣费，4:自定义金额）
+                }
+                if(null != model.getBusinessModel()&& 4 == model.getBusinessModel() ){
+                    model.setBusinessModelName("金额模式");//扣费类型（1：固定扣费，2：固定+补贴扣费，3：按量扣费，4:自定义金额）
+                }
+            }
+        }
+        return pageList;
+    }
+
     @Override
     public IPage<StClientMemberTransactionRecordVO> pageBalanceRefundList(Page<StClientMemberTransactionRecordVO> page,StClientMemberTransactionRecordDTO query) {