From 37df8802d3672efb8d09354bcf4d59a96cfc68eb Mon Sep 17 00:00:00 2001
From: ds <ds@qq.com>
Date: Mon, 18 Nov 2024 08:49:54 +0800
Subject: [PATCH] 11.18

---
 .../api/financialStatement/jiaoyiduizhang.js  |  7 +++
 .../jiaoyiduizhang/tab/int.vue                |  9 +++-
 .../jiaoyiduizhang/tab/oil.vue                |  9 +++-
 .../jiaoyiduizhang/tab/store.vue              |  9 +++-
 .../jiaoyiduizhang/tab/vip.vue                | 47 +++++++++----------
 .../src/views/system/notify/page/mode.vue     | 27 +++++++----
 .../integral/mapper/IntegralOrdersMapper.java |  2 +-
 .../mapper/xml/IntegralOrdersMapper.xml       |  9 +++-
 .../impl/IntegralOrdersServiceImpl.java       |  4 +-
 .../controller/CardValueRecordController.java | 11 +++++
 .../cardValue/entity/CardValueRecord.java     | 10 ++++
 .../mapper/CardValueRecordMapper.java         |  2 +
 .../mapper/xml/CardValueRecordMapper.xml      | 33 +++++++++++++
 .../service/CardValueRecordService.java       |  3 ++
 .../impl/CardValueRecordServiceImpl.java      | 36 ++++++++++++--
 15 files changed, 173 insertions(+), 45 deletions(-)

diff --git a/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js b/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js
index 228d6768c..c9a451247 100644
--- a/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js
+++ b/fuintAdmin_zt/src/api/financialStatement/jiaoyiduizhang.js
@@ -9,6 +9,13 @@ import request from '@/utils/request'
     params: query
   })
 }
