From e09841a85a5914b717eac0cfc07c8edfcbba1ea2 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Sat, 9 Dec 2023 15:23:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../member/userInfoOrder/balanceRecord.vue    | 114 +++++++++++++-----
 .../views/member/userInfoOrder/couponList.vue |  75 +++++++++---
 .../views/member/userInfoOrder/goodsOrder.vue |  43 +++++--
 .../views/member/userInfoOrder/oilOrder.vue   |  56 +++++++--
 .../member/userInfoOrder/pointsRecord.vue     |  35 ++++--
 .../controller/IntegralDetailController.java  |   9 ++
 .../controller/IntegralOrdersController.java  |   5 +
 .../integral/entity/IntegralDetail.java       |   2 +
 .../mapper/xml/IntegralDetailMapper.xml       |  13 +-
 .../mapper/xml/IntegralOrdersMapper.xml       |   6 +-
 .../service/IntegralDetailService.java        |   8 ++
 .../service/IntegralOrdersService.java        |   1 +
 .../impl/IntegralDetailServiceImpl.java       |   7 ++
 .../impl/IntegralOrdersServiceImpl.java       |   8 +-
 .../CardFavorableRecordController.java        |  17 +++
 .../mapper/CardFavorableRecordMapper.java     |   6 +
 .../mapper/xml/CardFavorableRecordMapper.xml  |  32 +++++
 .../service/CardFavorableRecordService.java   |   4 +
 .../impl/CardFavorableRecordServiceImpl.java  |  14 ++-
 .../vo/CardFavorableRecordVO.java             |  35 ++++++
 .../controller/CardFuelChangeController.java  |  12 +-
 .../cardFule/entity/CardFuelChange.java       |  18 ++-
 .../cardFule/mapper/CardFuelChangeMapper.java |   2 +
 .../mapper/xml/CardFuelChangeMapper.xml       |  21 ++++
 .../service/CardFuelChangeService.java        |   4 +
 .../impl/CardFuelChangeServiceImpl.java       |   9 ++
 .../cardFule/vo/CardFuelChangeVo.java         |   9 ++
 .../controller/CardValueRecordController.java |  11 ++
 .../mapper/CardValueRecordMapper.java         |   5 +
 .../mapper/xml/CardValueRecordMapper.xml      |  61 +++++++++-
 .../service/CardValueRecordService.java       |   4 +-
 .../impl/CardValueRecordServiceImpl.java      |  30 +++++
 .../vo/Excel/CardValueRecordExcel.java        |  59 +++++++++
 .../CardBalanceChangeController.java          |  34 ++++++
 .../controller/CashierOrderController.java    |  11 ++
 .../order/controller/LJOrderController.java   |  27 +++++
 .../order/controller/OilOrderController.java  |  27 +++++
 .../order/entity/CardBalanceChange.java       |  11 ++
 .../order/mapper/CardBalanceChangeMapper.java |   8 ++
 .../order/mapper/CashierOrderMapper.java      |   6 +
 .../business/order/mapper/LJOrderMapper.java  |   9 ++
 .../business/order/mapper/OilOrderMapper.java |   5 +
 .../mapper/xml/CardBalanceChangeMapper.xml    |  28 +++++
 .../order/mapper/xml/CashierOrderMapper.xml   |  42 +++++++
 .../order/mapper/xml/LJOrderMapper.xml        |  68 ++++++++++-
 .../order/mapper/xml/OilOrderMapper.xml       |  87 +++++++++++++
 .../service/CardBalanceChangeService.java     |   8 ++
 .../order/service/CashierOrderService.java    |   4 +
 .../order/service/LJOrderService.java         |   9 ++
 .../order/service/OilOrderService.java        |   6 +
 .../impl/CardBalanceChangeServiceImpl.java    |  13 ++
 .../service/impl/CashierOrderServiceImpl.java |  33 +++++
 .../service/impl/LJOrderServiceImpl.java      |  41 +++++++
 .../service/impl/OilOrderServiceImpl.java     |  36 ++++++
 .../order/vo/CardBalanceChangeVo.java         |   9 ++
 .../order/vo/Excel/CashierOrderExcel.java     |  63 ++++++++++
 .../business/order/vo/Excel/LJOrderExcel.java |  58 +++++++++
 .../order/vo/Excel/OilOrderExcel.java         |  55 +++++++++
 .../fuint/business/order/vo/LJOrderVo.java    |   9 ++
 .../fuint/business/order/vo/OilOrderVo.java   |   3 +
 .../com/fuint/common/dto/AccountInfo.java     |   1 +
 .../service/impl/AccountServiceImpl.java      |   3 +-
 .../pagesHome/myPointsOrder/myPointsOrder.vue |  36 +++++-
 gasStation-uni/pagesHome/order/order.vue      |   7 +-
 64 files changed, 1390 insertions(+), 102 deletions(-)
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelChangeVo.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/Excel/CardValueRecordExcel.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardBalanceChangeController.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardBalanceChangeVo.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/CashierOrderExcel.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/LJOrderExcel.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/OilOrderExcel.java
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java

diff --git a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
index 53538f8e6..ba920080c 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
@@ -5,49 +5,70 @@
       <el-radio-button label="literCard">升数卡记录</el-radio-button>
     </el-radio-group>
     <div v-if="tabPosition=='giftCard'">
-      <el-table ref="tables" v-loading="loading" :data="list">
-        <el-table-column prop="date" label="所属油站"/>
-        <el-table-column prop="date" label="变动账户"/>
-        <el-table-column prop="date" label="类型"/>
-        <el-table-column label="详细信息">
-          <el-table-column prop="name" label="变动金额"/>
-          <el-table-column prop="address" label="变动前余额"/>
-          <el-table-column prop="address" label="变动后余额"/>
+      <el-table ref="tables" v-loading="loading" :data="cardList">
+        <el-table-column align="center"  prop="storeName" label="所属油站"/>
+        <!-- <el-table-column prop="date" label="变动账户"/> -->
+        <el-table-column align="center"  prop="changeType" label="类型">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.changeType == 0">减少</el-tag>
+            <el-tag type="success" v-else>增加</el-tag>
+          </template>
         </el-table-column>
