From 4ed6ba6e8c95f19f84a19fc0f008dfb38b18071b Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 12 Jan 2024 13:55:40 +0800
Subject: [PATCH 1/2] bug

---
 fuintAdmin/src/api/convenienceStore/goods.js  | 18 +++--
 .../src/views/convenienceStore/goodsFile.vue  | 56 ++++++++-----
 .../controller/CvsGoodsController.java        |  9 +++
 .../service/CvsGoodsService.java              |  6 ++
 .../service/impl/CvsGoodsServiceImpl.java     |  8 ++
 .../business/order/entity/CreditUnit.java     |  8 ++
 .../order/mapper/xml/HangBillMapper.xml       |  5 +-
 .../service/impl/CreditUnitServiceImpl.java   | 14 ++++
 .../service/impl/OilOrderServiceImpl.java     | 29 ++++---
 .../src/api/cashier/cashierorder.js           |  2 +-
 .../views/cashier/NewComponents/credit.vue    | 79 ++++++++-----------
 .../views/cashier/NewComponents/homeindex.vue |  3 +-
 gasStation-uni/pagesMy/VIP/vip.vue            |  2 +-
 13 files changed, 153 insertions(+), 86 deletions(-)

diff --git a/fuintAdmin/src/api/convenienceStore/goods.js b/fuintAdmin/src/api/convenienceStore/goods.js
index 666ea2cc6..06679c043 100644
--- a/fuintAdmin/src/api/convenienceStore/goods.js
+++ b/fuintAdmin/src/api/convenienceStore/goods.js
@@ -20,11 +20,19 @@ export function selectTree(data) {
 
 // 联级选择器 树形数据结构
 export function cvsGoodsTree() {
-    return request({
-      url: '/business/cvsGoods/tree',
-      method: 'get',
-    })
-  }
+  return request({
+    url: '/business/cvsGoods/tree',
+    method: 'get',
+  })
+}
+
+// 联级选择器 树形数据结构
+export function cvsGoodsAll() {
+  return request({
+    url: '/business/cvsGoods',
+    method: 'get',
+  })
+}
 
 // 查询一级分类
 export function list(data) {
diff --git a/fuintAdmin/src/views/convenienceStore/goodsFile.vue b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
index 1cfae09ed..df3751b1f 100644
--- a/fuintAdmin/src/views/convenienceStore/goodsFile.vue
+++ b/fuintAdmin/src/views/convenienceStore/goodsFile.vue
@@ -11,14 +11,6 @@
                        :options="cvsGoodOptions"
                        :props="{ checkStrictly: true }"
                        clearable></el-cascader>
-<!--          <el-select-->
-<!--            v-model="queryParams.cvsGoodId"-->
-<!--            placeholder="全部"-->
-<!--            clearable-->
-<!--            style="width: 300px"-->
-<!--          >-->
-<!--            <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>-->
-<!--          </el-select>-->
         </el-form-item>
         <el-form-item label="供应商" prop="supplierId">
           <el-select
@@ -201,14 +193,18 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="所属分类" prop="cvsGoodId">
-              <el-select
-                v-model="form.cvsGoodId"
-                placeholder="全部"
-                clearable
-                style="width: 300px"
-              >
-                <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>
-              </el-select>
+<!--              <el-select-->
+<!--                v-model="form.cvsGoodId"-->
+<!--                placeholder="全部"-->
+<!--                clearable-->
+<!--                style="width: 300px"-->
+<!--              >-->
+<!--                <el-option v-for="item in cvsGoodList" :key="item.id" :label="item.name" :value="item.id"/>-->
+<!--              </el-select>-->
+              <el-cascader v-model="cvsGoodId"
+                           :options="cvsGoodOptions"
+                           :props="{ checkStrictly: true }"
+                           clearable></el-cascader>
             </el-form-item>
           </el-col>
         </el-row>
@@ -331,7 +327,7 @@
 <script>
 
 
-import {cvsGoodsTree, selectTree} from "@/api/convenienceStore/goods";
+import {cvsGoodsAll, cvsGoodsTree, selectTree} from "@/api/convenienceStore/goods";
 import {addSupplier, listSupplier} from "@/api/convenienceStore/supplier";
 import {
   addLJGoods,
@@ -357,7 +353,7 @@ export default {
       // 供应商信息
       supplier:"",
       // 商品分类id
-      cvsGoodId:"",
+      cvsGoodId:[],
       cvsGoodOptions:[],
       isAdd:false,
       activeName: 'goods',
@@ -567,8 +563,8 @@ export default {
     },
     // 查询搜索列表信息
     getQueryList(){
-      selectTree().then(response => {
-        this.cvsGoodList = response.data.records
+      cvsGoodsAll().then(response => {
+        this.cvsGoodList = response.data
       });
     },
     getSuppilers(val){
@@ -656,6 +652,21 @@ export default {
       const id = row.id || this.ids;
       getLJGoods(id).then(response => {
         this.form = response.data;
+        this.cvsGoodOptions.forEach(item => {
+          if (item.value == response.data.cvsGoodId){
+            this.cvsGoodId.push(item.value)
+          }else {
+            if (item.children.length>0){
+              item.children.forEach(i => {
+                if (i.value == response.data.cvsGoodId){
+                  this.cvsGoodId.push(item.value)
+                  this.cvsGoodId.push(i.value)
+                }
+              })
+            }
+          }
+        })
+        // this.cvsGoodId = response.data.cvsGoodId
         this.open = true;
         this.isAdd = true;
         this.title = "编辑商品";
@@ -674,6 +685,11 @@ export default {
     },
     // 提交按钮
     submitForm: function() {
+      if (this.cvsGoodId.length==1){
+        this.form.cvsGoodId = this.cvsGoodId[0]
+      }else {
+        this.form.cvsGoodId = this.cvsGoodId[1]
+      }
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.stock==0){
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java
index 812b46668..a00585fb7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/controller/CvsGoodsController.java
@@ -54,6 +54,15 @@ public class CvsGoodsController extends BaseController {
         return getSuccessResult(list);
     }
 
+    /**
+     * 查询当前店铺所有分类信息
+     * @return
+     */
+    @GetMapping
+    public ResponseObject selectAll(){
+        return getSuccessResult(cvsGoodsService.selectCvsGoods());
+    }
+
     //查询一级菜单
     @PostMapping("/list")
     public ResponseObject list(CvsGoods goods)
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java
index cd753a100..6c15bba81 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/CvsGoodsService.java
@@ -36,6 +36,12 @@ public interface CvsGoodsService extends IService<CvsGoods> {
      */
     List<CvsGoods> selectCvsGoodsList(CvsGoods goods);
 
+    /**
+     * 查询当前店铺所有分类信息
+     * @return
+     */
+    List<CvsGoodsTree> selectCvsGoods();
+
     /**
      * 联级选择器 树形数据结构
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
index 1e5e46eac..b65635e5a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/service/impl/CvsGoodsServiceImpl.java
@@ -126,6 +126,14 @@ public class CvsGoodsServiceImpl extends ServiceImpl<CvsGoodsMapper,CvsGoods> im
         return baseMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public List<CvsGoodsTree> selectCvsGoods() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        QueryWrapper queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("store_id",nowAccountInfo.getStoreId());
+        return baseMapper.selectList(queryWrapper);
+    }
+
     /**
      * 联级选择器 树形数据结构
      * @return
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
index 6a80bc657..07d612346 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CreditUnit.java
@@ -29,6 +29,14 @@ public class CreditUnit extends BaseEntity implements Serializable {
     @ApiModelProperty("自增ID")
     @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
+    /**
+     * 店铺id
+     */
+    private Integer storeId;
+    /**
+     * 连锁店id
+     */
+    private Integer chainStoreId;
     /**
      * 单位名称
      */
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
index 1fa0f42ba..028f25e72 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/HangBillMapper.xml
@@ -45,9 +45,10 @@
         </where>
     </select>
     <select id="selectHangBills" resultType="com.fuint.business.order.vo.HangBillVo" parameterType="int">
-        <include refid="selectHangBill"></include>
+        select hb.*,cu.unit_name,cu.person_credit,cu.contact_mobile,cu.credit_limit from hang_bill hb
+            left join credit_unit cu on hb.credit_unit_id = cu.id
         <where>
-            hb.store_id = #{storeId}
+            hb.store_id = #{storeId} and hb.status!=1
         </where>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
index fa6dd35f1..0c2f4b187 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
@@ -5,16 +5,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.business.order.entity.CreditUnit;
 import com.fuint.business.order.mapper.CreditUnitMapper;
 import com.fuint.business.order.service.CreditUnitService;
+import com.fuint.business.storeInformation.entity.LJStore;
+import com.fuint.business.storeInformation.service.ILJStoreService;
+import com.fuint.common.dto.AccountInfo;
+import com.fuint.common.util.TokenUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
 public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditUnit> implements CreditUnitService {
+    @Autowired
+    private ILJStoreService storeService;
     @Override
     public List<CreditUnit> selectCreditUnitList() {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
         QueryWrapper queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("status","qy");
+        queryWrapper.eq("chain_store_id",store.getChainStoreId());
         List<CreditUnit> list = baseMapper.selectList(queryWrapper);
         return list;
     }
@@ -27,6 +37,10 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
 
     @Override
     public int insertCreditUnit(CreditUnit creditUnit) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
+        creditUnit.setStoreId(store.getId());
+        creditUnit.setChainStoreId(store.getChainStoreId());
         int row = baseMapper.insert(creditUnit);
         return row;
     }
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 9518db6b3..3b7baf69e 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
@@ -306,6 +306,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         cashierOrder.setStatus(payStatus);
         if (payType.equals("CASH")){
             cashierOrder.setPayTime(new Date());
+            this.insertAllOrderInfo(orderNo,storeId,Double.valueOf(map.get("allAmount")),payType,userId,"PC","6","paid");
         }
         cashierOrder.setOrderNo(orderNo);
         cashierOrder.setGoodsOrderAmount(goodsAmount);
@@ -408,6 +409,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             orders.put("goodsOrder",goodsOrder1);
             cashierOrder.setGoodsOrderId(goodsOrder1.getId());
         }
+        orders.put("orderNo",orderNo);
         cashierOrderService.insertCashierOrder(cashierOrder);
         return orders;
     }
@@ -522,10 +524,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
             cashierOrder.setOilOrderId(oilOrder.getId());
             cashierOrderService.insertCashierOrder(cashierOrder);
             this.updateGrowthValue1(oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId);
-//            this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"applet");
+            this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,map.get("payType"),userId,"PC","1","paid");
 
             res.put("success","success");
         } else {
+            String status = "unpaid";
 
             if (ObjectUtil.isNotEmpty(refuelMoneys)){
                 for (Object refuelMoney : refuelMoneys) {
@@ -542,7 +545,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                     boolean flag = false;
                     for (int i = 0;i < oilOrders.size();i++) {
                         if (oilOrders.get(i).get("oilName").equals(oilName.getId().toString())){
-                            if (refuelMoneyLiters>=Double.valueOf(oilOrders.get(i).get("liters").toString())){
+                            if (refuelMoneyLiters>=Double.valueOf(oilOrders.get(i).get("liters").toString())) {
+                                status = "paid";
                                 flag = true;
                                 Double amount = Double.valueOf(oilOrders.get(i).get("amount").toString());
                                 Double oilPrice = Double.valueOf(oilOrders.get(i).get("oilPrice").toString());
@@ -570,7 +574,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                                 order.setPayUser(userVo1.getMobile());
                                 order.setPayType(map.get("payType"));
                                 order.setInvoicing("未开票");
-                                order.setOrderStatus("paid");
+                                order.setOrderStatus(status);
                                 order.setPayTime(new Date());
 
                                 this.addOilTrack(oilOrders.get(i), accountInfo.getStoreId());
@@ -582,15 +586,15 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                                 cashierOrder.setPayUser(userVo1.getMobile());
                                 cashierOrder.setAmount(oilAmount);
                                 cashierOrder.setPayAmount(oilAmount);
-                                cashierOrder.setStatus("paid");
+                                cashierOrder.setStatus(status);
                                 cashierOrder.setPayTime(new Date());
                                 cashierOrder.setOrderNo(orderNo);
                                 cashierOrder.setOilOrderAmount(oilAmount);
 //            cashierOrder.setOilDiscountAmount(Double.valueOf(map.get("oilDiscount")));
                                 cashierOrder.setTerminal(map.get("terminal"));
                                 cashierOrder.setOilOrderId(oilOrder.getId());
-                                this.updateGrowthValue1(0.0,userId, Integer.valueOf(oilOrder.getOils()),refuelMoneyLiters-Double.valueOf(oilOrders.get(i).get("liters").toString()),storeId);
-
+                                this.updateGrowthValue1(0.0, userId, Integer.valueOf(oilOrder.getOils()), refuelMoneyLiters - Double.valueOf(oilOrders.get(i).get("liters").toString()), storeId);
+                                this.insertAllOrderInfo(orderNo, storeId, oilAmount, map.get("payType"), userId, "PC", "1", status);
                             }
                         }else {
                             res.put("error","囤油卡余额不足!");
@@ -619,17 +623,21 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     /**
      * 添加所有订单信息
      */
-    private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel){
+    private void insertAllOrderInfo(String orderNo,Integer storeId,Double goodsMoney,String payType,Integer userId,String payChannel,String type,String status){
         AllOrderInfo allOrderInfo = new AllOrderInfo();
         allOrderInfo.setOrderNo(orderNo);
-        allOrderInfo.setType("1");
+        allOrderInfo.setType(type);
         allOrderInfo.setStoreId(storeId);
         allOrderInfo.setGoodsMoney(goodsMoney);
         allOrderInfo.setPayType(payType);
         allOrderInfo.setUserId(userId);
         allOrderInfo.setPayChannel(payChannel);
-        allOrderInfo.setStatus("paid");
-        allOrderInfo.setContent("油品订单");
+        allOrderInfo.setStatus(status);
+        if (type.equals("1")){
+            allOrderInfo.setContent("油品订单");
+        }else {
+            allOrderInfo.setContent("收银台订单");
+        }
         allOrderInfoService.insertAllOrderInfo(allOrderInfo);
     }
 
@@ -880,6 +888,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
                     userId = cardValudChildrens.getUserId();
                 }
                 this.updateGrowthValue(oilOrder.getPayAmount(),userId, Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId());
+                this.addOilTracks(oilOrder,oilOrder.getStoreId());
                 CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo);
                 if (ObjectUtil.isNotEmpty(cashierOrder)){
                     cashierOrder.setPayTime(new Date());
diff --git a/fuintCashierWeb/src/api/cashier/cashierorder.js b/fuintCashierWeb/src/api/cashier/cashierorder.js
index f3c169db4..b40d535d9 100644
--- a/fuintCashierWeb/src/api/cashier/cashierorder.js
+++ b/fuintCashierWeb/src/api/cashier/cashierorder.js
@@ -20,7 +20,7 @@ export function cashierOrder(id) {
 // 根据订单号查询油品订单信息
 export function cashierOrderByOrderNo(data) {
   return request({
-    url: '/business/oilOrder/orderNo',
+    url: '/business/cashierOrder/orderNo',
     method: 'post',
     data: data
   })
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index 6ca494477..b0370ece4 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -543,7 +543,10 @@
     <el-dialog title="批量挂账归还" :visible.sync="open3" append-to-body>
         <el-form ref="form3" :model="form3">
           <el-form-item>
-            <el-input placeholder="请输入挂账单位、挂账人、挂账人手机号检索" v-model="unitName" class="input-with-select">
+            <el-input placeholder="请输入挂账单位、挂账人、挂账人手机号检索"
+                      v-model="unitName"
+                      @keyup.enter.native="getRepayList"
+                      clearable class="input-with-select">
               <el-button slot="append" icon="el-icon-search" @click="getRepayList">查询</el-button>
             </el-input>
           </el-form-item>
@@ -556,37 +559,15 @@
           height="300"
           style="width: 100%"
           @selection-change="handleSelectionChange">
-          <el-table-column
-            type="selection"
-            width="55">
-          </el-table-column>
-          <el-table-column
-            label="单据号"
-            prop="orderNo"
-            width="120">
-          </el-table-column>
+          <el-table-column type="selection" width="55"></el-table-column>
+          <el-table-column label="单据号" prop="orderNo" width="120"></el-table-column>
           <el-table-column label="挂账方详情">
-            <el-table-column
-              prop="unitName"
-              label="单位">
-            </el-table-column>
-            <el-table-column
-              prop="personCredit"
-              label="姓名">
-            </el-table-column>
-            <el-table-column
-              prop="contactMobile"
-              label="电话">
-            </el-table-column>
-          </el-table-column>
-          <el-table-column
-            prop="amount"
-            label="挂账金额">
-          </el-table-column>
-          <el-table-column
-            prop="outstandAmount"
-            label="未归还金额">
+            <el-table-column prop="unitName" label="单位"></el-table-column>
+            <el-table-column prop="personCredit" label="姓名"></el-table-column>
+            <el-table-column prop="contactMobile" label="电话"></el-table-column>
           </el-table-column>
+          <el-table-column prop="amount" label="挂账金额"></el-table-column>
+          <el-table-column prop="outstandAmount" label="未归还金额"></el-table-column>
           <el-table-column
             prop="repaidAmount"
             label="归还金额"
@@ -607,7 +588,7 @@
           :total="total1"
           :page.sync="queryParam.page"
           :limit.sync="queryParam.pageSize"
-          @current-change="getList">
+          @current-change="getLists">
         </el-pagination>
       </div>
       <div style="display: flex;height: 36px">
@@ -620,7 +601,7 @@
       </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="open3 = false">取 消</el-button>
-        <el-button type="primary" @click="batchSub">确 定</el-button>
+        <el-button :disabled="amount==0" type="primary" @click="batchSub">确 定</el-button>
       </span>
     </el-dialog>
 
@@ -646,6 +627,7 @@
                               @input="changePayType">
                 <el-radio v-for="item in payList"
                           :key="item.dictValue"
+                          v-if="item.dictValue!='APPLET_CODE'"
                           :value="item.dictValue"
                           :label="item.dictValue" border>{{ item.dictLabel }}</el-radio>
               </el-radio-group>
@@ -910,21 +892,22 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
       getRepayList(){
         let result = [];
         this.form3.unitName = this.unitName;
-        let str = this.form3.unitName
+        let str = this.unitName
         this.list.forEach(item => {
-          if (item.returnType==0){
-            if (item.unitName.includes(str)){
-              item.repaidAmount = item.outstandAmount
-              result.push(item)
-            }
-            if (item.personCredit.includes(str)){
-              item.repaidAmount = item.outstandAmount
-              result.push(item)
-            }
-            if (item.contactMobile.includes(str)){
-              item.repaidAmount = item.outstandAmount
-              result.push(item)
-            }
+          if (item.unitName.includes(str)){
+            item.repaidAmount = item.outstandAmount
+            result.push(item)
+            return;
+          }
+          if (item.personCredit.includes(str)){
+            item.repaidAmount = item.outstandAmount
+            result.push(item)
+            return;
+          }
+          if (item.contactMobile.includes(str)){
+            item.repaidAmount = item.outstandAmount
+            result.push(item)
+            return;
           }
         })
         this.repayList = result
@@ -932,6 +915,10 @@ import {listReturnRecord, returnRecordByOrderNo, returnRecordInfo} from "@/api/c
       getLists(){
         hangBills().then(response => {
           this.list = response.data;
+          this.repayList = response.data;
+          for (let i = 0; i<response.data.length;i++){
+            this.repayList[i].repaidAmount = response.data[i].outstandAmount
+          }
         })
       },
       handleChange(value) {
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 40438ae0b..6273fd73e 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -1933,7 +1933,7 @@
           _this.preferentialData.oilPrice = item1.oilPrice;
           _this.preferentialData.oilLiters = item1.liters;
           _this.couponDiscount =[];
-          _this.couponIds = [],
+          _this.couponIds = [];
           selectCoupon(_this.preferentialData).then(response => {
             // console.log(response)
             _this.couponAmount = 0;
@@ -2668,6 +2668,7 @@
           _this.goodsOrder = []
           _this.amount = 0
         };
+        this.userNo = ""
         this.map = {
           allAmount:0,
           // 用户支付条码信息
diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue
index d2ded7e26..367ba6429 100644
--- a/gasStation-uni/pagesMy/VIP/vip.vue
+++ b/gasStation-uni/pagesMy/VIP/vip.vue
@@ -214,7 +214,7 @@
 			// 获取当前登入用户的等级信息
 			getMember(){
 				request({
-					url: "business/userManager/user/storeUser/" + this.storeId,
+					url: "business/userManager/user/storeUserInfo/" + this.storeId,
 					method: 'get',
 				}).then((res) => {
 					this.member = res.data

From dde91a7108b34bbb817839f0049930b0d6a4a1c7 Mon Sep 17 00:00:00 2001
From: wangh <9483>
Date: Fri, 12 Jan 2024 13:58:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=AD=E5=8F=B0=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/indexcomponents/topindex.vue    |  27 +-
 fuintAdmin/src/views/member/userInfo.vue      |  21 +-
 .../member/userInfoOrder/balanceRecord.vue    |  15 +-
 fuintAdmin_zt/src/api/allOrder.js             |  29 ++
 fuintAdmin_zt/src/views/Service/details.vue   |   8 +-
 .../src/views/components/Service/allOrder.vue | 384 ++++++++++++++++++
 .../mapper/xml/CardFuelChangeMapper.xml       |  10 +-
 .../impl/CardFuelRecordServiceImpl.java       |  11 +-
 .../impl/CardValueRecordServiceImpl.java      |  14 +-
 .../controller/AllOrderInfoController.java    |  30 ++
 .../order/mapper/AllOrderInfoMapper.java      |   9 +
 .../order/mapper/xml/AllOrderInfoMapper.xml   |  69 ++++
 .../mapper/xml/CardBalanceChangeMapper.xml    |   2 +-
 .../order/service/AllOrderInfoService.java    |  20 +
 .../service/impl/AllOrderInfoServiceImpl.java |  35 +-
 .../service/impl/OilOrderServiceImpl.java     |   8 +-
 .../business/order/vo/AllOrderInfoVo.java     |  11 +
 .../system/dept/mapper/xml/SysDeptMapper.xml  |   2 +-
 .../views/cashier/NewComponents/Integral.vue  |  36 +-
 19 files changed, 697 insertions(+), 44 deletions(-)
 create mode 100644 fuintAdmin_zt/src/api/allOrder.js
 create mode 100644 fuintAdmin_zt/src/views/components/Service/allOrder.vue
 create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java

diff --git a/fuintAdmin/src/views/indexcomponents/topindex.vue b/fuintAdmin/src/views/indexcomponents/topindex.vue
index 6917c1eed..fc1bc9803 100644
--- a/fuintAdmin/src/views/indexcomponents/topindex.vue
+++ b/fuintAdmin/src/views/indexcomponents/topindex.vue
@@ -15,7 +15,7 @@
         </el-popover> -->
       </div>
       <div class="box-size">
-        {{ this.statisticsData.today_sum ? parseFloat(this.statisticsData.today_sum).toFixed(2) : 0  }}
+        {{ this.statisticsData.today_sum ? this.statisticsData.today_sum : 0  }}
       </div>
       <div class="box-but">
 
@@ -41,7 +41,7 @@
         <span style="margin-right: 5px">本周流水总额</span>
       </div>
       <div class="box-size">
-        {{ this.statisticsData.this_week_sum?parseFloat(this.statisticsData.this_week_sum).toFixed(2):0 }}
+        {{ this.statisticsData.this_week_sum?this.statisticsData.this_week_sum:0 }}
       </div>
       <div class="box-but">
 
@@ -70,7 +70,7 @@
         <span style="margin-right: 5px">本月流水总额</span>
       </div>
       <div class="box-size">
-        {{this.statisticsData.this_month_sum?parseFloat(this.statisticsData.this_month_sum).toFixed(2):0}}
+        {{this.statisticsData.this_month_sum?this.statisticsData.this_month_sum:0}}
       </div>
       <div class="box-but">
 
@@ -229,8 +229,17 @@ export default {
     getDate() {
       this.loading = true
       turnoverStatisticsApi().then(res=>{
-        if (res.code == 200) {
+        if (res.code === 200) {
           this.statisticsData = res.data
+          // 遍历 this.statisticsData 对象的所有属性
+          for (const key in this.statisticsData) {
+            if (Object.hasOwnProperty.call(this.statisticsData, key)) {
+              // 如果属性值是数字类型，则保留两位小数
+              if (typeof this.statisticsData[key] === 'number') {
+                this.statisticsData[key] = this.statisticsData[key].toFixed(2);
+              }
+            }
+          }
           this.loading = false
         }
 
@@ -278,8 +287,11 @@ export default {
   font-size: 14px;
 }
 .icon-lv{
-  width: 71px;
+  //width: 71px;
+  width: auto;
   height: 24px;
+  padding-left: 10px;
+  padding-right: 10px;
   background: #E3F9E9;
   border-radius: 3px 3px 3px 3px;
   display: flex;
@@ -290,7 +302,10 @@ export default {
 }
 
 .icon-lv2{
-  width: 71px;
+  //width: 71px;
+  width: auto;
+  padding-left: 10px;
+  padding-right: 10px;
   height: 24px;
   background: #f9e3e3;
   border-radius: 3px 3px 3px 3px;
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 6dc1e5f1e..cfc23ce8e 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -118,26 +118,26 @@
       </div>
     </el-card>
 
-    <el-card>
+    <el-card :key="childComponentKey">
       <template>
         <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="加油订单" name="refuelOrder">
-            <oilOrder :pUserId="form.id"></oilOrder>
+            <oilOrder :key="childComponentKey" :pUserId="form.id"></oilOrder>
           </el-tab-pane>
           <el-tab-pane label="商品订单" name="shopOrder">
-            <goodsOrder :pUserId="form.id"></goodsOrder>
+            <goodsOrder :key="childComponentKey" :pUserId="form.id"></goodsOrder>
           </el-tab-pane>
           <el-tab-pane label="余额记录" name="balanceRecord">
-            <balanceRecord :pUserId="form.id"></balanceRecord>
+            <balanceRecord :key="childComponentKey" :pUserId="form.id"></balanceRecord>
           </el-tab-pane>
           <el-tab-pane label="积分记录" name="pointRecord">
-            <pointsRecord :pUserId="form.id"></pointsRecord>
+            <pointsRecord :key="childComponentKey" :pUserId="form.id"></pointsRecord>
           </el-tab-pane>
           <el-tab-pane label="卡券列表" name="cardList">
-            <couponList :pUserId="form.id"></couponList>
+            <couponList :key="childComponentKey" :pUserId="form.id"></couponList>
           </el-tab-pane>
           <el-tab-pane label="成长值记录" name="growthValue">
-            <growthValueRecord :pUserId="form.id"></growthValueRecord>
+            <growthValueRecord :key="childComponentKey" :pUserId="form.id"></growthValueRecord>
           </el-tab-pane>
           <!-- <el-tab-pane label="加油金记录" name="refuelMoney"> -->
           <!-- <refuelMoneyRecord :pUserId="form.id"></refuelMoneyRecord> -->
@@ -667,6 +667,7 @@ export default {
         growthValue: '', // 赠送成长值
         remark: '',
         paymentType: 'WECHAT', // 支付方式
+        payType:'',
         royaltyType: '',// 提成类型
         percentageCommissions: null,
         amountCommission: null,
@@ -684,12 +685,15 @@ export default {
         remark: '',
         rechargeBalance: '', //实际支付
         paymentType: 'WECHAT',
+        payType:'',
         oilType: '',
         type: '',
         chainStorId: '',
         incomeLitres: '',
       },
 
+      childComponentKey:1,
+
       authCode: '', // 支付码
 
       timer: null,
@@ -1293,7 +1297,7 @@ export default {
 
         let this_ = this
       }
-
+      this.$forceUpdate();
 
     },
 
@@ -1320,6 +1324,7 @@ export default {
 
         this.iniz()
       this.cardFuelDieselForm = {}
+      this.childComponentKey = this.childComponentKey+1
     },
 
     iniz() {
diff --git a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
index 46dfbe173..1b651f18b 100644
--- a/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
+++ b/fuintAdmin/src/views/member/userInfoOrder/balanceRecord.vue
@@ -5,7 +5,7 @@
       <el-radio-button label="literCard">升数卡记录</el-radio-button>
     </el-radio-group>
     <div v-if="tabPosition=='giftCard'">
-      <el-table ref="tables" v-loading="loading" :data="cardList">
+      <el-table key="1" 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="类型">
@@ -16,9 +16,9 @@
         </el-table-column>
         <el-table-column align="center"  label="详细信息">
           <el-table-column align="center"  prop="balance" label="变动金额"/>
-          <el-table-column align="center"  prop="address" label="变动前余额">
+          <el-table-column align="center" label="变动前余额">
             <template slot-scope="scope">
-              <span>{{ scope.row.afterTheChange?scope.row.afterTheChange + scope.row.balance : '/'}}</span>
+              <span>{{ scope.row.afterTheChange?parseFloat(scope.row.afterTheChange - scope.row.balance).toFixed(2) : '/'}}</span>
             </template>
           </el-table-column>
           <el-table-column align="center"  prop="afterTheChange" label="变动后余额">
@@ -41,11 +41,11 @@
       />
     </div>
     <div v-else>
-      <el-table ref="tables2" v-loading="loading" :data="fuelList">
+      <el-table ref="tables2" key="2" v-loading="loading" :data="fuelList">
         <el-table-column align="center" label="所属油站" prop="storeName"/>
         <el-table-column align="center" label="油品" >
           <template slot-scope="scope">
-            -<span>{{scope.row.type?scope.row.type:' -- '}}</span>
+            <span> {{scope.row.type?scope.row.type:' -- '}}</span>
           </template>
         </el-table-column>
         <el-table-column label="类型" align="center">
@@ -60,6 +60,11 @@
             <span>{{scope.row.balance?scope.row.balance:"--"}}</span>
           </template>
         </el-table-column>
+        <el-table-column label="变动之后升数" align="center" prop="balance">
+          <template slot-scope="scope">
+            <span>{{scope.row.afterTheChange?scope.row.afterTheChange:"--"}}</span>
+          </template>
+        </el-table-column>
         <el-table-column label="订单号" align="center" prop="orderNo"/>
         <el-table-column label="描述" align="center" prop="fromType"/>
         <el-table-column label="变动时间" align="center" prop="createTime"/>
diff --git a/fuintAdmin_zt/src/api/allOrder.js b/fuintAdmin_zt/src/api/allOrder.js
new file mode 100644
index 000000000..e7496c469
--- /dev/null
+++ b/fuintAdmin_zt/src/api/allOrder.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+
+// 分页查询所有的订单信息
+export function getOrderListApi(query) {
+  return request({
+      url: 'business/allOrderInfo/getPageList',
+      method: 'get',
+      params: query
+
+  })
+}
+// 分页查询所有的订单信息
+export function getSumPayMoneyApi(query) {
+  return request({
+      url: 'business/allOrderInfo/sumPayMoney',
+      method: 'get',
+      params: query
+
+  })
+}
+
+// 查询订单信息
+export function getOrderInfo(orderId) {
+  return request({
+    url: 'backendApi/order/info/' + orderId,
+    method: 'post',
+    data: data
+  })
+}
\ No newline at end of file
diff --git a/fuintAdmin_zt/src/views/Service/details.vue b/fuintAdmin_zt/src/views/Service/details.vue
index 565c46ea9..3d2618fe0 100644
--- a/fuintAdmin_zt/src/views/Service/details.vue
+++ b/fuintAdmin_zt/src/views/Service/details.vue
@@ -9,13 +9,14 @@
 
           </el-tab-pane>
           <el-tab-pane label="支付配置" name="second">
-            <!-- <peizhi></peizhi>
-             -->
              <payment  :id="id"></payment>
           </el-tab-pane>
           <el-tab-pane label="员工管理" name="staff">
             <staff :id="id"></staff>
           </el-tab-pane>
+          <el-tab-pane label="订单查看" name="allOrder">
+            <allOrder :id="id"></allOrder>
+          </el-tab-pane>
 
         </el-tabs>
       </div>
@@ -29,6 +30,7 @@
   // import peizhi from '../components/Service/peizhi'
   import payment from '../components/Service/payment'
   import staff from '../components/Service/staff'
+  import allOrder from '../components/Service/allOrder'
   import jcindex from '../components/Service/index'
   export default {
     name: 'details',
@@ -41,7 +43,7 @@
 
     // peizhi
     components:{
-      jcindex,staff,payment,
+      jcindex,staff,payment,allOrder
     },
     created() {
       this.id = this.$route.query.id
diff --git a/fuintAdmin_zt/src/views/components/Service/allOrder.vue b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
new file mode 100644
index 000000000..be1920da0
--- /dev/null
+++ b/fuintAdmin_zt/src/views/components/Service/allOrder.vue
@@ -0,0 +1,384 @@
+<template>
+  <div class="app-container">
+    <el-card >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+
+        <el-form-item label="订单类型" prop="type">
+          <el-select
+            v-model="queryParams.type"
+            placeholder="请选择订单类型"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in typeList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+
+        
+        </el-form-item>
+        <el-form-item label="订单号" prop="orderNo">
+          <el-input
+            v-model="queryParams.orderNo"
+            placeholder="请输入订单号"
+            clearable
+            style="width: 240px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="支付渠道" prop="payChannel">
+          <el-select
+            v-model="queryParams.payChannel"
+            placeholder="请选择支付渠道"
+            clearable
+            style="width: 240px"
+          >
+            <el-option
+              v-for="item in payChannelList"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+          </el-select>
+
+        </el-form-item>
+        <el-form-item label="付款方式" prop="payType">
+          <el-select
+            v-model="queryParams.payType"
+            placeholder="状态"
+            clearable
+            style="width: 240px"
+          >
+          <el-option
+              v-for="dict in dict.type.payment_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+
+        <el-form-item label="支付时间">
+          <el-date-picker
+            v-model="dateRange"
+            style="width: 240px"
+            size="medium"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search"  @click="handleQuery">搜索</el-button>
+                   <el-button icon="el-icon-refresh"  @click="resetQuery">重置</el-button>
+
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <el-card style="margin-top: 20px" >
+      <!-- <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <el-button
+            type="primary"
+            icon="el-icon-plus"
+            @click="handleAdd"
+          >新增员工</el-button>
+        </el-col>
+
+      </el-row> -->
+
+      <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+        <el-table-column label="订单号" align="center" prop="orderNo" />
+        <el-table-column label="订单类型" align="center" prop="type" width="100">
+          <template slot-scope="scope">
+            {{ getType(scope.row.type) }}
+          </template>
+          </el-table-column>
+        <el-table-column label="渠道订单号" align="center" prop="transactionId"/>
+        <el-table-column :label="sumPayMoney" align="center" prop="payMoney">
+
+        </el-table-column>
+        <el-table-column label="支付时间" align="center" prop="payTime" width="150">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.payTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="付款方式" align="center" prop="payType">
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.payment_type" :value="scope.row.payType"/>
+          </template>
+
+        </el-table-column> 
+      
+      
+        <el-table-column label="创建时间" align="center" prop="createTime" width="150">
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="支付渠道" align="center" prop="createTime" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.payChannel==='applet'?'小程序': '收银台'}}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="付款用户手机号" align="center" prop="userMobile" width="150">
+          <template slot-scope="scope">
+            <span>{{ scope.row.userMobile?scope.row.userMobile: '散户'}}</span>
+          </template>
+        </el-table-column>
+
+
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.page"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script>
+  import {getName} from "../../../utils/fuint";
+  import {addStaff, delStaff, getStaff, listStaff, updateStaff} from "../../../api/staff/staff";
+  // import {getDuty, listDuty} from "@/api/staff/duty";
+  import { getOrderListApi,getSumPayMoneyApi } from "../../../api/allOrder";
+  export default {
+    name: "asdf",
+    dicts: ['transaction','handover','handover_quit','payment_type',
+      'jbjl','official','notice','role'],
+      props: ["id"],
+
+    data() {
+      return {
+        drawer: false,
+        // 标题
+        title: "",
+        // 遮罩层
+        loading: false,
+        // 选中数组
+        ids: [],
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        categoryOptions: [],
+        storeOptions: [],
+        posPrem:'',
+      
+        props: { multiple: true },
+        appletPrem:'',
+
+        writeOff:[],
+        write:[],
+        specialPrem:[],
+        special:[],
+        // 总条数
+        total: 0,
+        // 表格数据
+        list: [],
+        // 是否显示弹出层
+        open: false,
+        // 日期范围
+        dateRange: [],
+        // 默认排序
+        defaultSort: {prop: 'createTime', order: 'descending'},
+        // 表单参数
+        form: {
+          id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'',
+          auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
+          merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
+          transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
+        },
+        // 查询参数
+        queryParams: {
+          type:'',
+          orderNo:'',
+          payChannel:'',
+          payType:'',
+          page: 1,
+          pageSize: 10,
+        },
+        
+        typeList:[
+          { value: '1',label: '油品'},
+          { value: '2',label: '商品'},
+          { value: '3',label: '储值卡'},
+          { value: '4',label: '积分'},
+          { value: '5',label: '囤油卡'},
+          { value: '6',label: '油品加加商品(收银台订单)'},
+          { value: '7',label: '挂账订单'},
+        ],
+        payTypeList:[
+          { value: '选项1',label: '黄金糕'},
+
+        ],
+        payChannelList:[
+          { value: 'applet',label: '小程序'},
+          { value: 'cashier',label: '收银台'},
+        ],
+        sumPayMoney:'支付金额'
+      };
+    },
+    created() {
+      this.getList();
+    },
+    methods: {
+       // 查询列表
+       getList() {
+        this.loading = true;
+        this.queryParams.storeId = this.id
+        getOrderListApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+            this.list = response.data.records;
+            this.total = response.data.total;
+            this.getSumPayMoney()
+            this.loading = false;
+          }
+        );
+      },
+
+       // 查询总钱数
+       getSumPayMoney() {
+        // this.loading = true;
+        this.queryParams.storeId = this.id
+        getSumPayMoneyApi(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+            if(response.data > 0) {
+              const sum = response.data
+              this.sumPayMoney = '支付金额(总计：￥'+sum+')'
+            }else {
+              this.sumPayMoney = '支付金额'
+
+            }
+            // this.loading = false;
+          }
+        );
+      },
+
+      getType(data) {
+        const matchedElement = this.typeList.find(element => element.value === data);
+        if (matchedElement) {
+            return matchedElement.label;
+        }
+        return null;
+      },
+
+      showDesc(){
+        this.drawer = true;
+      },
+      handleNodeClick1(data) {
+        this.form.posPrem = JSON.stringify(data);
+      },
+      handleNodeClick2(data) {
+        this.form.appletPrem = JSON.stringify(data);
+      },
+      getCheckbox(){
+        this.form.writeOff = this.writeOff.toString();
+        this.form.specialPrem = this.specialPrem.toString();
+      },
+      // 页面跳转
+      toTarget(url) {
+        this.$router.push( { path: url } );
+      },
+     
+      // 查询角色列表
+      getDuty(){
+        listDuty().then(response => {
+          this.role = response.data
+        })
+      },
+      // 店铺列表
+      getStoreList() {
+        listStaff().then(response => {
+            this.storeOptions = response.data.records;
+          }
+        );
+        // searchStore().then(response => {
+        //     this.storeOptions = response.data.storeList;
+        //   }
+        // );
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.resetForm("queryForm");
+        this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
+        this.handleQuery();
+      },
+    
+      // 多选框选中数据
+      handleSelectionChange(selection) {
+        this.ids = selection.map(item => item.operId)
+        this.multiple = !selection.length
+      },
+      // 排序触发事件
+      handleSortChange(column, prop, order) {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+        this.getList();
+      },
+      // 新增按钮操作
+      handleAdd() {
+        this.reset();
+        this.open = true;
+        this.title = "新增员工";
+      },
+      // 表单重置
+      reset() {
+        this.posPrem = '';
+        this.appletPrem = '';
+        this.writeOff = []
+        this.form = {
+          id:'', category:'', userId:'', mobile:'', realName:'', wechat:'', merchantId:'', storeId:this.id, auditedStatus:'A',
+          auditedTime:'', description:'', isRefuel:'yc', handoverMode:'dqmdtyjb', handoverPrem:'yqx', handoverOut:'jbtc', record:'qbjl',
+          merchantStatus:'qy',screen:'qy', posPrem:'', appletPrem:'', notice:'advice_jy', oilGunId:'', timeFrame:'bx', refund:'yqx',
+          transaction:'qbjy', writeOff:'',specialPrem:'', official:'', status:'qy',pos:'jy',role:''
+        };
+        this.resetForm("form");
+      },
+      // 取消按钮
+      cancel() {
+        this.open = false;
+        this.reset();
+      },
+  
+    }
+  };
+</script>
+
+<style scoped>
+  .app-container{
+    width: 100%;
+    height: 100%;
+    /* height: 100vh; */
+    background: white;
+  }
+  .pagin-box{
+    background: white;
+    box-sizing: border-box;
+    padding: 20px;
+  }
+  .baoguo{
+    background: white;
+    box-sizing: border-box;
+    padding: 20px;
+    margin-bottom: 20px;
+  }
+</style>
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 b7a342751..9116854c5 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
@@ -136,8 +136,9 @@
             cfc.change_type changeType,
             cfc.balance balance,
             cfc.order_no orderNo,
-            cfc.from_type from_type,
-            cfc.create_time createTime
+            cfc.from_type fromType,
+            cfc.create_time createTime,
+            cfc.after_the_change afterTheChange
         from card_fuel_change cfc
                 left join mt_store ms on  ms.id = cfc.store_id
         <where>
@@ -148,12 +149,13 @@
                 and cfc.store_id = #{cardFuelChange.storeId}
             </if>
         </where>
+        order by cfc.id desc
     </select>
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
-        insert into card_fuel_change(user_id, chain_store_id, store_id, change_type, from_type, balance, create_time, create_by, update_time, update_by, type, oil_type, unit,order_no)
-        values (#{userId}, #{chainStoreId}, #{storeId}, #{changeType}, #{fromType}, #{balance}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, #{type}, #{oilType}, #{unit},#{orderNo})
+        insert into card_fuel_change(user_id, chain_store_id, store_id, change_type, from_type, balance, create_time, create_by, update_time, update_by, type, oil_type, unit,order_no,after_the_change)
+        values (#{userId}, #{chainStoreId}, #{storeId}, #{changeType}, #{fromType}, #{balance}, #{createTime}, #{createBy}, #{updateTime}, #{updateBy}, #{type}, #{oilType}, #{unit},#{orderNo},#{afterTheChange})
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
index 3296351e8..ad901beaa 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
@@ -248,6 +248,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
     @Autowired
     private RedisLock redisLock;
 
+    private static String beforeLitres = new String("0");
     /**
      * 查询支付状态 修改相关关联表
      * @param id
@@ -264,8 +265,10 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
             // 查询用户信息
             LJUserVo ljUserVos = ljUserMapper.selectAllInfoById2(cardFuelRecord.getMtUserId(),cardFuelRecord.getChainStoreId());
 
+            beforeLitres = "0";
             // 修改该用户的余额信息
             if (!ObjectUtil.isEmpty(ljUserVos)) {
+
                 UserBalance userBalance = editRefuelMoney(cardFuelRecord, ljUserVos);
                 if (!ObjectUtil.isEmpty(userBalance)) {
                     userBalanceService.updateUserBalance(userBalance);
@@ -274,6 +277,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
 
             // 添加余额充值纪录表
             CardFuelChange cardFuelChange = editFuelChange(cardFuelRecord);
+            cardFuelChange.setAfterTheChange(Double.valueOf(beforeLitres));
             cardFuelChangeService.insert(cardFuelChange);
             // 积分表变动
             if (!ObjectUtil.isEmpty(cardFuelRecord.getPoints()) && cardFuelRecord.getPoints() != 0) {
@@ -294,6 +298,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
     }
 
     public UserBalance editRefuelMoney(CardFuelRecord cardFuelRecord,LJUserVo ljUserVos) {
+        beforeLitres = "0";
         List<Map<String, String>> refuelMoneyList = new ArrayList<>();
         UserBalance userBalance = new UserBalance();
         userBalance.setId(ljUserVos.getBalanceId());
@@ -305,6 +310,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
             refuelMoney.put("type",cardFuelRecord.getType());
             refuelMoney.put("oilType",cardFuelRecord.getOilType());
             refuelMoney.put("refuelMoney",cardFuelRecord.getIncomeLitres().toString());
+            beforeLitres = cardFuelRecord.getIncomeLitres().toString();
 
             refuelMoneyList.add(refuelMoney);
             String jsonString = JSON.toJSONString(refuelMoneyList);
@@ -323,6 +329,9 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
                     BigDecimal ref = new BigDecimal(refuelMoney);
                     BigDecimal inconLitres = new BigDecimal(cardFuelRecord.getIncomeLitres().toString());
                     BigDecimal add = ref.add(inconLitres);
+                    beforeLitres = add.toString();
+
+
                     stringObjectMap.put("refuelMoney",add.toString());
                     flag = false;
                     break;
@@ -349,7 +358,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
         cardFuelChange.setStoreId(cardFuelRecord.getStoreId());
         cardFuelChange.setUserId(cardFuelRecord.getMtUserId());
         cardFuelChange.setChangeType("1");
-        cardFuelChange.setFromType("油卡充值赠送");
+        cardFuelChange.setFromType("油卡充值");
         cardFuelChange.setBalance(cardFuelRecord.getIncomeLitres());
         cardFuelChange.setType(cardFuelRecord.getType());
         cardFuelChange.setOilType(cardFuelRecord.getOilType());
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 9c19d659d..3c422b6de 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
@@ -405,14 +405,23 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
 
             // 添加余额充值纪录表
             CardBalanceChange cardBalanceChange = addCardBalance(cardValueRecord);
-            cardBalanceChangeService.insertCardBalance(cardBalanceChange);
+            cardBalanceChange.setAfterTheChange(userBalance.getCardBalance());
+            cardBalanceChangeService.insertCardBalance2(cardBalanceChange);
             double epsilon = 1e-10; // 阈值
-            // 插入 余额赠送
+            // 插入 余额赠送--
             if (cardValueRecord.getGiftBalance()>epsilon) {
                 cardBalanceChange.setFromType("余额充值赠送");
                 cardBalanceChange.setBalance(cardValueRecord.getGiftBalance());
                 cardBalanceChange.setStoreId(cardValueRecord.getStoreId());
                 cardBalanceChange.setChainStoreId(cardValueRecord.getChainStoreId());
+                cardBalanceChange.setOrderNo(cardValueRecord.getPaymentNo());
+
+                // 处理赠送
+                BigDecimal resCardBalance = new BigDecimal(userBalance.getCardBalance().toString());  // 原有数据
+                BigDecimal getGiftBalance = resCardBalance.add(new BigDecimal(cardValueRecord.getGiftBalance().toString()));  // 原有数据
+                userBalance.setCardBalance(Double.valueOf(getGiftBalance.toString()));
+                userBalanceService.updateUserBalance(userBalance);
+                cardBalanceChange.setAfterTheChange(userBalance.getCardBalance());
 
                 cardBalanceChange.setCreateBy(cardValueRecord.getMtStaffId().toString());
                 cardBalanceChangeService.insertCardBalance2(cardBalanceChange);
@@ -454,6 +463,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
         cardBalanceChange.setFromType("余额充值");
         cardBalanceChange.setBalance(cardValueRecord.getRechargeBalance());
         cardBalanceChange.setStoreId(cardValueRecord.getStoreId());
+        cardBalanceChange.setOrderNo(cardValueRecord.getPaymentNo());
         cardBalanceChange.setChainStoreId(cardValueRecord.getChainStoreId());
 
         return cardBalanceChange;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
index 517ae4dbd..0e7ba2836 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/AllOrderInfoController.java
@@ -1,6 +1,12 @@
 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.AllOrderInfo;
+import com.fuint.business.order.entity.CardBalanceChange;
 import com.fuint.business.order.service.AllOrderInfoService;
+import com.fuint.business.order.vo.AllOrderInfoVo;
+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;
@@ -14,6 +20,30 @@ public class AllOrderInfoController extends BaseController {
     @Autowired
     private AllOrderInfoService allOrderInfoService;
 
+    /**
+     * 分页查询全部订单信息
+     * @param allOrderInfo
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("getPageList")
+    public ResponseObject getPageList(AllOrderInfo allOrderInfo,
+                                            @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                                            @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        IPage<AllOrderInfoVo> list = allOrderInfoService.getPageList(page, allOrderInfo);
+        return getSuccessResult(list);
+    }
+
+
+
+    @GetMapping("sumPayMoney")
+    public ResponseObject sumPayMoney(AllOrderInfo allOrderInfo) {
+        String sum = allOrderInfoService.sumPayMoney(allOrderInfo);
+        return getSuccessResult(sum);
+    }
+
     /**
      * 根据订单号修改订单支付状态
      * @param map
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
index 80d98ed87..a8d85eec2 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
@@ -1,7 +1,12 @@
 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.AllOrderInfo;
+import com.fuint.business.order.entity.CardBalanceChange;
+import com.fuint.business.order.vo.AllOrderInfoVo;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
 import com.fuint.business.store.entity.MtStore;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,6 +14,10 @@ import java.math.BigDecimal;
 import java.util.List;
 
 public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
+
+    IPage<AllOrderInfoVo> getPageList(@Param("page") Page page, @Param("allOrderInfo") AllOrderInfo allOrderInfo);
+
+    String sumPayMoney( @Param("allOrderInfo") AllOrderInfo allOrderInfo);
     // 根据storeId List查询总流水
     BigDecimal allStream(@Param("list") List<MtStore> mtStoreList);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index 778467da9..760725821 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -12,4 +12,73 @@
                 </foreach>
         </where>
     </select>
+    <select id="getPageList" resultType="com.fuint.business.order.vo.AllOrderInfoVo">
+        select
+            aoi.id AS id,
+            aoi.order_no AS orderNo,
+            aoi.type AS type,
+            aoi.transaction_id AS transactionId,
+            aoi.store_id AS storeId,
+            aoi.goods_money AS goodsMoney,
+            aoi.pay_money AS payMoney,
+            aoi.pay_time AS payTime,
+            aoi.pay_type AS payType,
+            aoi.user_id AS userId,
+            aoi.pay_channel AS payChannel,
+            aoi.status AS orderStatus,
+            aoi.content AS orderContent,
+            aoi.create_time AS createTime,
+            aoi.create_by AS createBy,
+            aoi.update_time AS updateTime,
+            aoi.update_by AS updateBy,
+            mu.name userName,
+            mu.mobile userMobile
+        from all_order_info aoi
+        left join mt_user mu ON aoi.user_id = mu.id
+        where aoi.store_id = #{allOrderInfo.storeId}
+        <if test="allOrderInfo.type != null and allOrderInfo.type != ''">
+            and aoi.type = #{allOrderInfo.type}
+        </if>
+        <if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
+            and aoi.order_no = #{allOrderInfo.orderNo}
+        </if>
+        <if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
+            and aoi.pay_channel = #{allOrderInfo.payChannel}
+        </if>
+        <if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
+            and aoi.pay_type = #{allOrderInfo.payType}
+        </if>
+        <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+        </if>
+        <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+        </if>
+        order by pay_time desc
+    </select>
+    <select id="sumPayMoney" resultType="java.lang.String">
+        select
+            sum(aoi.pay_money) sumPayMoney
+        from all_order_info aoi
+        left join mt_user mu ON aoi.user_id = mu.id
+        where aoi.store_id = #{allOrderInfo.storeId}
+        <if test="allOrderInfo.type != null and allOrderInfo.type != ''">
+            and aoi.type = #{allOrderInfo.type}
+        </if>
+        <if test="allOrderInfo.orderNo != null and allOrderInfo.orderNo != ''">
+            and aoi.order_no = #{allOrderInfo.orderNo}
+        </if>
+        <if test="allOrderInfo.payChannel != null and allOrderInfo.payChannel != ''">
+            and aoi.pay_channel = #{allOrderInfo.payChannel}
+        </if>
+        <if test="allOrderInfo.payType != null and allOrderInfo.payType != ''">
+            and aoi.pay_type = #{allOrderInfo.payType}
+        </if>
+        <if test="allOrderInfo.params.beginTime != null and allOrderInfo.params.beginTime != ''"><!-- 开始时间检索 -->
+            and date_format(pay_time,'%y%m%d') &gt;= date_format(#{allOrderInfo.params.beginTime},'%y%m%d')
+        </if>
+        <if test="allOrderInfo.params.endTime != null and allOrderInfo.params.endTime != ''"><!-- 结束时间检索 -->
+            and date_format(pay_time,'%y%m%d') &lt;= date_format(#{allOrderInfo.params.endTime},'%y%m%d')
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
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
index 212515caf..978218608 100644
--- 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
@@ -24,6 +24,6 @@
                 and cbc.store_id = #{cardBalanceChange.storeId}
             </if>
         </where>
-order by  cbc.create_time DESC
+order by  cbc.id DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
index 82f11ccdd..793e7e8ab 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/AllOrderInfoService.java
@@ -1,8 +1,28 @@
 package com.fuint.business.order.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuint.business.order.entity.AllOrderInfo;
+import com.fuint.business.order.vo.AllOrderInfoVo;
+import com.fuint.business.order.vo.CardBalanceChangeVo;
 
 public interface AllOrderInfoService {
+
+    /**
+     * 分页查询全部订单信息
+     * @param allOrderInfo
+     * @param page
+     * @return
+     */
+    IPage<AllOrderInfoVo> getPageList(Page page, AllOrderInfo allOrderInfo);
+
+    /**
+     * 统计总的金额
+     * @param allOrderInfo
+     * @return
+     */
+    String sumPayMoney(AllOrderInfo allOrderInfo);
+
     /**
      * 根据订单号查询所有订单信息
      * @param orderNo
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index 905846bb4..b3e69d257 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -2,19 +2,50 @@ package com.fuint.business.order.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuint.api.fuyou.service.MerchantConfigService;
 import com.fuint.business.order.entity.AllOrderInfo;
 import com.fuint.business.order.mapper.AllOrderInfoMapper;
 import com.fuint.business.order.service.AllOrderInfoService;
 import com.fuint.business.order.service.OilOrderService;
+import com.fuint.business.order.vo.AllOrderInfoVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllOrderInfo> implements AllOrderInfoService {
+
+    @Autowired
+    private MerchantConfigService merchantConfigService;
+
+    @Autowired
+    private OilOrderService orderService;
+
+    @Resource
+    AllOrderInfoMapper allOrderInfoMapper;
+    @Override
+    public IPage<AllOrderInfoVo> getPageList(Page page, AllOrderInfo allOrderInfo) {
+        IPage<AllOrderInfoVo> pageList = allOrderInfoMapper.getPageList(page, allOrderInfo);
+        return pageList;
+    }
+
+    public String sumPayMoney(AllOrderInfo allOrderInfo){
+        String sumPayMoney = allOrderInfoMapper.sumPayMoney(allOrderInfo);
+
+        if (ObjectUtil.isEmpty(sumPayMoney)) {
+            sumPayMoney = "-1";
+        }
+        return sumPayMoney;
+    }
+
     @Override
     public AllOrderInfo selectAllOrderInfoByOrderNo(String orderNo) {
         QueryWrapper queryWrapper = new QueryWrapper<>();
@@ -27,8 +58,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         return baseMapper.insert(allOrderInfo);
     }
 
-    @Autowired
-    private MerchantConfigService merchantConfigService;
 
     @Override
     public int updateAllOrderInfo(AllOrderInfo allOrderInfo) {
@@ -36,8 +65,6 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
         return baseMapper.updateById(allOrderInfo);
     }
 
-    @Autowired
-    private OilOrderService orderService;
 
     @Override
     public int updateAllOrderInfoByOrderNo(String orderNo, String status) {
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 d2e6d4d15..c492eb2b2 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
@@ -1096,11 +1096,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         );
 
         // 计算对应的环比
-        chainMaps(mergedMap);
+        Map<String, Double> stringDoubleMap = chainMaps(mergedMap);
         // 数据组装
 
-
-        return mergedMap;
+return stringDoubleMap;
+//        return mergedMap;
     }
 
     // 员工统计
@@ -1231,6 +1231,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
 
         // 计算环比增长率
         double growthRate = (res - last) / last * 100;
+//        double growthRate =  ((res - last) / Math.abs(last)) * 100.0;
+
 
         // 使用DecimalFormat将结果格式化为两位小数
         DecimalFormat decimalFormat = new DecimalFormat("#.##");
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
new file mode 100644
index 000000000..26882bfa5
--- /dev/null
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/AllOrderInfoVo.java
@@ -0,0 +1,11 @@
+package com.fuint.business.order.vo;
+
+import com.fuint.business.order.entity.AllOrderInfo;
+import lombok.Data;
+
+@Data
+public class AllOrderInfoVo extends AllOrderInfo {
+    private String userName;
+    private String userMobile;
+    private Double sumPayMoney;
+}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
index 3f6eee40d..008b6971b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/mapper/xml/SysDeptMapper.xml
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
 		select count(1) from sys_dept
-		where   parent_id = #{deptId} limit 1
+		where   parent_id = #{deptId} and if_delete = 0 limit 1
 	</select>
 	
 	<select id="selectChildrenDeptById"  resultType="com.fuint.system.dept.entity.SysDept">
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
index e684593d2..fe9421891 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
@@ -91,10 +91,12 @@
         <div class="bottom-posi">
           <div class="center-left-wrap">
             <div class="wrap-box" v-for="item in payList"
-                 v-if="item.dictValue!='APPLET_CODE'"
+                 v-if="item.dictValue!=='APPLET_CODE'"
                  :key="item.dictValue"
-                 :value="item.dictValue">
-              <span @click="payMethod(item.dictValue)">{{ item.dictLabel }}</span>
+                 :value="item.dictValue"
+                 :class="{ 'wrap-box2': item.dictValue === paymentType }"
+            >
+              <span @click="payMethod(item)">{{ item.dictLabel }}</span>
             </div>
           </div>
           <div class="center-left-bottom">
@@ -320,7 +322,7 @@
       </el-dialog>
 <!--    立即结算-->
       <el-dialog
-        title="扫码支付"
+        :title="payType"
         :visible.sync="dialogVisiblej"
         width="30%"
         :close-on-click-modal="false">
@@ -333,6 +335,8 @@
           <div style="text-align: center;margin-bottom: 10px">
             减去积分：{{ allPoints }}
           </div>
+          <template v-if="paymentType !== 'CASH'">
+
           <div>
             <el-input v-model="authCode"
                       autofocus="autofocus"
@@ -352,6 +356,8 @@
                 src="https://oil.wudb.cn/static/img/scan-demo.fcb8b1ab.png"></el-image>
             </div>
           </div>
+          </template>
+
           <el-divider></el-divider>
           <span slot="footer" class="dialog-footer" style="display: flex;justify-content: space-around">
           <el-button @click="dialogVisiblej = false" class="but">取 消</el-button>
@@ -446,7 +452,8 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
             isPay:true,
             isPaySuccess:false,
             loading:false,
-            paymentType : '',
+            paymentType : 'ALIPAY', // 默认支付宝
+            payType:'支付宝支付'
             // isTheBalanceIsSufficient:false,  //余额是否充足
           }
 
@@ -483,7 +490,8 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
           })
         },
         payMethod(payType){
-          this.paymentType = payType
+          this.paymentType = payType.dictValue
+          this.payType = payType.dictLabel +"支付"
         },
 
         // 点击商品增加库存
@@ -1129,6 +1137,7 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
     /*background: #00afff !important;*/
     width: 100%;
     height: 100%;
+
     border-radius: 8px;
     height: 80px;
     display: flex;
@@ -1139,6 +1148,21 @@ import {getUserInfoMobile, getUserVoMobile, getUserVoName} from "@/api/cashier/u
     /*color: white;*/
   }
 
+  .wrap-box2{
+    background: #36b713 !important;
+    color: white;
+    //width: 100%;
+    //height: 100%;
+    //border-radius: 8px;
+    //height: 80px;
+    //display: flex;
+    //align-items: center;
+    //justify-content: center;
+    //border: 1px solid #20b400;
+    //cursor: pointer;
+    //color: #20b400;
+  }
+
   .center-left-bottom{
     width: 100%;
     background-color: white;