+export function getDuiZhangVipListApi1(query) {
+  return request({
+    url: 'business/marketingActivity/cardValueRecord/selectListByZtDz',
+    method: 'get',
+    params: query
+  })
+}
 
 // 油品订单
 export function getDuiZhangOilListApi(query) {
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
index 68377980a..6aae3dfab 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/int.vue
@@ -122,8 +122,15 @@
             </el-table-column>
           </el-table-column>
           <el-table-column prop="mchntCd" align="center" label="支付通道">
+            <template slot-scope="scope">
+              {{scope.row.mchntCd ? scope.row.mchntCd : '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="paymentChannel" align="center" label="商户号编号" width="150">
+            <template slot-scope="scope">
+              {{scope.row.paymentChannel ? scope.row.paymentChannel : '--'}}
+            </template>
           </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编号" width="150"> </el-table-column>
           <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
           <el-table-column prop="updateTime" align="center" label="订单完成时间" ></el-table-column>
         </el-table>
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
index 8bc09f1ba..ea9f4f89c 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/oil.vue
@@ -117,8 +117,15 @@
             <el-table-column prop="oilNum" align="center" label="升数" > </el-table-column>
           </el-table-column>
           <el-table-column prop="mchntCd" align="center" label="支付通道">
+            <template slot-scope="scope">
+              {{scope.row.mchntCd ? scope.row.mchntCd : '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
+            <template slot-scope="scope">
+              {{scope.row.paymentChannel ? scope.row.paymentChannel : '--'}}
+            </template>
           </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
           <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
           <el-table-column prop="payTime" align="center" label="订单完成时间" >
             <template slot-scope="scope">
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
index 302ee9da7..b83d3d325 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/store.vue
@@ -115,8 +115,15 @@
             <el-table-column prop="goodsNum" align="center" label="数量" > </el-table-column>
           </el-table-column>
           <el-table-column prop="mchntCd" align="center" label="支付通道">
+            <template slot-scope="scope">
+              {{scope.row.mchntCd ? scope.row.mchntCd : '--'}}
+            </template>
+          </el-table-column>
+          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
+            <template slot-scope="scope">
+              {{scope.row.paymentChannel ? scope.row.paymentChannel : '--'}}
+            </template>
           </el-table-column>
-          <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150"> </el-table-column>
           <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
           <el-table-column prop="payTime" align="center" label="订单完成时间" >
             <template slot-scope="scope">
diff --git a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
index 5872344a1..8c09f733b 100644
--- a/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
+++ b/fuintAdmin_zt/src/views/financialStatement/jiaoyiduizhang/tab/vip.vue
@@ -14,7 +14,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="" style="width: 180px">
-          <el-input placeholder="会员手机号" v-model="queryParams.orderNo"></el-input>
+          <el-input placeholder="会员手机号" v-model="queryParams.mobile"></el-input>
         </el-form-item>
         <el-form-item label="" prop="payChannel" style="width: 180px">
           <el-select
@@ -27,12 +27,12 @@
             <el-option label="小程序" value="applet"/>
             <el-option label="收银台" value="cashier"/>
             <el-option label="POS端" value="POS"/>
-            <el-option label="其他" value="PC"/>
+            <el-option label="PC" value="PC"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="payType" style="width: 180px">
+        <el-form-item label="" prop="paymentType" style="width: 180px">
           <el-select
-            v-model="queryParams.payType"
+            v-model="queryParams.paymentType"
             clearable
             placeholder="支付方式"
           >
@@ -42,16 +42,15 @@
             <el-option label="余额" value="balance"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="" prop="status" style="width: 180px">
+        <el-form-item label="" prop="payStatus" style="width: 180px">
           <el-select
-            v-model="queryParams.status"
+            v-model="queryParams.payStatus"
             clearable
             placeholder="订单状态"
           >
             <el-option label="支付成功" value="paid"/>
-            <el-option label="待支付" value="unpaid"/>
-            <el-option label="退款失败" value="refund"/>
-            <el-option label="支付失败" value="payFail"/>
+            <el-option label="退款成功" value="refund"/>
+            <el-option label="支付失败" value="unpaid"/>
           </el-select>
         </el-form-item>
         <el-form-item label="">
@@ -86,8 +85,8 @@
           style="width: 100%">
           <el-table-column type="index" width="50" align="center" label="序号"/>
           <el-table-column prop="storeName" align="center" label="机构名称"> </el-table-column>
-          <el-table-column prop="orderNo" align="center" label="订单号" > </el-table-column>
-          <el-table-column prop="payAmount" align="center" label="订单金额（元）"></el-table-column>
+          <el-table-column prop="paymentNo" align="center" label="订单号" > </el-table-column>
+          <el-table-column prop="bidBalance" align="center" label="订单金额（元）"></el-table-column>
           <el-table-column prop="payChannel" align="center" label="订单类型">
             <template slot-scope="scope">
               <span v-if="scope.row.payChannel=='cashier'">收银台</span>
@@ -97,19 +96,19 @@
               <span v-else>其他</span>
             </template>
           </el-table-column>
-          <el-table-column prop="payType" align="center" label="支付方式">
+          <el-table-column prop="paymentType" align="center" label="支付方式">
             <template slot-scope="scope">
-              <span v-if="scope.row.payType=='CASH'">现金</span>
-              <span v-else-if="scope.row.payType=='WECHAT'">微信</span>
-              <span v-else-if="scope.row.payType=='ALIPAY'">支付宝</span>
+              <span v-if="scope.row.paymentType=='CASH'">现金</span>
+              <span v-else-if="scope.row.paymentType=='WECHAT'">微信</span>
+              <span v-else-if="scope.row.paymentType=='ALIPAY'">支付宝</span>
               <span v-else="">余额</span>
             </template>
           </el-table-column>
-          <el-table-column prop="status" align="center" label="订单状态">
+          <el-table-column prop="payStatus" align="center" label="订单状态">
             <template slot-scope="scope">
-              <el-tag v-if="scope.row.status == 'unpaid'">待支付</el-tag>
-              <el-tag type="success" v-else-if="scope.row.status == 'paid'">支付成功</el-tag>
-              <el-tag type="danger" v-else-if="scope.row.status == 'refund'">退款成功</el-tag>
+              <el-tag v-if="scope.row.payStatus == 'unpaid'">待支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">支付成功</el-tag>
+              <el-tag type="danger" v-else-if="scope.row.payStatus == 'refund'">退款成功</el-tag>
               <el-tag type="danger" v-else>支付失败</el-tag>
             </template>
           </el-table-column>
@@ -132,13 +131,13 @@
           <el-table-column prop="paymentChannel" align="center" label="商户号编码" width="150">
 
             <template slot-scope="scope">
-              {{scope.row.mchntCd?scope.row.paymentChannel:'--'}}
+              {{scope.row.paymentChannel?scope.row.paymentChannel:'--'}}
 
             </template></el-table-column>
           <el-table-column prop="createTime" align="center" label="订单创建时间" > </el-table-column>
-          <el-table-column prop="payTime" align="center" label="订单完成时间" >
+          <el-table-column prop="updateTime" align="center" label="订单完成时间" >
             <template slot-scope="scope">
-              <span v-if="scope.row.payTime">{{scope.row.payTime}}</span>
+              <span v-if="scope.row.updateTime">{{scope.row.updateTime}}</span>
               <span v-else>--</span>
             </template>
           </el-table-column>
@@ -159,7 +158,7 @@
 
 <script>
 
-import {getDuiZhangVipListApi, getVipListApi} from "@/api/financialStatement/jiaoyiduizhang";
+import {getDuiZhangVipListApi1, getVipListApi} from "@/api/financialStatement/jiaoyiduizhang";
 import {getRunningWaterByTissueApi} from "@/api/allOrder";
 
   export default {
@@ -239,7 +238,7 @@ import {getRunningWaterByTissueApi} from "@/api/allOrder";
           dateRange.push(this.beginTime.toLocaleDateString())
           dateRange.push(this.endTime.toLocaleDateString())
         }
-        getDuiZhangVipListApi(this.addDateRange(this.queryParams,dateRange)).then( response => {
+        getDuiZhangVipListApi1(this.addDateRange(this.queryParams,dateRange)).then( response => {
           this.orderList = response.data.records;
           this.total = response.data.total;
           this.isSysDate = false
diff --git a/fuintAdmin_zt/src/views/system/notify/page/mode.vue b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
index bf58afe30..1140d3a68 100644
--- a/fuintAdmin_zt/src/views/system/notify/page/mode.vue
+++ b/fuintAdmin_zt/src/views/system/notify/page/mode.vue
@@ -85,7 +85,7 @@
 
     </div>
 
-    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="32%" append-to-body>
+    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="40%" append-to-body>
       <el-form :model="form" ref="form" :rules="rules" label-width="120px">
         <!-- 通知名称 -->
         <el-form-item label="通知名称" prop="notificationName" style="margin-left: -30px;">
@@ -128,19 +128,28 @@
         <!-- 发送条件 -->
         <el-form-item label="发送条件" style="margin-bottom: 10px; margin-left: -30px;"  prop="conditions">
           <div v-for="(condition, index) in form.conditions" :key="index" class="condition-group" style="margin-bottom: 10px">
-            <el-select v-model="condition.field" placeholder="请选择条件" style="width: 45%;margin-right: 10px" @change="changeField(index)">
+            <el-select v-model="condition.field" placeholder="请选择条件" style="width: 30%;" @change="changeField(index)">
               <el-option label="系统到期日期" value="系统到期日期"></el-option>
               <el-option label="剩余交易量" value="剩余交易量"></el-option>
               <el-option label="系统服务费统计" value="系统服务费统计"></el-option>
               <!-- 添加其他选项 -->
             </el-select>
-<!--            <el-select v-if="condition.field == '系统到期日期'" v-model="condition.operator" placeholder="请选择" style="width: 100px;margin-right: 10px">-->
-<!--              <el-option label="当日日期" value="当日日期"></el-option>-->
-<!--              <el-option label="大于" value="大于"></el-option>-->
-<!--              <el-option label="小于" value="小于"></el-option>-->
-<!--              &lt;!&ndash; 添加其他选项 &ndash;&gt;-->
-<!--            </el-select>-->
-            <el-input v-model="condition.value" placeholder="请输入数值" style="width: 45%;margin-right: 10px">
+           <el-select v-model="condition.operator" style="width: 10%; margin-left: 10px;">
+             <el-option label=">" value=">"></el-option>
+             <el-option label="=" value="="></el-option>
+             <el-option label="<" value="<"></el-option>
+             <el-option label="-" value="-"></el-option>
+           </el-select>
+           <el-select v-if="condition.field == '系统到期日期'" v-model="condition.operator1" style="width: 15%; margin-left: 10px;">
+             <el-option label="当前日期" value="当前日期"></el-option>
+           </el-select>
+           <el-select v-if="condition.field == '系统到期日期'" v-model="condition.operator2" style="width: 10%; margin-left: 10px;">
+             <el-option label=">" value=">"></el-option>
+             <el-option label="=" value="="></el-option>
+             <el-option label="<" value="<"></el-option>
+             <el-option label="-" value="-"></el-option>
+           </el-select>
+            <el-input v-model="condition.value" placeholder="请输入数值" style="width: 25%; margin-left: 10px;">
               <template slot="append">{{ condition.field === '剩余交易量' || condition.field === '系统服务费统计' ? '万元' : '天' }}</template>
             </el-input>
             <!-- <el-button @click="removeCondition(index)" type="danger" icon="el-icon-delete" circle></el-button> -->
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
index 0d3859445..faca07934 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/IntegralOrdersMapper.java
@@ -50,7 +50,7 @@ public interface IntegralOrdersMapper {
     IPage<IntegralOrdersVO> queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
     IPage<IntegralOrdersVO> queryByBuy(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders);
     IPage<IntegralOrdersVO>  queryByPageFenxiByZtDz(@Param("page") Page page, @Param("order") IntegralOrdersDTO integralOrders);
-IntegralOrdersVO  getInfoByStoreId(@Param("integralOrders") IntegralOrdersDTO integralOrders);
+    IntegralOrdersVO  getInfoByStoreId(@Param("order") IntegralOrdersDTO integralOrders);
     Map<String, String> getIntFenxiDataByZtDz(@Param("order") IntegralOrdersDTO integralOrders);
 
     /**
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
index 984bb1de6..6775ec75c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralOrdersMapper.xml
@@ -723,7 +723,14 @@
                sum(io.integral)             integralBy
         from integral_orders io
                  left join integral_gift ig on io.gift_id = ig.id
-
+        <where>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(io.create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(io.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
         group by io.gift_id limit 1
     </select>
     <!--    where-->
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
index 47848aded..9e55bfad9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
@@ -194,9 +194,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
                 record.setStoreName(mtStore.getName());
             }
             IntegralOrdersVO infoByStoreId = integralOrdersDao.getInfoByStoreId(integralOrders);
-            if (ObjectUtil.isNotEmpty(
-                    infoByStoreId
-            )) {
+            if (ObjectUtil.isNotEmpty(infoByStoreId)) {
                 record.setGiftName(infoByStoreId.getGiftName());
                 record.setExchangeQuantityBy(infoByStoreId.getExchangeQuantityBy());
                 record.setPaidInfoBy(infoByStoreId.getPaidInfoBy());
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
index 601c53cb1..e119fbefb 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
@@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardValue.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFule.vo.CardValueConditionVo;
 import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
@@ -10,6 +11,7 @@ import com.fuint.business.marketingActivity.cardValue.dto.SelectCard;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
 import com.fuint.business.order.entity.LJOrder;
+import com.fuint.business.order.entity.OilOrder;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.framework.web.BaseController;
@@ -73,6 +75,15 @@ public class CardValueRecordController extends BaseController {
         return getSuccessResult(this.cardValueRecordService.selectCardValueRecordList(page, cardValueRecord));
     }
 
+    @GetMapping("/selectListByZtDz")
+    public ResponseObject selectListByZtDz(CardValueRecord order,
+                                                   @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<CardValueRecord> list = cardValueRecordService.selectListByZtDz(page,order);
+        return getSuccessResult(list);
+    }
+
     /**
      *导出订单
      *@paramresponse
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
index 51da48fa2..2dad331b3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/entity/CardValueRecord.java
@@ -2,6 +2,7 @@ package com.fuint.business.marketingActivity.cardValue.entity;
 
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -94,6 +95,15 @@ public class CardValueRecord extends Model<CardValueRecord> {
     //赠送优惠卷的主键
     private String couponIds;
 
+    @TableField(exist = false)
+    private Long deptId;
+
+    @TableField(exist = false)
+    private List<Long> storeIds;
+
+    @TableField(exist = false)
+    private String StoreName;
+
 
     /** 请求参数 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
index 92a779d74..b11b88b5c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
@@ -48,5 +48,7 @@ public interface CardValueRecordMapper extends BaseMapper<CardValueRecord> {
 
     List getCardValueByCardValueId(@Param("cardValueConditionVo") CardValueConditionVo cardValueConditionVo,
     @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+    IPage<CardValueRecord> selectListByZtDz(Page page, @Param("order") CardValueRecord order);
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
index 3b1037a14..f01aa23f2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
@@ -387,6 +387,39 @@
            and <![CDATA[update_time>=#{startTime} and pdate_time<=#{endTime}]]>
         </if>
     </select>
+    <select id="selectListByZtDz"
+            resultType="com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord">
+        select
+        *
+        from card_value_record
+        <where>
+            <if test="order.storeIds != null">
+                and store_id in
+                <foreach collection="order.storeIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="order.mobile != null and order.mobile != ''">
+                and mobile = #{order.mobile}
+            </if>
+            <if test="order.payChannel != null and order.payChannel != ''">
+                and pay_channel = #{order.payChannel}
+            </if>
+            <if test="order.paymentType != null and order.paymentType != ''">
+                and payment_type = #{order.paymentType}
+            </if>
+            <if test="order.payStatus != null and order.payStatus != ''">
+                and pay_status = #{order.payStatus}
+            </if>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(create_time,'%y%m%d') &gt;= date_format(#{order.params.beginTime},'%y%m%d')
+            </if>
+            <if test="order.params.endTime != null and order.params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+            order by create_time desc
+        </where>
+    </select>
 </mapper>
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
index d1516a721..e363e9ec9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
@@ -12,6 +12,7 @@ import com.fuint.business.marketingActivity.cardValue.dto.SelectCard;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.member.entity.LJStaff;
 import com.fuint.business.order.entity.CashierOrder;
+import com.fuint.business.order.entity.OilOrder;
 import com.fuint.business.petrolStationManagement.entity.OilGun;
 import com.fuint.business.userManager.vo.LJUserVo;
 import io.lettuce.core.dynamic.annotation.Param;
@@ -119,4 +120,6 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
      * @return
      */
     Integer selectUserTotal1(LJUserVo user);
+
+    IPage<CardValueRecord> selectListByZtDz(Page page, CardValueRecord order);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
index c12c98df3..9c02cd7a0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
@@ -52,13 +52,15 @@ import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrd
 import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
 import com.fuint.business.member.entity.LJStaff;
 import com.fuint.business.member.service.ILJStaffService;
-import com.fuint.business.order.entity.AllOrderInfo;
-import com.fuint.business.order.entity.CardBalanceChange;
-import com.fuint.business.order.entity.CashierOrder;
-import com.fuint.business.order.entity.GrowthValueChange;
+import com.fuint.business.order.entity.*;
 import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.service.CardBalanceChangeService;
 import com.fuint.business.order.service.GrowthValueChangeService;
+import com.fuint.business.petrolStationManagement.entity.OilGun;
+import com.fuint.business.petrolStationManagement.entity.OilName;
+import com.fuint.business.petrolStationManagement.entity.OilTank;
+import com.fuint.business.store.entity.MtStore;
+import com.fuint.business.store.mapper.MtStoreMapper;
 import com.fuint.business.storeInformation.entity.LJStore;
 import com.fuint.business.storeInformation.service.ILJStoreService;
 import com.fuint.business.userManager.entity.LJUserGrade;
@@ -79,6 +81,7 @@ import com.fuint.common.util.RocketUtil;
 import com.fuint.common.util.TokenUtil;
 import com.fuint.repository.mapper.MtStaffMapper;
 import com.fuint.repository.model.MtStaff;
+import com.fuint.system.dept.mapper.SysDeptMapper;
 import io.lettuce.core.dynamic.annotation.Param;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.time.DateFormatUtils;
@@ -159,6 +162,10 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
     private LJUserGradeService userGradeService;
     @Autowired
     private MtUserFuelMapper mtUserFuelMapper;
+    @Autowired
+    private SysDeptMapper sysDeptMapper;
+    @Autowired
+    private MtStoreMapper mtStoreMapper;
 
     /**
      * 储值卡充值（新增）
@@ -1415,5 +1422,26 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         }
         return 0;
     }
+
+    @Override
+    public IPage<CardValueRecord> selectListByZtDz(Page page, CardValueRecord order) {
+        if (ObjectUtil.isEmpty(order.getDeptId())) {
+            AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+            order.setDeptId(nowAccountInfo.getDeptId());
+        }
+
+        List<Long> strings = sysDeptMapper.selectChildByDeptIdR(order.getDeptId());
+        List<Long> longs = mtStoreMapper.queryStoresByDeptIdsR(strings);
+        order.setStoreIds(longs);
+
+        IPage<CardValueRecord> OrderIPage = baseMapper.selectListByZtDz(page, order);
+        for (CardValueRecord record : OrderIPage.getRecords()) {
+            MtStore mtStore = mtStoreMapper.selectById(record.getStoreId());
+            if (ObjectUtil.isNotEmpty(mtStore)) {
+                record.setStoreName(mtStore.getName());
+            }
+        }
+        return OrderIPage;
+    }
 }