From 249b30da4df5c4c451fb890eee3e38d2c196a949 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Sat, 27 Jan 2024 09:05:50 +0800
Subject: [PATCH] bug

---
 fuintAdmin/src/api/order/cashierorder.js      |  9 +++
 fuintAdmin/src/views/order/order_Cashier.vue  | 33 +++++++++-
 .../src/views/components/Service/staff.vue    |  6 +-
 .../com/fuint/api/fuyou/entity/Const.java     |  4 +-
 .../cardValue/dto/CardValueRecordDTO.java     |  1 +
 .../mapper/xml/CardValueRecordMapper.xml      | 11 +++-
 .../controller/CashierOrderController.java    | 16 +++++
 .../order/mapper/CashierOrderMapper.java      |  8 +++
 .../order/mapper/xml/CashierOrderMapper.xml   | 24 +++++++-
 .../order/service/CashierOrderService.java    |  8 +++
 .../service/impl/CashierOrderServiceImpl.java |  8 +++
 .../src/api/cashier/cashierorder.js           |  9 +++
 .../views/cashier/NewComponents/homeindex.vue | 16 +++--
 .../cashier/orderComponents/order_Cashier.vue | 38 +++++++++++-
 gasStation-uni/pages/index/index.vue          |  4 +-
 gasStation-uni/pagesMy/VIP/vip.vue            | 20 +++++-
 .../pagesMy/moneyBalance/moneyBalance.vue     | 61 ++++++++++++++++---
 .../pagesMy/oilBalance/oilBalance.vue         | 46 +++++++++++---
 .../pagesRefuel/orderDetail/index.vue         | 12 +++-
 19 files changed, 292 insertions(+), 42 deletions(-)

diff --git a/fuintAdmin/src/api/order/cashierorder.js b/fuintAdmin/src/api/order/cashierorder.js
index fd4322055..7dbc846a4 100644
--- a/fuintAdmin/src/api/order/cashierorder.js
+++ b/fuintAdmin/src/api/order/cashierorder.js
@@ -9,6 +9,15 @@ export function listCashierOrder(query) {
   })
 }
 
+// 查询收银台订单列表
+export function cashierOrderSeekZeroAmount(query) {
+  return request({
+    url: '/business/cashierOrder/seekZeroAmount',
+    method: 'get',
+    params: query
+  })
+}
+
 // 根据id查询收银台订单列表
 export function cashierOrder(id) {
   return request({
diff --git a/fuintAdmin/src/views/order/order_Cashier.vue b/fuintAdmin/src/views/order/order_Cashier.vue
index aa3b848f0..879117606 100644
--- a/fuintAdmin/src/views/order/order_Cashier.vue
+++ b/fuintAdmin/src/views/order/order_Cashier.vue
@@ -65,6 +65,10 @@
           <div class="size-hui">商品总金额</div>
           <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
         </div>
+        <div class="box">
+          <div class="size-hui">找零总金额</div>
+          <div class="size-bole">{{ seekZeroAmount }}</div>
+        </div>
 
       </div>
     </el-card>
@@ -94,6 +98,7 @@
           <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
           <el-table-column prop="amount" label="订单金额"> </el-table-column>
           <el-table-column prop="payAmount" label="实付金额"> </el-table-column>
+          <el-table-column prop="seekZero" label="找零金额"> </el-table-column>
           <el-table-column label="订单金额组成">
             <el-table-column prop="oilOrderAmount" label="油品金额">
               <template slot-scope="scope">
@@ -167,17 +172,27 @@
           <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="实付金额">{{ cashierOrder.payAmount }}</el-descriptions-item>
+          <el-descriptions-item label="找零金额">{{ cashierOrder.seekZero }}</el-descriptions-item>
           <el-descriptions-item label="付款方式">
+            <span v-if="cashierOrder.payType == 'CASH'">现金</span>
+            <span v-else-if="cashierOrder.payType == 'WECHAT'">微信</span>
+            <span v-else-if="cashierOrder.payType == 'ALIPAY'">支付宝</span>
+            <span v-else-if="cashierOrder.payType == 'UNIONPAY'">银联二维码</span>
+            <span v-else>小程序码</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="付款状态">
             <el-tag v-if="cashierOrder.status == 'unpaid'">未支付</el-tag>
             <el-tag type="success" v-else-if="cashierOrder.status == 'paid'">已支付</el-tag>
-            <el-tag type="danger" v-else>支付失败</el-tag>
+            <el-tag type="warning" v-else-if="cashierOrder.status == 'payFail'">支付失败</el-tag>
+            <el-tag type="danger" v-else-if="cashierOrder.status == 'refund'">已退款</el-tag>
+            <el-tag type="info" v-else>退款中</el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="交易时间">
             {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime):"--" }}
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <div>
+      <div style="margin-top: 30px">
         <el-descriptions :column="1" direction="vertical">
           <el-descriptions-item label="油品详情">
             <el-table
@@ -262,7 +277,7 @@
 </template>
 
 <script>
-import {cashierOrder, listCashierOrder, orderStatisticsApi} from "@/api/order/cashierorder";
+import {cashierOrder, cashierOrderSeekZeroAmount, listCashierOrder, orderStatisticsApi} from "@/api/order/cashierorder";
 import {queryStaffs} from "@/api/order/staff";
 import {oilOrderList, oilOrders} from "@/api/order/oilorder";
 import {getOilNameList} from "@/api/order/oilnumgun";
@@ -308,6 +323,7 @@ import {refundApi} from "@/api/order/refund";
           theTotalAmountOfTheItem:'0',
         },
         total:0,