-        <el-table-column prop="date" label="订单号"/>
-        <el-table-column prop="date" label="描述"/>
-        <el-table-column prop="date" label="变动时间"/>
+        <el-table-column align="center"  label="详细信息">
+          <el-table-column align="center"  prop="balance" label="变动金额"/>
+          <el-table-column align="center"  prop="address" label="变动前余额">
+            <template slot-scope="scope">
+              <span>{{ scope.row.afterTheChange?scope.row.afterTheChange + scope.row.balance : '/'}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"  prop="afterTheChange" label="变动后余额">
+            <template slot-scope="scope">
+              <span>{{ scope.row.afterTheChange?scope.row.afterTheChange : '/'}}</span>
+            </template>
+          </el-table-column>
+
+        </el-table-column>
+        <el-table-column align="center"  prop="orderNo" label="订单号"/>
+        <el-table-column align="center"  prop="fromType" label="描述"/>
+        <el-table-column align="center"  prop="createTime" label="变动时间"/>
       </el-table>
 
       <pagination
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        :total="cardTotal"
+        :page.sync="queryCardParams.page"
+        :limit.sync="queryCardParams.pageSize"
+        @pagination="getCardList"
       />
     </div>
     <div v-else>
-      <el-table ref="tables" v-loading="loading" :data="list">
-        <el-table-column label="所属油站" prop="id" align="center"/>
-        <el-table-column label="变动账户" align="center"/>
-        <el-table-column label="类型" align="center" prop="userNo"/>
-        <el-table-column label="变动升数" align="center" prop="name" />
-        <el-table-column label="订单号" align="center" prop="balance"/>
-        <el-table-column label="描述" align="center" prop="balance"/>
-        <el-table-column label="变动时间" align="center" prop="point"/>
+      <el-table ref="tables2" v-loading="loading" :data="fuelList">
+        <el-table-column align="center" label="所属油站" prop="storeName"/>
+        <el-table-column align="center" label="变动账户" prop="oilType" />
+        <el-table-column label="类型" align="center" prop="changeType">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.changeType == 0">减少</el-tag>
+            <el-tag type="success" v-else>增加</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="变动升数" align="center" prop="balance"/>
+        <el-table-column label="订单号" align="center" prop="orderNo"/>
+        <el-table-column label="描述" align="center" prop="fromType"/>
+        <el-table-column label="变动时间" align="center" prop="createTime"/>
       </el-table>
 
       <pagination
-        :total="total"
-        :page.sync="queryParams.page"
-        :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+        :total="fuelTotal"
+        :page.sync="queryFuelParams.page"
+        :limit.sync="queryFuelParams.pageSize"
+        @pagination="getFuelList"
       />
     </div>
   </div>
 </template>
 
 <script>
+import { getCardRecordList, getFuelRecordList } from "@/api/userInfoOrder.js";
+
 export default {
   props:["pUserId"],
   data(){
@@ -56,19 +77,50 @@ export default {
       userId:"",
       loading:false,
       list:[],
-      total:0,
-      queryParams:{
+      cardList:[],
+      fuelList:[],
+      cardTotal:0,
+      fuelTotal:0,
+      queryCardParams:{
+        page:1,
+        pageSize:10,
+      },
+      queryFuelParams:{
         page:1,
         pageSize:10,
       }
     }
   },
   created() {
-    this.userId = this.pUserId;
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getCardList()
+    this.getFuelList()
   },
   methods:{
-    getList(){
+    getCardList() {
+      this.loading = true
+      this.queryCardParams.userId = this.userId
+      getCardRecordList(this.queryCardParams).then(res=>{
+        if (res.code == 200) {
+          this.cardList = res.data.records
+          this.cardTotal = res.data.total
+          this.loading = false
+        }
+      })
+    },
 
+    getFuelList() {
+      this.loading = true
+      this.queryFuelParams.userId = this.userId
+      getFuelRecordList(this.queryFuelParams).then(res=>{
+        if (res.code == 200) {
+          this.fuelList = res.data.records
+          this.fuelTotal = res.data.total
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
index 256329965..ece3650f8 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/couponList.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-radio-group v-model="cardList" size="mini" style="margin-bottom: 30px;">
+    <el-radio-group v-model="cardList" size="mini" style="margin-bottom: 30px;" @change="changeStatus()">
       <el-radio-button label="notUse">未使用</el-radio-button>
       <el-radio-button label="used">已使用</el-radio-button>
       <el-radio-button label="expired">已过期</el-radio-button>
@@ -8,19 +8,36 @@
     </el-radio-group>
     <div>
       <el-table ref="tables" v-loading="loading" :data="list">
-        <el-table-column prop="date" label="所属油站"/>
-        <el-table-column prop="date" label="优惠券名称"/>
-        <el-table-column prop="date" label="卡券类型"/>
-        <el-table-column prop="date" label="满减金额"/>
-        <el-table-column prop="date" label="券面额"/>
-        <el-table-column prop="date" label="适用油品"/>
-        <el-table-column prop="date" label="状态"/>
-        <el-table-column label="卡券可用规则">
-          <el-table-column prop="name" label="有效期"/>
-          <el-table-column prop="address" label="周期与时段"/>
+        <el-table-column  align="center" prop="storeName" label="所属油站"/>
+        <el-table-column  align="center" prop="cardFavorableName" label="优惠券名称"/>
+        <el-table-column  align="center" prop="type" label="卡券类型">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.type == 0">油品券</el-tag>
+            <el-tag v-if="scope.row.type == 1" type="success">商品券</el-tag>
+            <el-tag v-if="scope.row.type == 2" type="warning">通用券</el-tag>
+          </template>
         </el-table-column>
-        <el-table-column prop="date" label="领取时间"/>
-        <el-table-column prop="date" label="描述"/>
+        <el-table-column align="center" prop="fullDeduction" label="满减金额"/>
+        <el-table-column align="center" prop="discountAmount" label="券面额"/>
+        <el-table-column align="center" prop="oilType" label="适用油品"/>
+        <el-table-column align="center" prop="status" label="状态">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.status == 0">未使用</el-tag>
+            <el-tag v-if="scope.row.status == 1" type="success">已使用</el-tag>
+            <el-tag v-if="scope.row.status == 2" type="warning">已过期</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="卡券可用规则">
+          <el-table-column align="center" prop="name" label="有效期">
+            <template slot-scope="scope">
+              {{ scope.row.startTime }}至{{ scope.row.endTime }}
+            </template>
+          </el-table-column>
+
+          <el-table-column align="center" prop="availablePeriod" label="周期与时段"/>
+        </el-table-column>
+        <el-table-column align="center" prop="createTime" label="领取时间"/>
+        <el-table-column align="center" prop="exchangeFrom" label="描述"/>
       </el-table>
 
       <pagination
@@ -34,6 +51,8 @@
 </template>
 
 <script>
+import { getCardFavorableList } from "@/api/userInfoOrder.js";
+
 export default {
   props:["pUserId"],
   data(){
@@ -44,17 +63,45 @@ export default {
       list:[],
       total:0,
       queryParams:{
+        status: 0,
         page:1,
         pageSize:10,
       }
     }
   },
   created() {
-    this.userId = this.pUserId;
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getList()
   },
   methods:{
+    
     getList(){
+      this.loading = true
 
+      this.queryParams.userId = this.userId
+      getCardFavorableList(this.queryParams).then(res=>{
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.total = res.data.total
+          this.loading = false
+
+        }
+      })
+    },
+    changeStatus() {
+      console.log("12312312312312312",this.cardList)
+      if (this.cardList == 'notUse') {
+        this.queryParams.status = 0
+      } else if (this.cardList == 'used') {
+        this.queryParams.status = 1
+      } else if (this.cardList == 'expired') {
+        this.queryParams.status = 2
+      } else {
+        this.queryParams.status = ''
+      }
+      this.getList()
     }
   }
 }
diff --git a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue
index 2223a9b31..d6df0677e 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/goodsOrder.vue
@@ -1,15 +1,23 @@
 <template>
   <div>
     <el-table ref="tables" v-loading="loading" :data="list">
-      <el-table-column label="所属油站" prop="id" align="center"/>
-      <el-table-column label="订单时间" align="center"/>
-      <el-table-column label="订单金额" align="center" prop="userNo"/>
-      <el-table-column label="商品数量" align="center" prop="name" />
-      <el-table-column label="储值卡" align="center" prop="mobile"/>
-      <el-table-column label="实付金额" align="center" prop="balance"/>
-      <el-table-column label="付款类型" align="center" prop="balance"/>
-      <el-table-column label="订单号" align="center" prop="balance"/>
-      <el-table-column label="订单类型" align="center" prop="point"/>
+      <el-table-column label="所属油站" prop="storeName" align="center"/>
+      <el-table-column label="订单时间"  prop="createTime" align="center"/>
+      <el-table-column label="订单金额" align="center" prop="amount"/>
+      <el-table-column label="商品数量" align="center" prop="goodsNum" />
+      <!-- <el-table-column label="储值卡" align="center" prop="mobile"/> -->
+      <el-table-column label="实付金额" align="center" prop="payAmount"/>
+      <el-table-column label="付款类型" align="center" prop="payType">
+        <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-else>{{ scope.row.payType }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column label="订单号" align="center" prop="orderNo"/>
+      <!-- <el-table-column label="订单类型" align="center" prop="point"/> -->
     </el-table>
 
     <pagination
@@ -22,6 +30,8 @@
 </template>
 
 <script>
+import { getMtOrderList } from "@/api/userInfoOrder.js";
+
 export default {
   props:["pUserId"],
   data(){
@@ -37,11 +47,22 @@ export default {
     }
   },
   created() {
-    this.userId = this.pUserId;
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getList()
   },
   methods:{
     getList(){
-
+      this.loading = true
+      this.queryParams.userId = this.userId
+      getMtOrderList(this.queryParams).then(res=>{
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.total = res.data.total
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue b/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue
index c57795e55..4c83d951e 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/oilOrder.vue
@@ -1,16 +1,35 @@
 <template>
   <div>
     <el-table ref="tables" v-loading="loading" :data="list">
-      <el-table-column label="所属油站" prop="id" align="center"/>
-      <el-table-column label="订单时间" align="center"/>
-      <el-table-column label="交易终端" align="center" prop="userNo"/>
-      <el-table-column label="油品/油枪" align="center" prop="name" />
-      <el-table-column label="订单金额" align="center" prop="mobile"/>
-      <el-table-column label="优惠金额" align="center" prop="gradeId"/>
-      <el-table-column label="实付金额" align="center" prop="balance"/>
-      <el-table-column label="付款类型" align="center" prop="balance"/>
-      <el-table-column label="订单号" align="center" prop="balance"/>
-      <el-table-column label="订单类型" align="center" prop="point"/>
+      <el-table-column label="所属油站" prop="storeName" align="center"/>
+      <el-table-column label="订单时间" align="center" prop="createTime"/>
+      <el-table-column label="交易终端" align="center" prop="payType">
+        <template slot-scope="scope">
+          <span v-if="scope.row.terminal == 'applet'">小程序</span>
+          <span v-else>{{ scope.row.terminal }}</span>
+          
+        </template>
+      </el-table-column>
+      <el-table-column label="油品/油枪" align="center" prop="name" >
+        <template slot-scope="scope">
+           {{ scope.row.oilGunNum }}/{{ scope.row.oilName }}
+        </template>
+      </el-table-column>
+
+      <el-table-column label="订单金额" align="center" prop="orderAmount"/>
+      <el-table-column label="优惠金额" align="center" prop="discountAmount"/>
+      <el-table-column label="实付金额" align="center" prop="payAmount"/>
+      <el-table-column label="付款类型" align="center" prop="payType">
+        <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-else>{{ scope.row.payType }}</span>
+          
+        </template>
+      </el-table-column>
+      <el-table-column label="订单号" align="center" prop="orderNo" width="220px"/>
+      <el-table-column label="订单类型" align="center" prop="orderType"/>
     </el-table>
 
     <pagination
@@ -23,6 +42,8 @@
 </template>
 
 <script>
+import { getOilOrderList } from "@/api/userInfoOrder.js";
+
 export default {
   props:["pUserId"],
   data(){
@@ -38,11 +59,22 @@ export default {
     }
   },
   created() {
-    this.userId = this.pUserId;
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getList()
   },
   methods:{
     getList(){
-
+      this.loading = true
+      this.queryParams.userId = this.userId
+      getOilOrderList(this.queryParams).then(res=>{
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.total = res.data.total
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue
index 1265e0801..768c97f82 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/pointsRecord.vue
@@ -1,11 +1,19 @@
 <template>
   <div>
     <el-table ref="tables" v-loading="loading" :data="list">
-      <el-table-column label="所属油站" prop="id" align="center"/>
-      <el-table-column label="变动时间" align="center"/>
-      <el-table-column label="类型" align="center" prop="userNo"/>
-      <el-table-column label="变动积分" align="center" prop="name" />
-      <el-table-column label="描述" align="center" prop="balance"/>
+      <el-table-column label="所属油站" prop="storeName" align="center"/>
+      <el-table-column label="变动时间" prop="createTime" align="center"/>
+      <el-table-column label="类型" align="center" prop="changeType">
+        <template slot-scope="scope">
+
+          <el-tag v-if="scope.row.changeType == 0">减少</el-tag>
+          <el-tag type="success" v-else>增加</el-tag>
+          
+        </template>
+      </el-table-column>
+      <el-table-column label="变动积分" align="center" prop="pointsChange" />
+      <el-table-column label="变动后积分" align="center" prop="currentPoints" />
+      <el-table-column label="描述" align="center" prop="changeReason"/>
     </el-table>
 
     <pagination
@@ -18,6 +26,8 @@
 </template>
 
 <script>
+import { getIntegralDetailList } from "@/api/userInfoOrder.js";
+
 export default {
   props:["pUserId"],
   data(){
@@ -33,11 +43,22 @@ export default {
     }
   },
   created() {
-    this.userId = this.pUserId;
+    // this.userId = this.pUserId;
+    this.userId = this.$route.query.id;
+
+    this.getList()
   },
   methods:{
     getList(){
-
+      this.loading = true
+      this.queryParams.userId = this.userId
+      getIntegralDetailList(this.queryParams).then(res=>{
+        if (res.code == 200) {
+          this.list = res.data.records
+          this.total = res.data.total
+          this.loading = false
+        }
+      })
     }
   }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralDetailController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralDetailController.java
index 9715071ca..e6d76efc8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralDetailController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralDetailController.java
@@ -52,6 +52,15 @@ public class IntegralDetailController extends BaseController {
         return getSuccessResult(iPageList);
     }
 
+    @GetMapping("queryByPageUni2")
+    public ResponseObject queryByPageUni2(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                         @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                         @Param("integralDetail") IntegralDetail integralDetail) {
+        Page page = new Page(pageNo, pageSize);
+        IPage< IntegralDetail> iPageList = this.integralDetailService.queryByPageUni2(page, integralDetail);
+        return getSuccessResult(iPageList);
+    }
+
     
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
index 45c90b98b..682e7b541 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
@@ -91,6 +91,11 @@ public class IntegralOrdersController extends BaseController {
         return getSuccessResult(this.integralOrdersService.update(integralOrders));
     }
 
+    @PutMapping("editUni")
+    public ResponseObject editUni(@RequestBody IntegralOrders integralOrders) {
+        return getSuccessResult(this.integralOrdersService.updateUni(integralOrders));
+    }
+
 //    /**
 //     * 处理发货  修改该快递单号
 //     * @param integralOrders
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java
index 645aa9e82..d05eddda6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/entity/IntegralDetail.java
@@ -39,6 +39,8 @@ public class IntegralDetail extends BaseEntity {
     private String changeReason;
 
     private String changeType;
+
+    private String storeName;
     /**
      * 店铺ID
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml
index fe9aa54ac..601c7888b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/mapper/xml/IntegralDetailMapper.xml
@@ -28,19 +28,20 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="IntegralDetailMap">
         select
-          id, user_id, points_change, current_points, type, change_reason, store_id, create_time, update_time, create_by, update_by,change_type
-        from integral_detail
+        ms.name storeName, id.id, id.user_id, id.points_change, id.current_points, id.type, id.change_reason, id.store_id, id.create_time, id.update_time, id.create_by, id.update_by,id.change_type
+        from integral_detail id
+        left join mt_store ms on  ms.id = id.store_id
+
         <where>
             <if test="integralDetail.chainStoreId != null">
-                and chain_store_id = #{integralDetail.chainStoreId}
+                and id.chain_store_id = #{integralDetail.chainStoreId}
             </if>
             <if test="integralDetail.storeId != null">
-                and store_id = #{integralDetail.storeId}
+                and id.store_id = #{integralDetail.storeId}
             </if>
             <if test="integralDetail.userId != null">
-                and user_id = #{integralDetail.userId}
+                and id.user_id = #{integralDetail.userId}
             </if>
-
         </where>
 
         order by create_time desc
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 bd5adcba4..58c85ca9e 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
@@ -192,11 +192,11 @@
             </if>
             <if test="integralOrders.params.endTime != null and integralOrders.params.endTime != ''">
                 and date_format(io.create_time,'%y%m%d') &lt;= date_format(#{integralOrders.params.endTime},'%y%m%d')
-            </if>
-            <if test="integralOrders.orderStatus != null and integralOrders.orderStatus != '' and integralOrders.orderStatus != 0 ">
+            </if> 
+            <if test="integralOrders.orderStatus != null and integralOrders.orderStatus != '' ">
                 and (
                 (#{integralOrders.orderStatus} = 1 and (io.order_status = '待处理' or io.order_status = '待发货' or io.order_status = '已发货')) or
-                (#{integralOrders.orderStatus} = 2 and (io.order_status = '已完成')) or
+                (#{integralOrders.orderStatus} = 2 and (io.order_status = '已完成' )) or
                 (#{integralOrders.orderStatus} = 3 and (io.order_status = '已退款' or io.order_status = '已拒绝')) or
                 (#{integralOrders.orderStatus} = 4 and io.order_status = '未支付')
                 )
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralDetailService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralDetailService.java
index 31d09cc00..cfb27d1a1 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralDetailService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralDetailService.java
@@ -32,6 +32,14 @@ public interface IntegralDetailService {
     IPage<IntegralDetail> queryByPage(@Param("page") Page page, IntegralDetail integralDetail);
     IPage<IntegralDetail> queryByPageUni(@Param("page") Page page, IntegralDetail integralDetail);
 
+    /**
+     * 后台段  个人统计使用  和上面的区别是获取token的storeId
+     * @param page
+     * @param integralDetail
+     * @return
+     */
+    IPage<IntegralDetail> queryByPageUni2(@Param("page") Page page, IntegralDetail integralDetail);
+
     /**
      * 新增数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
index ef068b7df..daf97514b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
@@ -55,6 +55,7 @@ public interface IntegralOrdersService {
      * @return 实例对象
      */
     IntegralOrders update(IntegralOrders integralOrders);
+    IntegralOrders updateUni(IntegralOrders integralOrders);
 
     /**
      * 通过主键删除数据
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java
index f0e064a66..ea3b3ea54 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralDetailServiceImpl.java
@@ -57,6 +57,13 @@ public class IntegralDetailServiceImpl implements IntegralDetailService {
         return this.integralDetailMapper.queryAllByLimit(page, integralDetail);
     }
 
+    @Override
+    public IPage<IntegralDetail> queryByPageUni2(@Param("page") Page page, IntegralDetail integralDetail) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        integralDetail.setStoreId(nowAccountInfo.getStoreId());
+        return this.integralDetailMapper.queryAllByLimit(page, integralDetail);
+    }
+
     /**
      * 新增数据
      *
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 100eb669e..5dd9fad20 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
@@ -86,7 +86,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
     public IPage<IntegralOrdersVO> queryByPageUni(@Param("page") Page page, @Param("integralOrders") IntegralOrdersDTO integralOrders) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
         integralOrders.setUserId(nowAccountInfo.getId());
-        return integralOrdersDao.queryAllByLimit(page, integralOrders);
+        return integralOrdersDao.queryByPageUni(page, integralOrders);
     }
     /**
      * 新增数据
@@ -116,6 +116,12 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
         return this.queryById(integralOrders.getId());
     }
 
+    @Override
+    public IntegralOrders updateUni(IntegralOrders integralOrders) {
+        this.integralOrdersDao.update(integralOrders);
+        return this.queryById(integralOrders.getId());
+    }
+
     /**
      * 通过主键删除数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
index 7a0d75a7b..0930e16b8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
@@ -44,6 +44,23 @@ public class CardFavorableRecordController extends BaseController {
         return getSuccessResult(this.cardFavorableRecordService.select(page,cardFavorableRecord));
     }
 
+
+    /**
+     * 分页查询所有数据( 根据用户id查询)
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param cardFavorableRecord
+     * @return
+     */
+    @GetMapping("getCardFavorableList")
+    public ResponseObject getCardFavorableList(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
+                                    @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                    @Param("cardFuelDiesel") CardFavorableRecord cardFavorableRecord) {
+        Page page = new Page(pageNo, pageSize);
+        return getSuccessResult(this.cardFavorableRecordService.getCardFavorableList(page,cardFavorableRecord));
+    }
+
     /**
      * 通过主键查询单条数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
index c8254584e..0db22f768 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/CardFavorableRecordMapper.java
@@ -1,7 +1,10 @@
 package com.fuint.business.marketingActivity.cardFavorable.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord;
+import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO;
 import org.apache.ibatis.annotations.Param;
 import java.util.HashMap;
 
@@ -18,5 +21,8 @@ public interface CardFavorableRecordMapper extends BaseMapper<CardFavorableRecor
      */
     HashMap<String,Integer> selectTotal(@Param("storeId")Integer storeId,@Param("id")Integer id);
 
+
+    IPage<CardFavorableRecordVO> getCardFavorableList(@Param("page")Page page,@Param("cardFavorableRecord") CardFavorableRecord cardFavorableRecord);
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
index eb676e16b..d913983ce 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/mapper/xml/CardFavorableRecordMapper.xml
@@ -22,5 +22,37 @@
         where store_id = #{storeId}
           and card_favorable_id = #{id}
     </select>
+    <select id="getCardFavorableList"
+            resultType="com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO">
+        select
+            ms.`name` storeName,
+            cf.name cardFavorableName,
+            cf.type type,
+            cf.full_deduction fullDeduction,
+            cf.discount_amount discountAmount,
+            cf.oil_type oilType,
+            cf.available_period availablePeriod,
+            cfr.status status,
+            cfr.start_time startTime,
+            cfr.end_time endTime,
+            cfr.create_time createTime,
+            cfr.exchange_from exchangeFrom
+        FROM
+            card_favorable_record cfr
+                left join card_favorable cf ON cfr.card_favorable_id = cf.id
+                left join mt_store ms on  ms.id = cfr.store_id
+        <where>
+            <if test="cardFavorableRecord.storeId != null">
+                and cfr.store_id = #{cardFavorableRecord.storeId}
+            </if>
+            <if test="cardFavorableRecord.mtUserId != null">
+                and cfr.mt_user_id = #{cardFavorableRecord.mtUserId}
+            </if>
+            <if test="cardFavorableRecord.status != null">
+             and cfr.status = #{cardFavorableRecord.status}
+            </if>
+        </where>
+        order by cfr.create_time DESC
+    </select>
 </mapper>
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
index ce1deec1d..fca3063fa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord;
+import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO;
 
 import java.io.Serializable;
 import java.util.Map;
@@ -24,6 +25,9 @@ public interface CardFavorableRecordService extends IService<CardFavorableRecord
      */
     IPage select(Page page, CardFavorableRecord cardFavorableRecord);
 
+
+    IPage<CardFavorableRecordVO> getCardFavorableList(Page page, CardFavorableRecord cardFavorableRecord);
+
     /**
      * 统计优惠券数量
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
index e7df6810e..5aa184c39 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
@@ -8,6 +8,7 @@ import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorable;
 import com.fuint.business.marketingActivity.cardFavorable.mapper.CardFavorableRecordMapper;
 import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord;
 import com.fuint.business.marketingActivity.cardFavorable.service.CardFavorableRecordService;
+import com.fuint.business.marketingActivity.cardFavorable.vo.CardFavorableRecordVO;
 import com.fuint.common.util.TokenUtil;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.stereotype.Service;
@@ -66,9 +67,16 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
         return page1;
     }
 
-    /**
-     * 统计优惠券使用数量
-     */
+
+    @Override
+    public IPage<CardFavorableRecordVO> getCardFavorableList(Page page, CardFavorableRecord cardFavorableRecord) {
+        return cardFavorableRecordMapper.getCardFavorableList(page,cardFavorableRecord);
+    }
+
+
+        /**
+         * 统计优惠券使用数量
+         */
     /**
      *
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
new file mode 100644
index 000000000..82bdf9a8a
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
@@ -0,0 +1,35 @@
+package com.fuint.business.marketingActivity.cardFavorable.vo;
+
+import com.fuint.business.marketingActivity.cardFavorable.entity.CardFavorableRecord;
+import lombok.Data;
+
+@Data
+public class CardFavorableRecordVO extends CardFavorableRecord {
+    private String storeName;
+    /**
+     * 优惠券名称
+     */
+    private String cardFavorableName;
+    /**
+     * 优惠券类型
+     */
+    private String type;
+    /**
+     * 满减金额
+     */
+    private String fullDeduction;
+    /**
+     * 优惠金额
+     */
+    private String discountAmount;
+    /**
+     * 可用时段
+     *
+     */
+    private String availablePeriod;
+    /**
+     * 可用油品
+     */
+    private String oilType;
+    private String oilName;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelChangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelChangeController.java
index e61cca79e..646848a5c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelChangeController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/controller/CardFuelChangeController.java
@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFule.entity.CardFuelChange;
 import com.fuint.business.marketingActivity.cardFule.service.CardFuelChangeService;
+import com.fuint.business.marketingActivity.cardFule.vo.CardFuelChangeVo;
+import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import org.springframework.web.bind.annotation.*;
@@ -42,8 +45,15 @@ public class CardFuelChangeController extends BaseController {
         IPage< CardFuelChange> iPageList = this.cardFuelChangeService.queryByPage(page, cardFuelChange);
         return getSuccessResult(iPageList);
     }
-    
 
+    @GetMapping("getFuelRecordList")
+    public ResponseObject getFuelRecordList(CardFuelChange cardFuelChange,
+                                            @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                            @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<CardFuelChangeVo> list = cardFuelChangeService.getFuelRecordList(page,cardFuelChange);
+        return getSuccessResult(list);
+    }
 
     /**
      * 通过主键查询单条数据
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java
index 626dd585d..d397bf374 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/entity/CardFuelChange.java
@@ -41,10 +41,10 @@ public class CardFuelChange extends BaseEntity {
      * 油量变化值
      */
     private Double balance;
-    /**
-     * 创建时间
-     */
-    private Date createTime;
+//    /**
+//     * 创建时间
+//     */
+//    private Date createTime;
     /**
      * 创建人
      */
@@ -70,6 +70,16 @@ public class CardFuelChange extends BaseEntity {
      */
     private String unit;
 
+    /**
+     * 余额变化之后的值
+     */
+    private Double afterTheChange;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
 
 
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelChangeMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelChangeMapper.java
index fe2f7a1d4..8ec13006c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelChangeMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/CardFuelChangeMapper.java
@@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardFule.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFule.entity.CardFuelChange;
+import com.fuint.business.marketingActivity.cardFule.vo.CardFuelChangeVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
 import java.util.List;
@@ -31,6 +32,7 @@ public interface CardFuelChangeMapper {
      * @return 对象列表
      */
     IPage<CardFuelChange> queryAllByLimit(@Param("page") Page page, CardFuelChange cardFuelChange);
+    IPage<CardFuelChangeVo> getFuelRecordList(@Param("page") Page page,@Param("cardFuelChange")  CardFuelChange cardFuelChange);
 
     /**
      * 统计总行数
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml
index a79a6224f..0d3dc05e8 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelChangeMapper.xml
@@ -127,6 +127,27 @@
             </if>
         </where>
     </select>
+    <select id="getFuelRecordList"
+            resultType="com.fuint.business.marketingActivity.cardFule.vo.CardFuelChangeVo">
+        select
+            ms.name storeName,
+            cfc.oil_type oilType,
+            cfc.change_type changeType,
+            cfc.balance balance,
+            cfc.order_no orderNo,
+            cfc.from_type from_type,
+            cfc.create_time createTime
+        from card_fuel_change cfc
+                left join mt_store ms on  ms.id = cfc.store_id
+        <where>
+            <if test="cardFuelChange.userId != null">
+                and cfc.user_id = #{cardFuelChange.userId}
+            </if>
+            <if test="cardFuelChange.storeId != null">
+                and cfc.store_id = #{cardFuelChange.storeId}
+            </if>
+        </where>
+    </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java
index 299764613..5c6dc5ce5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/CardFuelChangeService.java
@@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardFule.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFule.entity.CardFuelChange;
+import com.fuint.business.marketingActivity.cardFule.vo.CardFuelChangeVo;
 import io.lettuce.core.dynamic.annotation.Param;
 
 
@@ -31,6 +32,9 @@ public interface CardFuelChangeService {
      */
     IPage<CardFuelChange> queryByPage(@Param("page") Page page, CardFuelChange cardFuelChange);
 
+
+    IPage<CardFuelChangeVo> getFuelRecordList(@Param("page") Page page, CardFuelChange cardFuelChange);
+
     /**
      * 新增数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java
index bc3d9b562..4d5b7f941 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelChangeServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.marketingActivity.cardFule.entity.CardFuelChange;
 import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelChangeMapper;
 import com.fuint.business.marketingActivity.cardFule.service.CardFuelChangeService;
+import com.fuint.business.marketingActivity.cardFule.vo.CardFuelChangeVo;
 import org.springframework.stereotype.Service;
 import com.fuint.common.util.TokenUtil;
 import io.lettuce.core.dynamic.annotation.Param;
@@ -50,6 +51,14 @@ public class CardFuelChangeServiceImpl implements CardFuelChangeService {
         return this.cardFuelChangeMapper.queryAllByLimit(page, cardFuelChange);
     }
 
+    @Override
+    public IPage<CardFuelChangeVo> getFuelRecordList(@Param("page") Page page, CardFuelChange cardFuelChange) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        cardFuelChange.setStoreId(nowAccountInfo.getStoreId());
+        return this.cardFuelChangeMapper.getFuelRecordList(page, cardFuelChange);
+    }
+
+
     /**
      * 新增数据
      *
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelChangeVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelChangeVo.java
new file mode 100644
index 000000000..f27f75f07
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/vo/CardFuelChangeVo.java
@@ -0,0 +1,9 @@
+package com.fuint.business.marketingActivity.cardFule.vo;
+
+import com.fuint.business.marketingActivity.cardFule.entity.CardFuelChange;
+import lombok.Data;
+
+@Data
+public class CardFuelChangeVo extends CardFuelChange {
+    private String storeName;
+}
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 e5974c845..38c787ece 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
@@ -16,6 +16,7 @@ import org.apache.ibatis.annotations.Param;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.io.Serializable;
 import java.util.List;
 
@@ -49,6 +50,16 @@ public class CardValueRecordController extends BaseController {
         return getSuccessResult(this.cardValueRecordService.page(page, new QueryWrapper<>(cardValueRecord)));
     }
 
+    /**
+     *导出订单
+     *@paramresponse
+     */
+    @PostMapping("exportExcel")
+    public void exportExcel(HttpServletResponse response,@RequestBody CardValueRecord cardValueRecord) {
+        this.cardValueRecordService.export(response, cardValueRecord);
+    }
+
+
     /**
      * 通过主键查询单条数据
      *
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 dd6e8c9a2..07bfe5cd9 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
@@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.integral.entity.IntegralDetail;
 import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
+import com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 储值充值表(CardValueRecord)表数据库访问层
  *
@@ -20,6 +23,8 @@ public interface CardValueRecordMapper extends BaseMapper<CardValueRecord> {
 
     IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, @Param("cardValueRecord")  CardValueRecordDTO cardValueRecord);
 
+    List<CardValueRecordExcel> selectListExport(@Param("cardValueRecord")  CardValueRecord cardValueRecord);
+
 
 }
 
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 f43bf0aaf..9daf6daf6 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
@@ -4,7 +4,26 @@
 
     <select id="selectCardRecord"
             resultType="com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO">
-
+        SELECT
+               mt_user_id mtUserId,
+               recharge_balance rechargeBalance,
+               gift_balance giftBalance,
+               create_time createTime,
+               chain_store_id chainStoreId,
+               store_id storeId
+        FROM card_value_record
+        <where>
+            <if test="cardValueRecord.mtUserId != null">
+                and mt_user_id = #{cardValueRecord.mtUserId}
+            </if>
+            <if test="cardValueRecord.storeId != null">
+                and store_id = #{cardValueRecord.storeId}
+            </if>
+            <if test="cardValueRecord.recordName != null">
+                and record_name = #{cardValueRecord.recordName}
+            </if>
+        </where>
+        ORDER BY createTime
     </select>
 
 
@@ -36,6 +55,46 @@
         </where>
         ORDER BY combined_result.createTime
     </select>
+    <select id="selectListExport"
+            resultType="com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel">
+        select
+            name name,
+            mobile mobile,
+            real_name realName,
+            staff_mobile staffMobile,
+            bid_balance bidBalance,
+            recharge_balance rechargeBalance,
+            gift_balance giftBalance,
+            payment_type paymentType,
+            CASE
+                WHEN pay_status = 'paid' THEN '已支付'
+                WHEN pay_status = 'payFail' THEN '支付失败'
+                WHEN pay_status = 'unpaid' THEN '未支付'
+                ELSE '未知'
+            END AS payStatus,
+            remark remark,
+            fringe_benefit fringeBenefit,
+            create_time createTime
+        FROM card_value_record
+        <where>
+            <if test="cardValueRecord.mtUserId != null">
+                and mt_user_id = #{cardValueRecord.mtUserId}
+            </if>
+            <if test="cardValueRecord.storeId != null">
+                and store_id = #{cardValueRecord.storeId}
+            </if>
+            <if test="cardValueRecord.mtStaffId != null">
+                and mt_staff_id = #{cardValueRecord.mtStaffId}
+            </if>
+            <if test="cardValueRecord.mobile != null">
+                and mobile = #{cardValueRecord.mobile}
+            </if>
+            <if test="cardValueRecord.paymentType != null">
+                and payment_type = #{cardValueRecord.paymentType}
+            </if>
+
+        </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 735bfb20c..ff622d826 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
@@ -9,6 +9,8 @@ import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.petrolStationManagement.entity.OilGun;
 import io.lettuce.core.dynamic.annotation.Param;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 储值充值表(CardValueRecord)表服务接口
  *
@@ -43,5 +45,5 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
 
     IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord);
 
-
+    void export(HttpServletResponse response, CardValueRecord cardValueRecord);
 }
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 edf506678..42f3ecc51 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
@@ -1,6 +1,7 @@
 package com.fuint.business.marketingActivity.cardValue.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO;
 import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
 import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
 import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
+import com.fuint.business.marketingActivity.cardValue.vo.Excel.CardValueRecordExcel;
 import com.fuint.business.order.entity.CardBalanceChange;
 import com.fuint.business.order.service.CardBalanceChangeService;
 import com.fuint.business.userManager.entity.LJUser;
@@ -33,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -288,6 +291,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
 
     @Override
     public IPage<CardValueRecordDTO> selectCardRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        cardValueRecord.setStoreId(nowAccountInfo.getStoreId());
         return this.cardValueRecordMapper.selectCardRecord(page, cardValueRecord);
     }
 
@@ -296,6 +301,31 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         return this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord);
     }
 
+    public void export(HttpServletResponse response, CardValueRecord cardValueRecord) {
+
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        cardValueRecord.setStoreId(storeId);
+        List<CardValueRecordExcel> cashierOrderExcels = baseMapper.selectListExport(cardValueRecord);
+
+        // 设置文件名字
+        String fileName = "订单"+System.currentTimeMillis() + ".xlsx";
+
+        // 设置响应头信息
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
+
+
+        try{
+            // 写入文件数据
+            EasyExcel.write(response.getOutputStream(), CardValueRecordExcel.class).sheet("download").doWrite(cashierOrderExcels);
+        }catch(Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
 
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/Excel/CardValueRecordExcel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/Excel/CardValueRecordExcel.java
new file mode 100644
index 000000000..a4594dc58
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/vo/Excel/CardValueRecordExcel.java
@@ -0,0 +1,59 @@
+package com.fuint.business.marketingActivity.cardValue.vo.Excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
+import lombok.Data;
+
+@Data
+public class CardValueRecordExcel {
+
+    @ExcelProperty("会员名称")
+    @ColumnWidth(15)
+    private String name;
+
+    @ExcelProperty("会员手机号")
+    @ColumnWidth(15)
+    private String mobile;
+
+    @ExcelProperty("操作人")
+    @ColumnWidth(15)
+    private String realName;
+
+    @ExcelProperty("操作人手机号")
+    @ColumnWidth(15)
+    private String staffMobile;
+
+    @ExcelProperty("储值卡面值")
+    @ColumnWidth(15)
+    private String bidBalance;
+
+    @ExcelProperty("储值卡实售金额")
+    @ColumnWidth(15)
+    private String rechargeBalance;
+
+    @ExcelProperty("储值卡赠送金额")
+    @ColumnWidth(15)
+    private String giftBalance;
+
+    @ExcelProperty("支付方式")
+    @ColumnWidth(15)
+    private String paymentType;
+
+    @ExcelProperty("支付状态")
+    @ColumnWidth(15)
+    private String payStatus;
+
+    @ExcelProperty("充值备注")
+    @ColumnWidth(15)
+    private String remark;
+
+    @ExcelProperty("附加福利")
+    @ColumnWidth(15)
+    private String fringeBenefit;
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(15)
+    private String createTime;
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardBalanceChangeController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardBalanceChangeController.java
new file mode 100644
index 000000000..9fb810e0d
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CardBalanceChangeController.java
@@ -0,0 +1,34 @@
+package com.fuint.business.order.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.entity.CashierOrder;
+import com.fuint.business.order.service.CardBalanceChangeService;
+import com.fuint.business.order.service.CashierOrderService;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
+import com.fuint.framework.web.BaseController;
+import com.fuint.framework.web.ResponseObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/business/CardBalanceChange")
+public class CardBalanceChangeController extends BaseController {
+
+    @Autowired
+    private CardBalanceChangeService cardBalanceChangeService;
+
+
+    @GetMapping("getCardRecordList")
+    public ResponseObject getCardRecordList(CardBalanceChange cardBalanceChange,
+                                          @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                          @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<CardBalanceChangeVo> list = cardBalanceChangeService.getCardRecordList(page,cardBalanceChange);
+        return getSuccessResult(list);
+    }
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java
index 75ebed37b..db15da2d4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java
@@ -9,6 +9,8 @@ import com.fuint.framework.web.ResponseObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 收银员订单信息 controller层
  */
@@ -34,6 +36,15 @@ public class CashierOrderController extends BaseController {
         return getSuccessResult(list);
     }
 
+    /**
+     * 导出订单
+     * @param response
+     */
+    @PostMapping("exportExcel")
+    public void exportExcel(HttpServletResponse response,@RequestBody CashierOrder order) {
+        this.cashierOrderService.export(response, order);
+    }
+
     /**
      * 根据id查询收银台订单详情
      * @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
index 1dc5cf0cf..84fd1ad4b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/LJOrderController.java
@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.LJOrder;
 import com.fuint.business.order.service.LJOrderService;
+import com.fuint.business.order.vo.LJOrderVo;
 import com.fuint.framework.web.BaseController;
 import com.fuint.framework.web.ResponseObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
 
 /**
@@ -37,6 +39,31 @@ public class LJOrderController extends BaseController {
         return getSuccessResult(list);
     }
 
+    /**
+     *导出订单
+     *@paramresponse
+     */
+    @PostMapping("exportExcel")
+    public void exportExcel(HttpServletResponse response,@RequestBody LJOrder order) {
+        this.orderService.export(response, order);
+    }
+
+    /**
+     * 个人订单查询
+     * @param order
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/getMtOrderList")
+    public ResponseObject getMtOrderList(LJOrder order,
+                               @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                               @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<LJOrderVo> list = orderService.getMtOrderList(page,order);
+        return getSuccessResult(list);
+    }
+
     /**
      * 根据订单号查询订单信息
      * @param map
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
index 247b0385c..6284d72b7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -37,6 +38,15 @@ public class OilOrderController extends BaseController {
         return getSuccessResult(list);
     }
 
+    /**
+     *导出订单
+     *@paramresponse
+     */
+    @PostMapping("exportExcel")
+    public void exportExcel(HttpServletResponse response, @RequestBody OilOrder order) {
+        this.orderService.export(response, order);
+    }
+
     /**
      * 根据userId查询会员订单信息
      * @param order
@@ -53,6 +63,23 @@ public class OilOrderController extends BaseController {
         return getSuccessResult(list);
     }
 
+
+    /**
+     * 根据userId查询会员订单信息 （传参）
+     * @param order
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/userOrders2")
+    public ResponseObject oilOrderList2(OilOrder order,
+                                       @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                       @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<OilOrderVo> list = orderService.selectOilOrderByUserId2(page,order);
+        return getSuccessResult(list);
+    }
+
     /**
      * 根据id查询油品订单信息
      * @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java
index 5bdd02eb8..28503dc2a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CardBalanceChange.java
@@ -51,5 +51,16 @@ public class CardBalanceChange extends BaseEntity implements Serializable {
      */
     private Double balance;
 
+    /**
+     * 余额变化之后的值
+     */
+    private Double afterTheChange;
+
+    /**
+     * 订单编号
+     */
+    private String orderNo;
+
+
 }
 
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java
index d8fb71634..6885058d4 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CardBalanceChangeMapper.java
@@ -1,7 +1,15 @@
 package com.fuint.business.order.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.entity.CashierOrder;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
+import org.apache.ibatis.annotations.Param;
 
 public interface CardBalanceChangeMapper extends BaseMapper<CardBalanceChange> {
+
+    IPage<CardBalanceChangeVo> getCardRecordList(@Param("page")Page page, @Param("cardBalanceChange") CardBalanceChange cardBalanceChange);
+
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java
index 07282b78c..229ac26e6 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/CashierOrderMapper.java
@@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.vo.CashierOrderVo;
+import com.fuint.business.order.vo.Excel.CashierOrderExcel;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 
 public interface CashierOrderMapper extends BaseMapper<CashierOrder> {
     /**
@@ -17,6 +20,9 @@ public interface CashierOrderMapper extends BaseMapper<CashierOrder> {
      */
     public IPage<CashierOrder> selectCashierOrderList(Page page, @Param("order") CashierOrder order);
 
+
+    List<CashierOrderExcel> selectCashierOrderListExport(@Param("order") CashierOrder order);
+
     /**
      * 根据id查询收银台订单详情
      * @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
index 76d1eec5e..4bdcd345e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/LJOrderMapper.java
@@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.LJOrder;
+import com.fuint.business.order.vo.Excel.LJOrderExcel;
+import com.fuint.business.order.vo.LJOrderVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 订单信息 Mapper层
  */
@@ -17,4 +21,9 @@ public interface LJOrderMapper extends BaseMapper<LJOrder> {
      * @return
      */
     public IPage<LJOrder> selectOrderList(Page page, @Param("order") LJOrder order);
+
+    List<LJOrderExcel> selectOrderListExcel(@Param("order") LJOrder order);
+
+
+    IPage<LJOrderVo> getMtOrderList(Page page, @Param("order") LJOrder order);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
index 5b6ac6f45..6b314aae3 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/OilOrderMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.OilOrder;
+import com.fuint.business.order.vo.Excel.OilOrderExcel;
 import com.fuint.business.order.vo.OilOrderVo;
 import org.apache.ibatis.annotations.Param;
 
@@ -22,6 +23,8 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
      */
     public IPage<OilOrder> selectOilOrderList(Page page, @Param("order") OilOrder order);
 
+    List<OilOrderExcel> selectOilOrderListExcel(@Param("order") OilOrder order);
+
     /**
      * 根据userid查询油品订单信息
      * @param page
@@ -30,6 +33,8 @@ public interface OilOrderMapper extends BaseMapper<OilOrder> {
      */
     public IPage<OilOrder> selectOilOrderByUserId(Page page, @Param("order") OilOrder order);
 
+    public IPage<OilOrderVo> selectOilOrderByUserId2(Page page, @Param("order") OilOrder order);
+
     /**
      * 根据订单号模糊查询油品订单信息
      * @param orderNo
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml
new file mode 100644
index 000000000..6bc3d4099
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CardBalanceChangeMapper.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuint.business.order.mapper.CardBalanceChangeMapper">
+
+    <select id="getCardRecordList" resultType="com.fuint.business.order.vo.CardBalanceChangeVo">
+        select
+            ms.name storeName,
+
+            cbc.change_type changeType,
+            cbc.from_type fromType,
+            cbc.after_the_change afterTheChange,
+            cbc.order_no orderNo,
+            cbc.from_type fromType,
+            cbc.create_time createTime,
+            cbc.balance balance
+        from
+            card_balance_change cbc
+                left join mt_store ms on  ms.id = cbc.store_id
+        <where>
+            <if test="cardBalanceChange.userId != null">
+                and cbc.user_id = #{cardBalanceChange.userId}
+            </if>
+            <if test="cardBalanceChange.storeId != null">
+                and cbc.store_id = #{cardBalanceChange.storeId}
+            </if>
+        </where>
+    </select>
+</mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
index 82c7d2acf..a4af2f285 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/CashierOrderMapper.xml
@@ -33,4 +33,46 @@
             where co.id = #{id};
     </select>
 
+
+
+    <select id="selectCashierOrderListExport" resultType="com.fuint.business.order.vo.Excel.CashierOrderExcel">
+        select
+            st.real_name realName,
+            st.mobile,
+            co.order_no orderNo,
+            co.amount amount,
+            co.pay_amount payAmount,
+            co.oil_order_amount oilOrderAmount,
+            co.goods_order_amount goodsOrderAmount,
+            co.pay_user payUser,
+            CASE
+                WHEN co.status = 'paid' THEN '已支付'
+                WHEN co.status = 'payFail' THEN '支付失败'
+                WHEN co.status = 'unpaid' THEN '未支付'
+            ELSE '未知'
+            END AS status,
+            co.pay_time payTime
+        from cashier_order co
+         left join mt_staff st on co.staff_id = st.id
+        <where>
+            co.store_id = #{order.storeId}
+            <if test="order.staffId != null and order.staffId != ''">
+                and co.staff_id = #{order.staffId}
+            </if>
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no like concat('%', #{order.orderNo}, '%')
+            </if>
+            <if test="order.terminal != null and order.terminal != ''">
+                and terminal like concat('%', #{order.terminal}, '%')
+            </if>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_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(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
+
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
index c5457bbe0..403748a37 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/LJOrderMapper.xml
@@ -29,4 +29,70 @@
             </if>
         </where>
     </select>
-</mapper>
\ No newline at end of file
+    <select id="getMtOrderList" resultType="com.fuint.business.order.vo.LJOrderVo">
+
+        select
+               ms.name storeName,
+            oo.create_time createTime,
+            oo.amount amount,
+            oo.pay_amount payAmount,
+            oo.goods_num goodsNum,
+            oo.pay_type payType,
+            oo.order_no orderNo
+         from mt_order oo
+          left join mt_store ms on  ms.id = oo.store_id
+        <where>
+            <if test="order.userId != null">
+                and oo.user_id = #{order.userId}
+            </if>
+            <if test="order.storeId != null">
+                and oo.store_id = #{order.storeId}
+            </if>
+        </where>
+
+    </select>
+    <select id="selectOrderListExcel" resultType="com.fuint.business.order.vo.Excel.LJOrderExcel">
+        select
+            st.real_name realName,
+            st.mobile,
+            oo.terminal terminal,
+            oo.order_no orderNo,
+            oo.amount amount,
+            oo.discount discount,
+            oo.goods_num goodsNum,
+            oo.pay_amount payAmount,
+            oo.pay_user payUser,
+            oo.pay_type payType,
+            oo.pay_time payTime,
+            CASE
+            WHEN oo.status = 'paid' THEN '已支付'
+            WHEN oo.status = 'payFail' THEN '支付失败'
+            WHEN oo.status = 'unpaid' THEN '未支付'
+            ELSE '未知'
+            END AS status
+        from mt_order oo
+        left join mt_staff st on oo.staff_id = st.id
+        <where>
+            oo.store_id = #{order.storeId}
+            <if test="order.staffId != null and order.staffId != ''">
+                and staff_id = #{order.staffId}
+            </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no like concat('%', #{order.orderNo}, '%')
+            </if>
+            <if test="order.payUser != null and order.payUser != ''">
+                and pay_user like concat('%', #{order.payUser}, '%')
+            </if>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(oo.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(oo.create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+</mapper>
+
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index ca9651b80..27c7aa752 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -76,4 +76,91 @@
         </where>
     </select>
 
+
+
+    <select id="selectOilOrderByUserId2" resultType="com.fuint.business.order.vo.OilOrderVo">
+        select
+          ms.name  storeName,
+          onu.oil_name  oilName,
+          oo.create_time  createTime,
+          oo.pay_type  payType,
+          oo.terminal  terminal,
+          oo.oil_gun_num  oilGunNum,
+          oo.order_amount  orderAmount,
+          oo.discount_amount  discountAmount,
+          oo.pay_amount  payAmount,
+          oo.pay_type  payType,
+          oo.order_no  orderNo,
+          oo.order_type  orderType
+        from oil_order oo
+         left join oil_name onu on oo.oils = onu.id
+         left join mt_store ms on  ms.id = oo.store_id
+        <where>
+            <if test="order.userId != null">
+                and user_id = #{order.userId}
+            </if>
+            <if test="order.storeId != null">
+                and store_id = #{order.storeId}
+            </if>
+        </where>
+    </select>
+
+    <select id="selectOilOrderListExcel" resultType="com.fuint.business.order.vo.Excel.OilOrderExcel">
+        select
+        st.real_name realName,
+        st.mobile,
+            co.terminal terminal,
+            onu.oil_name  oilName,
+            co.order_no orderNo,
+            CONCAT(onu.oil_name ,'/', co.oil_gun_num) oilGunNum,
+            co.order_amount orderAmount,
+            co.discount_amount discountAmount,
+            co.pay_amount payAmount,
+            co.pay_user payUser,
+            CASE
+                WHEN co.order_status = 'paid' THEN '已支付'
+                WHEN co.order_status = 'payFail' THEN '支付失败'
+                WHEN co.order_status = 'unpaid' THEN '未支付'
+                ELSE '未知'
+            END AS orderStatus,
+            co.invoicing invoicing,
+            co.pay_time payTime
+        from oil_order co
+        left join oil_name onu on co.oils = onu.id
+        left join mt_staff st on co.staff_id = st.id
+        <where>
+            co.store_id = #{order.storeId}
+            <if test="order.userId != null and order.userId != ''">
+                and user_id = #{order.userId}
+            </if>
+            <if test="order.staffId != null and order.staffId != ''">
+                and staff_id = #{order.staffId}
+            </if>
+            <if test="order.terminal != null and order.terminal != ''">
+                and terminal = #{order.terminal}
+            </if>
+            <if test="order.oilGunNum != null and order.oilGunNum != ''">
+                and oil_gun_num = #{order.oilGunNum}
+            </if>
+            <if test="order.payType != null and order.payType != ''">
+                and pay_type = #{order.payType}
+            </if>
+            <if test="order.orderStatus != null and order.orderStatus != ''">
+                and order_status != #{order.orderStatus}
+            </if>
+            <if test="order.orderNo != null and order.orderNo != ''">
+                and order_no like concat('%', #{order.orderNo}, '%')
+            </if>
+            <if test="order.payUser != null and order.payUser != ''">
+                and pay_user like concat('%', #{order.payUser}, '%')
+            </if>
+            <if test="order.params.beginTime != null and order.params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(pay_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(pay_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
+            </if>
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java
index 587cf9077..0b1a0718e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardBalanceChangeService.java
@@ -1,7 +1,11 @@
 package com.fuint.business.order.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.entity.CashierOrder;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
 
 public interface CardBalanceChangeService extends IService<CardBalanceChange> {
     /**
@@ -10,4 +14,8 @@ public interface CardBalanceChangeService extends IService<CardBalanceChange> {
      * @return
      */
     public int insertCardBalance(CardBalanceChange cardBalanceChange);
+
+
+    IPage<CardBalanceChangeVo> getCardRecordList(Page page, CardBalanceChange cardBalanceChange);
+
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java
index 9b75868b9..91a26d83e 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CashierOrderService.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.order.entity.CashierOrder;
 
+import javax.servlet.http.HttpServletResponse;
+
 /**
  * 收银员订单信息 业务层
  */
@@ -17,6 +19,8 @@ public interface CashierOrderService extends IService<CashierOrder> {
      */
     public IPage<CashierOrder> selectCashierOrderList(Page page, CashierOrder order);
 
+    void export(HttpServletResponse response, CashierOrder order);
+
     /**
      * 根据id查询商品订单信息
      * @param id
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
index 26f04aca4..ef4646c88 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/LJOrderService.java
@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fuint.business.order.entity.LJOrder;
+import com.fuint.business.order.vo.LJOrderVo;
+
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 订单信息 业务层
@@ -17,6 +20,12 @@ public interface LJOrderService extends IService<LJOrder> {
      */
     public IPage<LJOrder> selectOrderList(Page page, LJOrder order);
 
+    void export(HttpServletResponse response, LJOrder order);
+
+
+
+    public IPage<LJOrderVo> getMtOrderList(Page page, LJOrder order);
+
     /**
      * 根据订单号查询商品订单信息
      * @param orderNo
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
index b9c19bf5b..9d86561c5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
@@ -4,9 +4,11 @@ import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.entity.OilOrder;
 import com.fuint.business.order.vo.OilOrderVo;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +24,9 @@ public interface OilOrderService extends IService<OilOrder> {
      */
     public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order);
 
+    void export(HttpServletResponse response, OilOrder order);
+
+
     /**
      * 根据条件分页查询油品订单信息
      * @param page
@@ -29,6 +34,7 @@ public interface OilOrderService extends IService<OilOrder> {
      * @return
      */
     public IPage<OilOrder> selectOilOrderByUserId(Page page, OilOrder order);
+    public IPage<OilOrderVo> selectOilOrderByUserId2(Page page, OilOrder order);
 
     /**
      * 根据订单号查询油品订单信息
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
index 4a356109d..34a16e5b5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardBalanceChangeServiceImpl.java
@@ -1,9 +1,13 @@
 package com.fuint.business.order.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.mapper.CardBalanceChangeMapper;
 import com.fuint.business.order.service.CardBalanceChangeService;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
@@ -18,4 +22,13 @@ public class CardBalanceChangeServiceImpl extends ServiceImpl<CardBalanceChangeM
         int row = baseMapper.insert(cardBalanceChange);
         return row;
     }
+
+    @Override
+    public IPage<CardBalanceChangeVo> getCardRecordList(Page page, CardBalanceChange cardBalanceChange) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        cardBalanceChange.setStoreId(storeId);
+        IPage<CardBalanceChangeVo> cardBalanceChangeVoIPage = baseMapper.getCardRecordList(page, cardBalanceChange);
+        return cardBalanceChangeVoIPage;
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java
index e6f5c3f1e..d2ec0c260 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CashierOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.fuint.business.order.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,10 +9,16 @@ import com.fuint.business.order.entity.CashierOrder;
 import com.fuint.business.order.mapper.CashierOrderMapper;
 import com.fuint.business.order.service.CashierOrderService;
 import com.fuint.business.order.vo.CashierOrderVo;
+import com.fuint.business.order.vo.Excel.CashierOrderExcel;
+import com.fuint.business.petrolStationManagement.entity.OilTank;
+import com.fuint.business.petrolStationManagement.vo.OilTankExcel;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 @Service
 public class CashierOrderServiceImpl extends ServiceImpl<CashierOrderMapper, CashierOrder> implements CashierOrderService {
     @Override
@@ -23,6 +30,32 @@ public class CashierOrderServiceImpl extends ServiceImpl<CashierOrderMapper, Cas
         return cashierOrderIPage;
     }
 
+    public void export(HttpServletResponse response, CashierOrder order) {
+
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+        List<CashierOrderExcel> cashierOrderExcels = baseMapper.selectCashierOrderListExport(order);
+
+        // 设置文件名字
+        String fileName = "订单"+System.currentTimeMillis() + ".xlsx";
+
+        // 设置响应头信息
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
+
+
+        try{
+            // 写入文件数据
+            EasyExcel.write(response.getOutputStream(), CashierOrderExcel.class).sheet("download").doWrite(cashierOrderExcels);
+        }catch(Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+
     @Override
     public CashierOrder queryCashierOrder(int id) {
         CashierOrderVo cashierOrderVo = baseMapper.selectCashierOrderById(id);
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
index 68b8fb12d..81dd5ed38 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/LJOrderServiceImpl.java
@@ -1,5 +1,6 @@
 package com.fuint.business.order.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -11,11 +12,16 @@ import com.fuint.business.convenienceSore.service.StockTrackService;
 import com.fuint.business.order.entity.LJOrder;
 import com.fuint.business.order.mapper.LJOrderMapper;
 import com.fuint.business.order.service.LJOrderService;
+import com.fuint.business.order.vo.Excel.LJOrderExcel;
+import com.fuint.business.order.vo.LJOrderVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fuint.common.dto.AccountInfo;
 import com.fuint.common.util.TokenUtil;
 
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 @Service
 public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> implements LJOrderService {
     @Override
@@ -27,6 +33,41 @@ public class LJOrderServiceImpl extends ServiceImpl<LJOrderMapper, LJOrder> impl
         return ljOrderIPage;
     }
 
+    public void export(HttpServletResponse response, LJOrder order) {
+
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+        List<LJOrderExcel> lJOrderExcels = baseMapper.selectOrderListExcel(order);
+
+        // 设置文件名字
+        String fileName = "订单"+System.currentTimeMillis() + ".xlsx";
+
+        // 设置响应头信息
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
+
+
+        try{
+            // 写入文件数据
+            EasyExcel.write(response.getOutputStream(), LJOrderExcel.class).sheet("download").doWrite(lJOrderExcels);
+        }catch(Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    @Override
+    public IPage<LJOrderVo> getMtOrderList(Page page, LJOrder order) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+        IPage<LJOrderVo> ljOrderIPage = baseMapper.getMtOrderList(page, order);
+        return ljOrderIPage;
+    }
+
     @Override
     public LJOrder selectGoodsOrder(String orderNo) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index 1d1782265..2ffc4331f 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -1,6 +1,7 @@
 package com.fuint.business.order.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -16,6 +17,7 @@ import com.fuint.business.convenienceSore.service.LJGoodsService;
 import com.fuint.business.order.entity.*;
 import com.fuint.business.order.mapper.OilOrderMapper;
 import com.fuint.business.order.service.*;
+import com.fuint.business.order.vo.Excel.OilOrderExcel;
 import com.fuint.business.order.vo.OilOrderVo;
 import com.fuint.business.petrolStationManagement.entity.OilName;
 import com.fuint.business.petrolStationManagement.entity.OilNumber;
@@ -40,6 +42,7 @@ import com.fuint.system.config.service.SysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletResponse;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -75,6 +78,31 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         return oilOrderIPage;
     }
 
+    public void export(HttpServletResponse response, OilOrder order) {
+
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+        List<OilOrderExcel> cashierOrderExcels = baseMapper.selectOilOrderListExcel(order);
+
+        // 设置文件名字
+//        String fileName = "订单"+System.currentTimeMillis() + ".xlsx";
+
+        // 设置响应头信息
+        response.setContentType("application/vnd.ms-excel");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=demo.xlsx");
+
+
+        try{
+            // 写入文件数据
+            EasyExcel.write(response.getOutputStream(), OilOrderExcel.class).sheet("download").doWrite(cashierOrderExcels);
+        }catch(Exception e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public IPage<OilOrder> selectOilOrderByUserId(Page page, OilOrder order) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -83,6 +111,14 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         return iPage;
     }
 
+    @Override
+    public IPage<OilOrderVo> selectOilOrderByUserId2(Page page, OilOrder order) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        order.setStoreId(nowAccountInfo.getStoreId());
+        IPage<OilOrderVo> iPage = baseMapper.selectOilOrderByUserId2(page,order);
+        return iPage;
+    }
+
     @Override
     public OilOrder selectOilOrderByOrderNo(String orderNo) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardBalanceChangeVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardBalanceChangeVo.java
new file mode 100644
index 000000000..9632ce004
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardBalanceChangeVo.java
@@ -0,0 +1,9 @@
+package com.fuint.business.order.vo;
+
+import com.fuint.business.order.entity.CardBalanceChange;
+import lombok.Data;
+
+@Data
+public class CardBalanceChangeVo extends CardBalanceChange {
+    private String storeName;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/CashierOrderExcel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/CashierOrderExcel.java
new file mode 100644
index 000000000..ec98b511b
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/CashierOrderExcel.java
@@ -0,0 +1,63 @@
+package com.fuint.business.order.vo.Excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class CashierOrderExcel {
+    //    员工姓名
+    @ExcelProperty("员工姓名")
+    private String realName;
+    //    员工手机号
+    @ExcelProperty("员工手机号")
+    @ColumnWidth(15)
+    private String mobile;
+    /**
+     * 订单号
+     */
+    @ExcelProperty("订单号")
+    @ColumnWidth(15)
+    private String orderNo;
+    /**
+     *订单金额
+     */
+    @ExcelProperty("订单金额")
+    @ColumnWidth(15)
+    private String amount;
+    /**
+     *实付金额
+     */
+    @ExcelProperty("实付金额")
+    @ColumnWidth(15)
+    private String payAmount;
+    /**
+     * 油品金额
+     */
+    @ExcelProperty("油品金额")
+    @ColumnWidth(15)
+    private String oilOrderAmount;
+    /**
+     * 商品金额
+     */
+    @ExcelProperty("商品金额")
+    @ColumnWidth(15)
+    private String goodsOrderAmount;
+    /**
+     * 付款用户
+     */
+    @ExcelProperty("付款用户")
+    @ColumnWidth(15)
+    private String payUser;
+    /**
+     * 状态
+     */
+    @ExcelProperty("状态")
+    private String status;
+    /**
+     * 交易时间
+     */
+    @ExcelProperty("交易时间")
+    @ColumnWidth(20)
+    private String payTime;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/LJOrderExcel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/LJOrderExcel.java
new file mode 100644
index 000000000..1eec9f149
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/LJOrderExcel.java
@@ -0,0 +1,58 @@
+package com.fuint.business.order.vo.Excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class LJOrderExcel {
+
+    @ExcelProperty("员工姓名")
+    @ColumnWidth(15)
+    private String realName;
+
+    @ExcelProperty("员工手机号")
+    @ColumnWidth(15)
+    private String mobile;
+
+    @ExcelProperty("终端")
+    @ColumnWidth(15)
+    private String terminal;
+
+    @ExcelProperty("订单号")
+    @ColumnWidth(20)
+    private String orderNo;
+
+    @ExcelProperty("订单金额")
+    @ColumnWidth(15)
+    private String amount;
+
+    @ExcelProperty("优惠金额")
+    @ColumnWidth(15)
+    private String discount;
+
+    @ExcelProperty("商品数量")
+    @ColumnWidth(15)
+    private String goodsNum;
+
+    @ExcelProperty("实付金额")
+    @ColumnWidth(15)
+    private String payAmount;
+
+    @ExcelProperty("付款用户")
+    @ColumnWidth(15)
+    private String payUser;
+
+    @ExcelProperty("付款类型")
+    @ColumnWidth(15)
+    private String payType;
+
+    @ExcelProperty("交易时间")
+    @ColumnWidth(20)
+    private String payTime;
+
+    @ExcelProperty("支付状态")
+    @ColumnWidth(15)
+    private String status;
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/OilOrderExcel.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/OilOrderExcel.java
new file mode 100644
index 000000000..0b6767bd7
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/Excel/OilOrderExcel.java
@@ -0,0 +1,55 @@
+package com.fuint.business.order.vo.Excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class OilOrderExcel {
+    //    员工姓名
+    @ExcelProperty("员工姓名")
+    @ColumnWidth(15)
+    private String realName;
+    //    员工手机号
+    @ExcelProperty("员工手机号")
+    @ColumnWidth(15)
+    private String mobile;
+
+    @ExcelProperty("终端")
+    @ColumnWidth(15)
+    private String terminal;
+    @ExcelProperty("订单号")
+    @ColumnWidth(25)
+    private String orderNo;
+
+
+    @ExcelProperty(value = {"订单信息", "油品"})
+    @ColumnWidth(15)
+    private String oilGunNum;
+    @ExcelProperty(value = {"订单信息", "订单金额"})
+    @ColumnWidth(15)
+    private String orderAmount;
+    @ExcelProperty(value = {"订单信息", "优惠金额"})
+    @ColumnWidth(15)
+    private String discountAmount;
+
+
+    @ExcelProperty(value = {"付款信息", "实付金额"})
+    @ColumnWidth(15)
+    private String payAmount;
+    @ExcelProperty(value = {"付款信息", "付款用户"})
+    @ColumnWidth(15)
+    private String payUser;
+    @ExcelProperty(value = {"付款信息", "付款状态"})
+    @ColumnWidth(15)
+    private String orderStatus;
+
+
+    @ExcelProperty("开票标识")
+    @ColumnWidth(15)
+    private String invoicing ;
+    @ExcelProperty("交易时间")
+    @ColumnWidth(20)
+    private String payTime;
+
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java
new file mode 100644
index 000000000..244d0d1e0
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/LJOrderVo.java
@@ -0,0 +1,9 @@
+package com.fuint.business.order.vo;
+
+import com.fuint.business.order.entity.LJOrder;
+import lombok.Data;
+
+@Data
+public class LJOrderVo extends LJOrder {
+    private String storeName;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java
index 23db966af..f2808b01b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/OilOrderVo.java
@@ -7,4 +7,7 @@ import lombok.Data;
 public class OilOrderVo extends OilOrder {
 //    油品单价
     private Double oilPrice;
+    //
+    private String storeName;
+    private String oilName;
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountInfo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountInfo.java
index a8d0f9749..90f6dd580 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountInfo.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/dto/AccountInfo.java
@@ -30,6 +30,7 @@ public class AccountInfo  implements Serializable {
     private Integer merchantId;
     private String merchantName;
     private Integer storeId;
+    private Integer chainStoreId;
     private String storeName;
     private Integer staffId;
     //部门主键
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
index d3cf5ce6b..2d7eb6817 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/common/service/impl/AccountServiceImpl.java
@@ -160,10 +160,11 @@ public class AccountServiceImpl extends ServiceImpl<TAccountMapper, TAccount> im
                     accountInfo.setMerchantName(mtMerchant.getName());
                 }
             }
-            if (account.getStoreId() != null && account.getStoreId() > 0) {
+            if (account.getStoreId() != null && account.getStoreId() >= 0) {
                 MtStore mtStore = mtStoreMapper.selectById(account.getStoreId());
                 if (mtStore != null) {
                     accountInfo.setStoreName(mtStore.getName());
+                    accountInfo.setChainStoreId(mtStore.getChainStoreId());
                 }
             }
             return accountInfo;
diff --git a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
index 0bfc5966d..aea26303f 100644
--- a/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
+++ b/gasStation-uni/pagesHome/myPointsOrder/myPointsOrder.vue
@@ -33,17 +33,17 @@
 					</view>
 				</view>
 				<view class="goods-bottom" v-if="actinput == 1 ">
-					<view class="sh-anniu">
+					<view class="sh-anniu" @click="confirmTheReceipt(item.id)">
 						<text>确认收货</text>
 					</view>
 				</view>
 				<view class="goods-bottom" v-if="actinput == 2 ">
-					<view class="sh-anniu">
+					<view class="sh-anniu" @click="refund()">
 						<text>点击退款</text>
 					</view>
 				</view>
 				<view class="goods-bottom" v-if="actinput == 3 ">
-					<view class="sh-anniu">
+					<view class="sh-anniu" @click="payment()">
 						<text>去付款</text>
 					</view>
 				</view>
@@ -103,9 +103,15 @@
 		methods: {
 			getindex(index) {
 				this.actinput = index
-				console.log("index", index)
 				if (index != 0) {
 					this.query.orderStatus = index
+					// if (index == 1) {
+					// 	this.query.orderStatus = '已发货'
+
+					// }else {
+					// 	this.query.orderStatus = this.taplist[index].title
+
+					// }
 				} else {
 					this.query.orderStatus = ''
 				}
@@ -129,6 +135,28 @@
 					}
 				})
 			},
+			confirmTheReceipt(data) {
+				let params = {
+					id: data,
+					orderStatus: '已完成'
+				}
+				request({
+					url: 'business/integral/integralOrders/editUni',
+					method: 'put',
+					data: params
+				}).then((res) => {
+					if (res.code == 200) {
+						this.orderList = res.data.records
+						this.getIntegralOrderList()
+					}
+				})
+			},
+			refund(data) {
+
+			},
+			payment(data) {
+
+			},
 		}
 	}
 </script>
diff --git a/gasStation-uni/pagesHome/order/order.vue b/gasStation-uni/pagesHome/order/order.vue
index 83fb11eb7..816b38a14 100644
--- a/gasStation-uni/pagesHome/order/order.vue
+++ b/gasStation-uni/pagesHome/order/order.vue
@@ -157,6 +157,8 @@
 				}
 			})
 			uni.$emit('un')
+			// 根据storeId查询店铺信息
+			this.getInfoByStoreId()
 		},
 
 		onShow() {
@@ -199,7 +201,9 @@
 				// remaining_inventory
 				console.log('当前值为: ' + e.value)
 				console.log('当前值为123: ' + this.goodsInfo.remainingInventory)
-				if (e.value >= this.goodsInfo.remainingInventory) {
+
+				//判断库存
+				if (e.value >= this.goodsInfo.remainingInventory && this.goodsInfo.remainingInventory != -1) { // -1为无限库存
 					e.value = this.goodsInfo.remainingInventory
 					this.value = this.goodsInfo.remainingInventory
 					this.flag = true
@@ -345,6 +349,7 @@
 			},
 			// 根据storeId查询店铺信息
 			getInfoByStoreId() {
+				console.log("helllllllllllllllllllllllllo")
 				request({
 					url: '/business/storeInformation/store/storeInfoUni',
 					method: 'get',