+        seekZeroAmount:0,
       }
     },
     created() {
@@ -451,6 +467,17 @@ import {refundApi} from "@/api/order/refund";
           this.orderList = response.data.records;
           this.total = response.data.total;
         })
+        this.getSeekZero(val)
+      },
+      getSeekZero(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          if (response.data) {
+            this.seekZeroAmount = response.data
+          }
+        })
       },
       // 获取员工列表信息
       getStaffList(){
diff --git a/fuintAdmin_zt/src/views/components/Service/staff.vue b/fuintAdmin_zt/src/views/components/Service/staff.vue
index bda4a0147..a976a89db 100644
--- a/fuintAdmin_zt/src/views/components/Service/staff.vue
+++ b/fuintAdmin_zt/src/views/components/Service/staff.vue
@@ -143,9 +143,9 @@
           <el-col :span="8">
             <el-form-item label="角色组" prop="role">
               <el-select v-model="form.roleId" placeholder="请选择角色" style="width: 270px">
-                <el-option label="油站站长" :value="12" ></el-option>
-                <el-option label="加油员" :value="15" ></el-option>
-                <el-option label="收银员" :value="16" ></el-option>
+                <el-option label="油站站长" :value="12+''" ></el-option>
+                <el-option label="加油员" :value="15+''" ></el-option>
+                <el-option label="收银员" :value="16+''" ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
index fc1531ef8..c69471fc9 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/entity/Const.java
@@ -49,8 +49,8 @@ public class Const {
     public static String NOTIFY_PUBLIC_KEYS="MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbBAl3xSB7YeUnze4yYZmnTeT7OtXZr0sP10TsDVRH2SY/VEjgS9KPmHMmVeKZT3+6xKsUvulgVyie46GGtZPrnoh+glF1gzsYAXJ7dvR/R5nYO5VvfwK/ChPFTiKhbTtO4OKtchgBZuqCbsemG+gFIiVJo37dY0Kg0zISmFHdOQIDAQAB";
 
     //异步通知(回调地址)
-//    public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
-    public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
+    public static String notify_url = "https://www.tuofeng.cc/oilAdmin/api/fyPay/notify";
+//    public static String notify_url = "https://8q4f124343.yicp.fun/api/fyPay/notify";
 
     //下单
     public static String fuiou_21_url = "https://fundwx.fuiou.com/preCreate";
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
index c649aa0b6..4cc059dec 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/dto/CardValueRecordDTO.java
@@ -22,6 +22,7 @@ public class CardValueRecordDTO extends CardValueRecord {
     private Integer cardRecordId;
     private String appltType;
     private String paymentType;
+    private String payStatus;
 
 //    /**
 //     * 会员id
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 74f2a0fa9..29943b5f9 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
@@ -67,11 +67,16 @@
         combined_result.storeId,
         combined_result.OilName,
         combined_result.type,
-        combined_result.paymentType
+        combined_result.paymentType,
+        combined_result.payStatus
         FROM
-        (SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, gift_balance obtain, fringe_benefit oilName,royalty_type type,create_time createTime, chain_store_id chainStoreId, store_id storeId  FROM card_value_record
+        (SELECT '储值卡' AS recordName,payment_type paymentType,mt_user_id mtUserId,
+                recharge_balance rechargeBalance, gift_balance obtain, fringe_benefit oilName,royalty_type type,
+                create_time createTime, chain_store_id chainStoreId, store_id storeId,pay_status payStatus  FROM card_value_record
         UNION
-        SELECT '升数卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance, income_litres obtain,oil_name oilName,type, create_time createTime, chain_store_id chainStoreId, store_id storeId  FROM card_fuel_record) AS combined_result
+        SELECT '升数卡' AS recordName,payment_type paymentType,mt_user_id mtUserId, recharge_balance rechargeBalance,
+               income_litres obtain,oil_name oilName,type, create_time createTime, chain_store_id chainStoreId,
+               store_id storeId,pay_status payStatus  FROM card_fuel_record) AS combined_result
 
         <where>
             <if test="cardValueRecord.mtUserId != null">
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 04c432c68..202130ea5 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
@@ -38,6 +38,22 @@ public class CashierOrderController extends BaseController {
         return getSuccessResult(list);
     }
 
+    /**
+     * 根据条件分页查询收银员订单信息
+     * @param order
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("/seekZeroAmount")
+    public ResponseObject seekZeroAmount(CashierOrder order,
+                               @RequestParam(value = "page",defaultValue = "1") Integer pageNo,
+                               @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize){
+        Page page =new Page(pageNo,pageSize);
+        Double seekZeroAmount = cashierOrderService.selectCashierOrderSeekZeroAmount(page, order);
+        return getSuccessResult(seekZeroAmount);
+    }
+
     /**
      * 导出订单
      * @param response
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 dc5def654..fc299ccc7 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
@@ -21,6 +21,14 @@ public interface CashierOrderMapper extends BaseMapper<CashierOrder> {
      */
     public IPage<CashierOrder> selectCashierOrderList(Page page, @Param("order") CashierOrder order);
 
+    /**
+     * 根据条件分页查询订单信息
+     * @param page
+     * @param order
+     * @return
+     */
+    public Double selectCashierOrderSeekZeroAmount(Page page,@Param("order") CashierOrder order);
+
 
     List<CashierOrderExcel> selectCashierOrderListExport(@Param("order") CashierOrder order);
 
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 fc0cb7e3a..6851a89de 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
@@ -204,7 +204,29 @@
                     ) AS theTotalAmountOfTheItem -- 商品总金额
 
     </select>
-<!--        <select id="orderStatistics" resultType="java.util.Map">-->
+    <select id="selectCashierOrderSeekZeroAmount" resultType="java.lang.Double">
+        select sum(seek_zero) from cashier_order
+        <where>
+            store_id = #{order.storeId}
+            <if test="order.staffId != null and order.staffId != ''">
+                and 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>
+            order by create_time desc
+        </where>
+    </select>
+    <!--        <select id="orderStatistics" resultType="java.util.Map">-->
 <!--            SELECT-->
 <!--                    (SELECT count(*) FROM cashier_order) AS 笔数,-->
 <!--                    (SELECT sum(amount) FROM cashier_order) AS 订单总金额,-->
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 4de17fc8f..a7304fd82 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
@@ -20,6 +20,14 @@ public interface CashierOrderService extends IService<CashierOrder> {
      */
     public IPage<CashierOrder> selectCashierOrderList(Page page, CashierOrder order);
 
+    /**
+     * 根据条件分页查询订单信息
+     * @param page
+     * @param order
+     * @return
+     */
+    public Double selectCashierOrderSeekZeroAmount(Page page, CashierOrder order);
+
     void export(HttpServletResponse response, CashierOrder order);
 
     /**
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 2d22cdd02..504b9d91a 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
@@ -32,6 +32,14 @@ public class CashierOrderServiceImpl extends ServiceImpl<CashierOrderMapper, Cas
         return cashierOrderIPage;
     }
 
+    @Override
+    public Double selectCashierOrderSeekZeroAmount(Page page, CashierOrder order) {
+        AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
+        Integer storeId = nowAccountInfo.getStoreId();
+        order.setStoreId(storeId);
+        return baseMapper.selectCashierOrderSeekZeroAmount(page,order);
+    }
+
     public void export(HttpServletResponse response, CashierOrder order) {
 
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
diff --git a/fuintCashierWeb/src/api/cashier/cashierorder.js b/fuintCashierWeb/src/api/cashier/cashierorder.js
index b40d535d9..678598344 100644
--- a/fuintCashierWeb/src/api/cashier/cashierorder.js
+++ b/fuintCashierWeb/src/api/cashier/cashierorder.js
@@ -9,6 +9,15 @@ export function listCashierOrder(query) {
   })
 }
 
+// 查询收银台订单列表
+export function cashierOrderSeekZeroAmount(query) {
+  return request({
+    url: '/business/cashierOrder/seekZeroAmount',
+    method: 'get',
+    params: query
+  })
+}
+
 // 根据id查询收银台订单列表
 export function cashierOrder(id) {
   return request({
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 15960daa4..dd84ed545 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -452,7 +452,7 @@
           <div>
             <el-input v-model="authCode"
                       v-focus
-                      :autofocus="autofocus"
+                      :key="inputKey"
                       @keydown.enter.native="collection"
                       placeholder="扫描或输入付款码、支持微信、支付宝、云闪付">
               <i
@@ -473,7 +473,7 @@
           <div>
             <el-input v-model="authCode"
                       v-focus ref="getFocus"
-                      :autofocus="autofocus"
+                      :key="inputKey"
                       @input="changeSeekZero"
                       @keydown.enter.native="collection"
                       placeholder="请输入收款金额">
@@ -822,6 +822,7 @@
     data(){
       return{
         gunIndex:[],
+        inputKey:'111',
         autofocus:false,
         baseUrl:process.env.VUE_APP_BASE_API,
         // 满减全选
@@ -1212,7 +1213,7 @@
 
       },
       clear(){
-        this.autofocus = false
+        // this.autofocus = false
         this.dialogVisiblej = false
         this.seekZero = 0
       },
@@ -2214,7 +2215,7 @@
       },
       // 立即结算
       settlement(){
-        this.autofocus = true
+        // this.autofocus = true
         if (this.payType=="APPLET_CODE") {
           if (this.goodsOrder.length > 0) {
             this.$modal.msgError("非油商品不可使用小程序码支付")
@@ -2224,6 +2225,13 @@
         this.authCode = ""
         this.seekZero = 0;
         this.isPay = false
+        let inputKey = Math.random();
+        if (this.inputKey==inputKey){
+          this.inputKey==inputKey+"a"
+        }else {
+          this.inputKey=inputKey
+        }
+
         this.dialogVisiblej = true
 
         this.getStaff()
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 926fdc1c4..908eefa6c 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -65,6 +65,10 @@
           <div class="size-hui">商品总金额</div>
           <div class="size-bole">{{ orderStatistics.theTotalAmountOfTheItem?orderStatistics.theTotalAmountOfTheItem:0 }}</div>
         </div>
+        <div class="box">
+          <div class="size-hui">找零总金额</div>
+          <div class="size-bole">{{ seekZeroAmount }}</div>
+        </div>
 
       </div>
     </el-card>
@@ -94,6 +98,7 @@
           <el-table-column prop="orderNo" label="订单号" width="220"> </el-table-column>
           <el-table-column prop="amount" label="订单金额"> </el-table-column>
           <el-table-column prop="payAmount" label="实付金额"> </el-table-column>
+          <el-table-column prop="seekZero" label="找零金额"> </el-table-column>
           <el-table-column label="订单金额组成">
             <el-table-column prop="oilOrderAmount" label="油品金额">
               <template slot-scope="scope">
@@ -167,17 +172,27 @@
           <el-descriptions-item label="油品优惠总额">{{ cashierOrder.oilDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="商品优惠总额">{{ cashierOrder.goodsDiscountAmount }}</el-descriptions-item>
           <el-descriptions-item label="实付金额">{{ cashierOrder.payAmount }}</el-descriptions-item>
+          <el-descriptions-item label="找零金额">{{ cashierOrder.seekZero }}</el-descriptions-item>
           <el-descriptions-item label="付款方式">
+            <span v-if="cashierOrder.payType == 'CASH'">现金</span>
+            <span v-else-if="cashierOrder.payType == 'WECHAT'">微信</span>
+            <span v-else-if="cashierOrder.payType == 'ALIPAY'">支付宝</span>
+            <span v-else-if="cashierOrder.payType == 'UNIONPAY'">银联二维码</span>
+            <span v-else>小程序码</span>
+          </el-descriptions-item>
+          <el-descriptions-item label="付款状态">
             <el-tag v-if="cashierOrder.status == 'unpaid'">未支付</el-tag>
             <el-tag type="success" v-else-if="cashierOrder.status == 'paid'">已支付</el-tag>
-            <el-tag type="danger" v-else>支付失败</el-tag>
+            <el-tag type="warning" v-else-if="cashierOrder.status == 'payFail'">支付失败</el-tag>
+            <el-tag type="danger" v-else-if="cashierOrder.status == 'refund'">已退款</el-tag>
+            <el-tag type="info" v-else>退款中</el-tag>
           </el-descriptions-item>
           <el-descriptions-item label="交易时间">
             {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime):"--" }}
           </el-descriptions-item>
         </el-descriptions>
       </div>
-      <div>
+      <div style="margin-top: 30px">
         <el-descriptions :column="1" direction="vertical">
           <el-descriptions-item label="油品详情">
             <el-table
@@ -263,7 +278,12 @@
 </template>
 
 <script>
-import {cashierOrder, listCashierOrder,orderStatisticsApi} from "@/api/cashier/cashierorder";
+import {
+  cashierOrder,
+  cashierOrderSeekZeroAmount,
+  listCashierOrder,
+  orderStatisticsApi
+} from "@/api/cashier/cashierorder";
 import {queryStaffs} from "@/api/cashier/staff";
 import {oilOrderList, oilOrders} from "@/api/cashier/oilorder";
 import {getOilNameList} from "@/api/cashier/oilnumgun";
@@ -309,6 +329,7 @@ import {refundApi} from "@/api/cashier/refund";
           theTotalAmountOfTheItem:'0',
         },
         total:0,
+        seekZeroAmount:0,
       }
     },
     created() {
@@ -452,6 +473,17 @@ import {refundApi} from "@/api/cashier/refund";
           this.orderList = response.data.records;
           this.total = response.data.total;
         })
+        this.getSeekZero(val)
+      },
+      getSeekZero(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        cashierOrderSeekZeroAmount(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          if (response.data) {
+            this.seekZeroAmount = response.data
+          }
+        })
       },
       // 获取员工列表信息
       getStaffList(){
diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue
index 51bd8e826..294d673fe 100644
--- a/gasStation-uni/pages/index/index.vue
+++ b/gasStation-uni/pages/index/index.vue
@@ -86,9 +86,9 @@
 
 					<view class="station-title" style="display: flex;justify-content: space-between;">
 						{{store.name}}{{store.description ? "("+store.description+")" : ""}}
-						<view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
+						<!-- <view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
 							<view>切换位置 <uni-icons type="right" color="#304fff" size="16"></uni-icons> </view>
-						</view>
+						</view> -->
 					</view><!--顺通石化加油站(工业南路站)-->
 					<view style="display: flex;">
 						<view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index">
diff --git a/gasStation-uni/pagesMy/VIP/vip.vue b/gasStation-uni/pagesMy/VIP/vip.vue
index 3dbd230d6..a7ca90c9f 100644
--- a/gasStation-uni/pagesMy/VIP/vip.vue
+++ b/gasStation-uni/pagesMy/VIP/vip.vue
@@ -29,7 +29,7 @@
 									<view class="min-size" style="margin-bottom: 10px;" >
 										达到当前等级所需成长值为{{item.growthValue}}
 									</view>
-									<u-line-progress :percentage="30" activeColor="#2F72F7"></u-line-progress>
+									<u-line-progress :percentage="percentage" activeColor="#2F72F7"></u-line-progress>
 								</view>
 								<view class="right-img">
 									<image src="../../static/imgs/vipxz.png"  mode="aspectFit"></image>
@@ -155,6 +155,7 @@
 	export default {
 		data() {
 			return {
+				percentage:0,
 				title: '',
 				info: [{
 						colorClass: 'uni-bg-red',
@@ -211,6 +212,21 @@
 			this.getMember()
 		},
 		methods: {
+			getPercentage(id){
+				let grade = {}
+				this.userGradeList.forEach(i => {
+					if (this.member.gradeId = i.id){
+						grade = i
+					}
+				})
+				console.log(this.member);
+				this.userGradeList.forEach(item => {
+					console.log(item);
+					if (item.id == id){
+						// this.percentage = 
+					}
+				})
+			},
 			// 获取当前登入用户的等级信息
 			getMember(){
 				request({
@@ -218,6 +234,7 @@
 					method: 'get',
 				}).then((res) => {
 					this.member = res.data
+					console.log(this.member,1111);
 				})
 			},
 			getChainConfig(storeId){
@@ -255,6 +272,7 @@
 							this.dieselRule = JSON.parse(res.data[0].dieselRule)
 							this.naturalGasRule = JSON.parse(res.data[0].naturalGasRule)
 						}
+						this.getPercentage(res.data[0].id)
 					}else{
 						this.isExist = false
 					}
diff --git a/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue b/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue
index 50e76d11c..545793b48 100644
--- a/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue
+++ b/gasStation-uni/pagesMy/moneyBalance/moneyBalance.vue
@@ -16,16 +16,31 @@
 					<view class="">已经抵用0.00</view>
 				</view> -->
 			</view>
-			<view class="box-gang">
+			<!-- <view class="box-gang">
 				<view class="">明细</view>
-				<!-- <view class="hui-anniu">全部 <u-icon name="arrow-down-fill" size="18"></u-icon> </view> -->
-			</view>
+				<view class="hui-anniu">全部 <u-icon name="arrow-down-fill" size="18"></u-icon> </view>
+			</view> -->
 			<view class="fuji">
 
-				<view class="mx-box" @click="godetails()" v-for="(item,index) in list" :key="index">
+				<view class="mx-box" v-for="(item,index) in list" :key="index">
 					<view class="m-b-box">
-						<view class="box-name">加油站名称</view>
-						<view class="moneyname">充值成功</view>
+						<!-- <view class="box-name">加油站名称</view> -->
+						<!-- <view class="moneyname">充值成功</view>payStatus -->
+						<view class="box-name">{{getStoreName(storeList,item.storeId)}}</view>
+						<view class="moneyname" v-if="item.payStatus=='paid'">已支付</view>
+						<view class="moneyname" v-else-if="item.payStatus=='payFail'">支付失败</view>
+						<view class="moneyname" v-else-if="item.payStatus=='refund'">已退款</view>
+						<view class="moneyname" v-else-if="item.payStatus=='refunding'">退款中</view>
+						<view class="moneyname" v-else>未支付</view>
+					</view>
+					<view class="y-bt">
+						<view class="sizehui">支付方式</view>
+						<!-- <view class="sizehei">￥{{item.paymentType}}</view> -->
+						<view class="sizehei" v-if="item.paymentType == 'CASH'">现金</view>
+						<view class="sizehei" v-else-if="item.paymentType == 'WECHAT'">微信</view>
+						<view class="sizehei" v-else-if="item.paymentType == 'ALIPAY'">支付宝</view>
+						<view class="sizehei" v-else-if="item.paymentType == 'UNIONPAY'">银联二维码</view>
+						<view class="sizehei" v-else>小程序码</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">订单金额</view>
@@ -39,9 +54,9 @@
 						<view class="sizehui">订单时间</view>
 						<view class="sizehei">{{item.createTime}}</view>
 					</view>
-					<view class="dibu">
+					<!-- <view class="dibu">
 						<view class="xiaanniu">评价有礼</view>
-					</view>
+					</view> -->
 				</view>
 
 			</view>
@@ -69,7 +84,8 @@
 				},
 				cardBalance: 0.00,
 				title: '',
-
+				// 店铺列表信息
+				storeList: [],
 
 			}
 		},
@@ -83,8 +99,19 @@
 			this.list = []
 			this.getUserBalance();
 			this.getAllOrderList();
+			this.getStores();
 		},
 		methods: {
+			// 查询店铺列表信息
+			getStores() {
+				let _this = this;
+				request({
+					url: "business/storeInformation/store/list",
+					method: 'get',
+				}).then((res) => {
+					_this.storeList = res.data
+				})
+			},
 			// 查询全部充值订单
 			getAllOrderList() {
 				request({
@@ -129,7 +156,20 @@
 			},
 			goback() {
 				uni.navigateBack()
-			}
+			},
+			getStoreName(list, id) {
+				let name = "";
+				list.forEach(item => {
+					if (item.id == id) {
+						if (item.description != "" && item.description != null) {
+							name = item.name + "(" + item.description + ")"
+						} else {
+							name = item.name
+						}
+					}
+				})
+				return name;
+			},
 		}
 	}
 </script>
@@ -240,6 +280,7 @@
 		background-color: #ffffff;
 		box-sizing: border-box;
 		padding: 10px;
+		margin-top: 10px;
 	}
 
 	.m-b-box {
diff --git a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue
index e6ebbd317..c0c6dc29d 100644
--- a/gasStation-uni/pagesMy/oilBalance/oilBalance.vue
+++ b/gasStation-uni/pagesMy/oilBalance/oilBalance.vue
@@ -17,16 +17,22 @@
 					<view class="">已经抵用0.00</view>
 				</view> -->
 			</view>
-			<view class="box-gang">
+			<!-- <view class="box-gang">
 				<view class="">明细</view>
-				<!-- <view class="hui-anniu">全部 <u-icon name="arrow-down-fill" size="18"></u-icon> </view> -->
-			</view>
+				<view class="hui-anniu">全部 <u-icon name="arrow-down-fill" size="18"></u-icon> </view>
+			</view> -->
 			<view class="fuji" v-for="(item,index) in list" :key="index">
 
 				<view class="mx-box">
 					<view class="m-b-box">
-						<view class="box-name">加油站名称</view>
-						<view class="moneyname">充值成功</view>
+						<!-- <view class="box-name">加油站名称</view>
+						<view class="moneyname">充值成功</view> -->
+						<view class="box-name">{{getStoreName(storeList,item.storeId)}}</view>
+						<view class="moneyname" v-if="item.payStatus=='paid'">已支付</view>
+						<view class="moneyname" v-else-if="item.payStatus=='payFail'">支付失败</view>
+						<view class="moneyname" v-else-if="item.payStatus=='refund'">已退款</view>
+						<view class="moneyname" v-else-if="item.payStatus=='refunding'">退款中</view>
+						<view class="moneyname" v-else>未支付</view>
 					</view>
 					<view class="y-bt">
 						<view class="sizehui">油品类型</view>
@@ -48,9 +54,9 @@
 						<view class="sizehui">订单时间</view>
 						<view class="sizehei">{{item.createTime}}</view>
 					</view>
-					<view class="dibu">
+					<!-- <view class="dibu">
 						<view class="xiaanniu">评价有礼</view>
-					</view>
+					</view> -->
 				</view>
 
 			</view>
@@ -77,6 +83,8 @@
 				},
 				refuelMoney: [],
 				title: '',
+				// 店铺列表信息
+				storeList: [],
 
 
 			}
@@ -90,8 +98,32 @@
 			this.list = []
 			this.getAllOrderList();
 			this.getUserBalance()
+			this.getStores();
 		},
 		methods: {
+			// 查询店铺列表信息
+			getStores() {
+				let _this = this;
+				request({
+					url: "business/storeInformation/store/list",
+					method: 'get',
+				}).then((res) => {
+					_this.storeList = res.data
+				})
+			},
+			getStoreName(list, id) {
+				let name = "";
+				list.forEach(item => {
+					if (item.id == id) {
+						if (item.description != "" && item.description != null) {
+							name = item.name + "(" + item.description + ")"
+						} else {
+							name = item.name
+						}
+					}
+				})
+				return name;
+			},
 			// 查询全部充值订单
 			getAllOrderList() {
 				request({
diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue
index 80c2c0c70..5a0861071 100644
--- a/gasStation-uni/pagesRefuel/orderDetail/index.vue
+++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue
@@ -252,7 +252,7 @@
 		},
 		onLoad(e) {
 			this.orderNo = e.orderNo
-			// this.orderNo = "234520240124103747dec173"
+			// this.orderNo = "2345202401261502301206e6"
 		},
 		onShow() {
 			this.getOilOrder();
@@ -469,12 +469,14 @@
 					}
 				}
 				if (falg == false) {
-					this.chooseCardBalance(0)
+					// this.chooseCardBalance(0)
 					// this.chooseGrade(this.user.id,this.user.gradeId)
 				}
 				if (this.oilCardRedece==0){
 					if (!this.isFixingLevel){
 						this.getPaymentPreferential(this.user.gradeId)
+					}else{
+						this.chooseCardBalance(0)
 					}
 				}
 			},
@@ -491,6 +493,7 @@
 							this.balanceRedece = this.user.cardBalance
 							this.deductAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece-this.balanceRedece).toFixed(2)
 							this.payAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece-this.balanceRedece).toFixed(2)
+				console.log(this.oilOrder.orderAmount, this.fullRedece, this.couponRedece, this.gradeRedece,this.balanceRedece,111);
 						}
 					}else{
 						// 使用囤油卡
@@ -511,6 +514,7 @@
 				}else{
 					this.deductAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece).toFixed(2)
 					this.payAmount = (this.oilOrder.orderAmount - this.fullRedece - this.couponRedece - this.gradeRedece).toFixed(2)
+					console.log(this.oilOrder.orderAmount, this.fullRedece, this.couponRedece, this.gradeRedece,this.balanceRedece,222);
 				}
 			},
 			// 查看是否有可使用的会员等级优惠
@@ -734,9 +738,11 @@
 						_this.refuelMoneyAfter = JSON.parse(res.data.userVo.refuelMoney)
 						_this.chooseRefuelMoney()
 					}else{
-						_this.chooseCardBalance(0)
+						
 						if (!this.isFixingLevel){
 							_this.getPaymentPreferential(this.user.gradeId)
+						}else{
+							_this.chooseCardBalance(0)
 						}
 					}
 					console.log("afterGrade");