From 5bafce40c504ae2b49c1270688f1f6613060656f Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 15 Nov 2023 18:48:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E9=93=B6=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fuyou/service/impl/FyPayServiceImpl.java  |   3 +-
 .../order/controller/HangBillController.java  |  25 +-
 .../business/order/entity/CashierOrder.java   |   4 +
 .../order/mapper/xml/CashierOrderMapper.xml   |   3 +
 .../order/mapper/xml/OilOrderMapper.xml       |   3 +
 .../order/service/HangBillService.java        |  11 +-
 .../service/impl/HangBillServiceImpl.java     | 106 ++-
 .../src/api/cashier/cardvaluerecord.js        |  10 +
 fuintCashierWeb/src/api/cashier/hangbill.js   |  18 +
 .../src/api/cashier/integral/category.js      |  27 +
 .../src/api/cashier/integral/gift.js          |  55 ++
 .../src/api/cashier/integral/order.js         |  39 ++
 .../src/api/cashier/integral/settings.js      |  27 +
 .../src/views/cashier/NewComponents/Order.vue |   8 +-
 .../views/cashier/NewComponents/credit.vue    | 231 ++++++-
 .../integralComponents/detail.vue             | 114 ++++
 .../integralComponents/outcome.vue            | 214 ++++++
 .../integralComponents/pointsCashier.vue      | 256 ++++++++
 .../integralComponents/pointsMall.vue         | 318 +++++++++
 .../cashier/orderComponents/order_Cashier.vue |  27 +-
 .../cashier/orderComponents/order_Goods.vue   |  54 +-
 .../orderComponents/order_Integral.vue        | 609 +++++++++---------
 .../cashier/orderComponents/order_Oil.vue     | 173 +++--
 .../orderComponents/order_Ordinary.vue        | 435 +++++++++----
 .../cashier/orderComponents/order_Unpaid.vue  | 419 ++++++++----
 .../cashier/orderComponents/order_Vip.vue     | 163 +++--
 26 files changed, 2559 insertions(+), 793 deletions(-)
 create mode 100644 fuintCashierWeb/src/api/cashier/cardvaluerecord.js
 create mode 100644 fuintCashierWeb/src/api/cashier/integral/category.js
 create mode 100644 fuintCashierWeb/src/api/cashier/integral/gift.js
 create mode 100644 fuintCashierWeb/src/api/cashier/integral/order.js
 create mode 100644 fuintCashierWeb/src/api/cashier/integral/settings.js
 create mode 100644 fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/detail.vue
 create mode 100644 fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue
 create mode 100644 fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue
 create mode 100644 fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
index 7f03e35f7..7bfb748b5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
@@ -158,8 +158,7 @@ public class FyPayServiceImpl implements FyPayService {
                         cashierOrder.setStatus("paid");
                     }
                     if (!ObjectUtil.isEmpty(hangBill)){
-                        hangBill.setPayStatus("paid");
-                        hangBillService.updateHangBills(hangBill,allAmount);
+                        hangBillService.updateHangBills(hangBill,allAmount,"paid");
                     }
                     if (ArrayUtil.isEmpty(list)){
                         for (OilOrder order : list) {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
index 2438593f7..4fcb1018d 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/HangBillController.java
@@ -75,7 +75,30 @@ public class HangBillController extends BaseController {
      */
     @PutMapping
     public ResponseObject edit(@Validated @RequestBody Map<String,String> map){
-        int row = hangBillService.updateHangBill(map);
+        HangBill hangBill = hangBillService.updateHangBill(map);
+        return getSuccessResult(hangBill);
+    }
+
+    /**
+     * 批量归还
+     * @param map
+     * @return
+     */
+    @PostMapping("/batch")
+    public ResponseObject batchUpdate(@Validated @RequestBody Map<String,String> map){
+        int row = hangBillService.batchUpdate(map);
         return getSuccessResult(row);
     }
+
+    /**
+     * 根据订单号查询挂账记录信息
+     * @param map
+     * @return
+     */
+    @PostMapping("/orderNo")
+    public ResponseObject queryByOrderNo(@Validated @RequestBody Map<String,String> map){
+        String orderNo = map.get("orderNo");
+        HangBill hangBill = hangBillService.selectHangBillByOrderNo(orderNo);
+        return getSuccessResult(hangBill);
+    }
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
index 2e0c10e20..3ddf4ca9b 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/CashierOrder.java
@@ -42,6 +42,10 @@ public class CashierOrder extends BaseEntity implements Serializable {
      * 商品订单id
      */
     private Integer goodsOrderId;
+    /**
+     * 终端
+     */
+    private String terminal;
     /**
      * 付款用户
      */
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 652fc41c8..82c7d2acf 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
@@ -15,6 +15,9 @@
             <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>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index b22fb3efd..2d7dae4f5 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -21,6 +21,9 @@
             <if test="order.payType != null and order.payType != ''">
                 and pay_type = #{order.payType}
             </if>
+            <if test="order.orderStatus != null and order.orderStatus != ''">
+                and order_status != #{order.orderStatus}
+            </if>
             <if test="order.orderNo != null and order.orderNo != ''">
                 and order_no like concat('%', #{order.orderNo}, '%')
             </if>
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
index 0de3a7ebd..885cd0652 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/HangBillService.java
@@ -53,7 +53,14 @@ public interface HangBillService extends IService<HangBill> {
      * @param map
      * @return
      */
-    public int updateHangBill(Map<String,String> map);
+    public HangBill updateHangBill(Map<String,String> map);
+
+    /**
+     * 批量归还挂账金额
+     * @param map
+     * @return
+     */
+    public int batchUpdate(Map<String,String> map);
 
     /**
      * 修改挂账信息
@@ -61,5 +68,5 @@ public interface HangBillService extends IService<HangBill> {
      * @param repaidAmount
      * @return
      */
-    public int updateHangBills(HangBill hangBill,Double repaidAmount);
+    public int updateHangBills(HangBill hangBill,Double repaidAmount,String status);
 }
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
index f8c724d9a..4cc3f048c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java
@@ -1,5 +1,8 @@
 package com.fuint.business.order.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -83,7 +86,73 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
     private OilConfigService oilConfigService;
 
     @Override
-    public int updateHangBill(Map<String,String> map) {
+    public HangBill updateHangBill(Map<String,String> map) {
+        String payType = map.get("payType");
+//        调用支付接口
+        this.pay(map);
+
+//        根据id查询挂账信息
+        HangBill hangBill = baseMapper.selectById(Integer.parseInt(map.get("id")));
+        if (payType.equals("CASH")){
+            hangBill.setPayStatus("paid");
+        }
+        int row = 0;
+        hangBill.setRemark(map.get("remark"));
+//        支付成功后修改挂账信息
+        if (hangBill.getPayStatus().equals("paid")){
+            Double repaidAmount1 = Double.valueOf(map.get("repaidAmount"));
+            Double amount = hangBill.getAmount();
+            Double repaidAmount = hangBill.getRepaidAmount();
+            Double outstandAmount = hangBill.getOutstandAmount();
+            Double repaidAmountAfter = repaidAmount+repaidAmount1;
+//        修改挂账信息
+            hangBill.setRepaidAmount(repaidAmountAfter);
+            hangBill.setOutstandAmount(amount-repaidAmountAfter);
+            if (amount.equals(repaidAmountAfter)){
+                hangBill.setStatus("1");
+                hangBill.setReturnType("1");
+            }else {
+                hangBill.setStatus("2");
+            }
+        }
+        row = baseMapper.updateById(hangBill);
+        return baseMapper.selectById(Integer.parseInt(map.get("id")));
+    }
+
+    @Override
+    public int batchUpdate(Map<String, String> map) {
+        this.pay(map);
+        List<JSONObject> jsonObjects = JSONArray.parseArray(map.get("list"), JSONObject.class);
+        int row = 0;
+        for (JSONObject jsonObject : jsonObjects) {
+//            现将需要修改的支付状态改为未支付
+            HangBill hangBill1 = baseMapper.selectById((Integer) jsonObject.get("id"));
+            hangBill1.setPayStatus("unpaid");
+            baseMapper.updateById(hangBill1);
+            HangBill hangBill = baseMapper.selectById((Integer) jsonObject.get("id"));
+            if (map.get("payType").equals("CASH")){
+                HangBill hangBill2 = this.updateStatus(hangBill, Double.valueOf(jsonObject.get("repaidAmount").toString()));
+                hangBill2.setPayStatus("paid");
+                hangBill2.setRemark(map.get("remark"));
+                row = baseMapper.updateById(hangBill2);
+            }
+        }
+        return row;
+    }
+
+    @Override
+    public int updateHangBills(HangBill hangBill, Double repaidAmount,String status) {
+        HangBill hangBill1 = this.updateStatus(hangBill, repaidAmount);
+        hangBill1.setPayStatus(status);
+        int row = baseMapper.updateById(hangBill1);
+        return row;
+    }
+
+    /**
+     * 调用支付接口
+     * @param map
+     */
+    private void pay(Map<String,String> map){
         String payType = map.get("payType");
         if (!map.get("repaidAmount").equals("0") && !payType.equals("CASH")){
             Integer allAmount = (int) (Double.valueOf(map.get("repaidAmount"))*100);
@@ -111,39 +180,6 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
                 e.printStackTrace();
             }
         }
-//        根据id查询挂账信息
-        HangBill hangBill = baseMapper.selectById(Integer.parseInt(map.get("id")));
-        if (payType.equals("CASH")){
-            hangBill.setPayStatus("paid");
-        }
-        int row = 0;
-        hangBill.setRemark(map.get("remark"));
-//        支付成功后修改挂账信息
-        if (hangBill.getPayStatus().equals("paid")){
-            Double repaidAmount1 = Double.valueOf(map.get("repaidAmount"));
-            Double amount = hangBill.getAmount();
-            Double repaidAmount = hangBill.getRepaidAmount();
-            Double outstandAmount = hangBill.getOutstandAmount();
-            Double repaidAmountAfter = repaidAmount+repaidAmount1;
-//        修改挂账信息
-            hangBill.setRepaidAmount(repaidAmountAfter);
-            hangBill.setOutstandAmount(amount-repaidAmountAfter);
-            if (outstandAmount == repaidAmountAfter){
-                hangBill.setStatus("1");
-                hangBill.setReturnType("1");
-            }else {
-                hangBill.setStatus("2");
-            }
-        }
-        row = baseMapper.updateById(hangBill);
-        return row;
-    }
-
-    @Override
-    public int updateHangBills(HangBill hangBill, Double repaidAmount) {
-        HangBill hangBill1 = this.updateStatus(hangBill, repaidAmount);
-        int row = baseMapper.updateById(hangBill1);
-        return row;
     }
 
     private HangBill updateStatus(HangBill hangBill,Double repaidAmount1){
@@ -154,7 +190,7 @@ public class HangBillServiceImpl extends ServiceImpl<HangBillMapper, HangBill> i
 //        修改挂账信息
         hangBill.setRepaidAmount(repaidAmountAfter);
         hangBill.setOutstandAmount(amount-repaidAmountAfter);
-        if (outstandAmount == repaidAmountAfter){
+        if (amount.equals(repaidAmountAfter)){
             hangBill.setStatus("1");
             hangBill.setReturnType("1");
         }else {
diff --git a/fuintCashierWeb/src/api/cashier/cardvaluerecord.js b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js
new file mode 100644
index 000000000..09a953231
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/cardvaluerecord.js
@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询挂账信息列表
+export function listCardValueRecord(query) {
+  return request({
+    url: '/business/marketingActivity/cardValueRecord',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/fuintCashierWeb/src/api/cashier/hangbill.js b/fuintCashierWeb/src/api/cashier/hangbill.js
index a23d5b4ea..c941330d8 100644
--- a/fuintCashierWeb/src/api/cashier/hangbill.js
+++ b/fuintCashierWeb/src/api/cashier/hangbill.js
@@ -34,6 +34,24 @@ export function addHangBill(data) {
   })
 }
 
+// 批量归还挂账信息
+export function batchHangBill(data) {
+  return request({
+    url: '/business/hangBill/batch',
+    method: 'post',
+    data: data
+  })
+}
+
+// 根据订单号查询挂账记录信息
+export function queryHangBill(data) {
+  return request({
+    url: '/business/hangBill/orderNo',
+    method: 'post',
+    data: data
+  })
+}
+
 // 修改挂账记录及收款
 export function editHangBill(data) {
   return request({
diff --git a/fuintCashierWeb/src/api/cashier/integral/category.js b/fuintCashierWeb/src/api/cashier/integral/category.js
new file mode 100644
index 000000000..aa9661d56
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/integral/category.js
@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 查询积分分类
+export function getGiftCategoryApi(data) {
+    return request({
+      url: 'business/integral/integralGiftCategory/queryByPage',
+      method: 'get',
+      params: data
+    })
+  }
+  // 新增有关信息
+  export function insertGiftCategoryApi(data) {
+    return request({
+      url: 'business/integral/integralGiftCategory',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateGiftCategoryApi(data) {
+    return request({
+      url: 'business/integral/integralGiftCategory',
+      method: 'put',
+      data: data
+    })
+  }
+
diff --git a/fuintCashierWeb/src/api/cashier/integral/gift.js b/fuintCashierWeb/src/api/cashier/integral/gift.js
new file mode 100644
index 000000000..9a032d4cc
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/integral/gift.js
@@ -0,0 +1,55 @@
+import request from "@/utils/request";
+
+// 查询油罐列表
+export function getGiftApi(data) {
+    return request({
+      url: 'business/integral/integralGift/queryByPage',
+      method: 'get',
+      params: data
+    })
+  }
+  // 新增有关信息
+  export function insertGiftApi(data) {
+    return request({
+      url: 'business/integral/integralGift',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateGiftApi(data) {
+    return request({
+      url: 'business/integral/integralGift',
+      method: 'put',
+      data: data
+    })
+  }
+
+
+  // 修改库存
+  export function updateGiftInventoryApi(data) {
+    return request({
+      url: 'business/integral/integralGift/updateInventory',
+      method: 'get',
+      params: data
+    })
+  }
+
+
+  //兑换券
+  export function getCardFavorableApi(data) {
+    return request({
+      url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10',
+      method: 'get',
+      params: data
+    })
+  }
+
+  //优惠券
+  export function getCardExchangeApi(data) {
+    return request({
+      url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10',
+      method: 'get',
+      params: data
+    })
+  }
diff --git a/fuintCashierWeb/src/api/cashier/integral/order.js b/fuintCashierWeb/src/api/cashier/integral/order.js
new file mode 100644
index 000000000..8380621e9
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/integral/order.js
@@ -0,0 +1,39 @@
+import request from "@/utils/request";
+
+// 查询列表
+export function getOrderApi(data) {
+    return request({
+      url: 'business/integral/integralOrders/queryByPage',
+      method: 'get',
+      params: data
+    })
+  }
+
+  // 新增有关信息
+  export function insertOrderApi(data) {
+    return request({
+      url: 'business/integral/integralOrders',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateOrderApi(data) {
+    return request({
+      url: 'business/integral/integralOrders',
+      method: 'put',
+      data: data
+    })
+  }
+
+  export function getStatisticsApi(data) {
+    return request({
+      url: 'business/integral/integralOrders/statistics',
+      method: 'get',
+      params: data
+    })
+  }
+
+
+
+
diff --git a/fuintCashierWeb/src/api/cashier/integral/settings.js b/fuintCashierWeb/src/api/cashier/integral/settings.js
new file mode 100644
index 000000000..07886119e
--- /dev/null
+++ b/fuintCashierWeb/src/api/cashier/integral/settings.js
@@ -0,0 +1,27 @@
+import request from "@/utils/request";
+
+// 查询油罐列表
+export function getSettingsApi(data) {
+    return request({
+      url: 'business/integral/integralSettings/getSettings',
+      method: 'get',
+      params: data
+    })
+  }
+  // 新增有关信息
+  export function insertSettingsApi(data) {
+    return request({
+      url: 'business/integral/integralSettings',
+      method: 'post',
+      data: data
+    })
+  }
+  // 修改有关信息
+  export function updateSettingsApi(data) {
+    return request({
+      url: 'business/integral/integralSettings',
+      method: 'put',
+      data: data
+    })
+  }
+
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
index 1145eb465..c92e418ce 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/Order.vue
@@ -7,8 +7,8 @@
           <el-radio-button label="油品交易订单"></el-radio-button>
           <el-radio-button label="商品交易订单"></el-radio-button>
           <el-radio-button label="会员充值订单"></el-radio-button>
-          <el-radio-button label="普通收款订单"></el-radio-button>
-          <el-radio-button label="增值交易订单"></el-radio-button>
+          <el-radio-button label="小程序交易订单"></el-radio-button>
+<!--          <el-radio-button label="增值交易订单"></el-radio-button>-->
           <el-radio-button label="未支付订单"></el-radio-button>
           <el-radio-button label="积分兑换订单"></el-radio-button>
         </el-radio-group>
@@ -18,8 +18,8 @@
       <order_Oil v-if="radio1 == '油品交易订单' "></order_Oil>
       <order_Goods v-if="radio1 == '商品交易订单' "></order_Goods>
       <order_Vip v-if="radio1 == '会员充值订单' "></order_Vip>
-      <order_Ordinary v-if="radio1 == '普通收款订单' "></order_Ordinary>
-      <order_Added v-if="radio1 == '增值交易订单' "></order_Added>
+      <order_Ordinary v-if="radio1 == '小程序交易订单' "></order_Ordinary>
+<!--      <order_Added v-if="radio1 == '增值交易订单' "></order_Added>-->
       <order_Unpaid v-if="radio1 == '未支付订单' "></order_Unpaid>
       <order_Integral v-if="radio1 == '积分兑换订单' "></order_Integral>
     </div>
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
index 542cb6762..f1ade4335 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
@@ -107,7 +107,7 @@
            <div>列表</div>
            <div style="display: flex ">
              <el-button type="primary" size="mini" @click="addRecord">新增挂账记录</el-button>
-             <el-button type="success" size="mini" @click="open3 = true">批量挂账归还</el-button>
+             <el-button type="success" size="mini" @click="batchReturn">批量挂账归还</el-button>
            </div>
          </div>
       <div class="table-box">
@@ -408,11 +408,11 @@
            v-loading="loading">
         <div style="text-align: center;font-size: 15px;font-weight: bold">付款金额</div>
         <div style="text-align: center;font-size: 30px;font-weight: bold;color: red;margin: 10px 0">
-          ￥{{ form2.repaidAmount }}
+          ￥{{ payAmount }}
         </div>
         <div style="text-align: center;color: grey;font-size: 14px;margin: 20px 0">请自行核实归还金额,提交完成后将自动处理</div>
         <div>
-          <el-input v-model="form2.authCode"
+          <el-input v-model="authCode"
                     autofocus="autofocus"
                     @keydown.enter.native="collection"
                     placeholder="扫描或输入付款码、支持微信、支付宝、云闪付">
@@ -458,7 +458,7 @@
     <el-dialog title="批量挂账归还" :visible.sync="open3" append-to-body>
         <el-form ref="form3" :model="form3">
           <el-form-item>
-            <el-input placeholder="请输入挂账单位、挂账人、挂账人手机号检索" v-model="form3.unitName" class="input-with-select">
+            <el-input placeholder="请输入挂账单位、挂账人、挂账人手机号检索" v-model="unitName" class="input-with-select">
               <el-button slot="append" icon="el-icon-search" @click="getRepayList">查询</el-button>
             </el-input>
           </el-form-item>
@@ -508,7 +508,9 @@
             width="120">
             <template slot-scope="scope">
               <el-input-number size="mini" style="width: 100px"
-                               v-model="scope.row.repaidAmount" @change="handleChange" :min="1" :max="10"></el-input-number>
+                               v-model="scope.row.repaidAmount"
+                               :min="0" :max="scope.row.repaidAmount"
+                               @change="handleChange(scope.row)"></el-input-number>
             </template>
           </el-table-column>
         </el-table>
@@ -523,16 +525,66 @@
           @current-change="getList">
         </el-pagination>
       </div>
+      <div style="display: flex;height: 36px">
+        <span style="width: 35%;font-size: 17px;line-height: 36px">挂账金额：{{ amount }}</span>
+        <span style="width: 35%;font-size: 17px;line-height: 36px">未归还金额：{{ outstandAmount }}</span>
+        <el-input v-model="repaidAmount" readonly style="width: 55%">
+          <template slot="prepend">归还金额：</template>
+          <template slot="append">元</template>
+        </el-input>
+      </div>
       <span slot="footer" class="dialog-footer">
         <el-button @click="open3 = false">取 消</el-button>
-        <el-button type="primary" @click="open3 = false">确 定</el-button>
+        <el-button type="primary" @click="batchSub">确 定</el-button>
+      </span>
+    </el-dialog>
+
+<!--    批量挂账归还-->
+    <el-dialog title="挂账归还" :visible.sync="open4" width="700px" append-to-body>
+      <el-form ref="formName" :model="form4" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="归还金额" prop="creditLimit">
+              <el-input v-model="form4.repaidAmount" placeholder="请输入归还金额" maxlength="30">
+                <template slot="append">元</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input v-model="form4.remark" type="textarea" placeholder="请输入内容"></el-input>
+        </el-form-item>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="归还方式" prop="payType">
+              <el-radio-group v-model="form4.payType">
+                <el-radio v-for="item in payList"
+                          :key="item.dictValue"
+                          :value="item.dictValue"
+                          :label="item.dictValue" border>{{ item.dictLabel }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="open4 = false">取 消</el-button>
+        <el-button type="primary" @click="submitReturn1">确认归还</el-button>
       </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
-import {addHangBill, editHangBill, hangBillInfo, hangBills, listHangBill} from "@/api/cashier/hangbill";
+import {
+  addHangBill,
+  batchHangBill,
+  editHangBill,
+  hangBillInfo,
+  hangBills,
+  listHangBill,
+  queryHangBill
+} from "@/api/cashier/hangbill";
 import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit";
 import {getDicts} from "@/api/dict/data";
 
@@ -540,9 +592,19 @@ import {getDicts} from "@/api/dict/data";
     name: "credit",
     data(){
       return{
+        // 挂账金额
+        amount:0,
+        // 未归还金额
+        outstandAmount:0,
+        // 归还金额
+        repaidAmount:0,
+        // 付款金额
+        payAmount:0,
+        authCode:"",
         list:[],
         // 选中表格数据
         repayList:[],
+        tableList:[],
         isPay:true,
         isPaySuccess:false,
         loading: false,
@@ -562,8 +624,9 @@ import {getDicts} from "@/api/dict/data";
           remark:'',
           status:'qy',
         },
-        form2:{},
+        form2:{payType:"WECHAT"},
         form3:{},
+        form4:{payType:"WECHAT"},
         // 查询参数
         queryParams: {
           page: 1,
@@ -585,7 +648,14 @@ import {getDicts} from "@/api/dict/data";
         open1:false,
         open2:false,
         open3:false,
+        open4:false,
         dialogVisiblej:false,
+        // 是否查询支付成功信息
+        isQuery:true,
+        // 是否是批量归还
+        isBatch:false,
+        timer:"",
+        unitName:"",
         // 表单校验
         rules: {
           unitName: [ { required: true, message: "请选择挂账单位", trigger: "blur" }, ],
@@ -662,18 +732,34 @@ import {getDicts} from "@/api/dict/data";
       this.getLists();
     },
     methods:{
+      batchSub(){
+        this.form4.list = JSON.stringify(this.tableList);
+        this.form4.repaidAmount = this.repaidAmount;
+        this.open4 = true;
+      },
+      batchReturn(){
+        this.open3 = true
+        this.repayList = [];
+        this.unitName = ""
+      },
       getRepayList(){
         let result = [];
+        this.form3.unitName = this.unitName;
         let str = this.form3.unitName
         this.list.forEach(item => {
-          if (item.unitName.includes(str)){
-            result.push(item)
-          }
-          if (item.personCredit.includes(str)){
-            result.push(item)
-          }
-          if (item.contactMobile.includes(str)){
-            result.push(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)
+            }
           }
         })
         this.repayList = result
@@ -684,22 +770,107 @@ import {getDicts} from "@/api/dict/data";
         })
       },
       handleChange(value) {
-        console.log(value);
+        let amount = 0;
+        let outstandAmount = 0;
+        let repaidAmount = 0;
+        this.tableList.forEach(item => {
+          amount += item.amount;
+          outstandAmount += item.outstandAmount;
+          repaidAmount += item.repaidAmount;
+        })
+        this.amount = amount
+        this.outstandAmount = outstandAmount
+        this.repaidAmount = repaidAmount
       },
       // 选择表格数据
       handleSelectionChange(val) {
-        this.repayList = val;
+        let amount = 0;
+        let outstandAmount = 0;
+        let repaidAmount = 0;
+        this.tableList = val;
+        val.forEach(item => {
+          amount += item.amount;
+          outstandAmount += item.outstandAmount;
+          repaidAmount += item.repaidAmount;
+        })
+        this.amount = amount
+        this.outstandAmount = outstandAmount
+        this.repaidAmount = repaidAmount
       },
       handClose(){
-
+        this.isPay = true;
+        this.isPaySuccess = false;
+        this.dialogVisiblej = false;
+        this.open2 = false;
+        this.open4 = false;
       },
+      // 收款
       collection(){
-        editHangBill(this.form2).then(response => {
-
-
-        })
+        let _this = this;
+        if (this.isBatch){
+          _this.form4.repaidAmount = _this.payAmount;
+          _this.form4.authCode = _this.authCode;
+          _this.form4.orderNo = _this.tableList[0].orderNo;
+          batchHangBill(_this.form4).then(response => {
+            if (response.data!=0){
+              _this.isPaySuccess = true;
+              _this.isPay = false;
+              this.getList();
+            }
+          })
+          _this.loading = true;
+          this.open3 = false;
+          this.open4 = false;
+        }else {
+          _this.form2.repaidAmount = _this.payAmount;
+          _this.form2.authCode = _this.authCode;
+          editHangBill(this.form2).then(response => {
+            if (response.data.payStatus == 'paid'){
+              _this.isPaySuccess = true;
+              _this.isPay = false;
+            }
+          })
+          _this.loading = true;
+          _this.queryPayStatus();
+          let timer = setInterval(function () {
+            if (_this.isQuery == false) {
+              _this.loading = false;
+              _this.isPay = false;
+              clearInterval(_this.timer);
+            }
+          },500)
+          setTimeout(function (){
+            _this.loading = false;
+            clearInterval(timer);
+          },30000)
+          this.open2 = false;
+          this.getList();
+        }
+      },
+      // 查询支付状态
+      queryPayStatus(){
+        let _this = this;
+        _this.timer = setInterval(function (){
+          queryHangBill({orderNo:_this.form2.orderNo}).then(response => {
+            if (response.data.payStatus == "unpaid"){
+              _this.isQuery = true;
+            }
+            if (response.data.payStatus == "paid"){
+              _this.isPaySuccess = true;
+              _this.isQuery = false;
+            }
+            if (response.data.payStatus == "payFail"){
+              _this.isPaySuccess = false;
+              _this.isQuery = false;
+            }
+          })
+        },1000)
       },
       submitReturn(){
+        this.isPay = true;
+        this.isBatch = false;
+        this.payAmount = this.form2.repaidAmount;
+        this.authCode = this.form2.authCode;
         if (this.form2.payType!="CASH"){
           this.title = "扫码付款";
         }else {
@@ -707,6 +878,18 @@ import {getDicts} from "@/api/dict/data";
         }
         this.dialogVisiblej = true;
       },
+      submitReturn1(){
+        this.isPay = true;
+        this.isBatch = true;
+        this.payAmount = this.form4.repaidAmount;
+        this.authCode = this.form4.authCode;
+        if (this.form4.payType!="CASH"){
+          this.title = "扫码付款";
+        }else {
+          this.title = "现金还款";
+        }
+        this.dialogVisiblej = true;
+      },
       // 获取支付方式
       getPayList() {
         getDicts("payment_type").then(response => {
@@ -718,8 +901,8 @@ import {getDicts} from "@/api/dict/data";
         hangBillInfo(id).then( response => {
           this.open2 = true;
           this.form2 = response.data
-          this.form2.payType = "WECHAT"
           this.form2.repaidAmount = this.form2.outstandAmount
+          this.form2.payType = "WECHAT"
         })
       },
       // 显示添加挂账记录对话框
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/detail.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/detail.vue
new file mode 100644
index 000000000..9d7d92b8f
--- /dev/null
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/detail.vue
@@ -0,0 +1,114 @@
+<template>
+  <div class="">
+    <el-descriptions class="margin-top" title="用户信息" :column="1" border>
+      <el-descriptions-item>
+        <template slot="label">
+          用户手机号
+        </template>
+        {{dataForm.mobile}}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          用户名称
+        </template>
+        {{dataForm.name}}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions class="margin-top" style="margin-top:10px" title="订单信息" :column="1" border>
+      <el-descriptions-item>
+        <template slot="label">
+          商品名称
+        </template>
+        {{ dataForm.giftName }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          交易数量
+        </template>
+        {{ dataForm.exchangeQuantity }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          配送类型
+        </template>
+        <el-tag size="small"> {{ dataForm.shippingType }} </el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          付款信息
+        </template>
+        {{ dataForm.orderStatus }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          订单编号
+        </template>
+        {{ dataForm.orderNumber }}
+      </el-descriptions-item>
+
+      <el-descriptions-item>
+        <template slot="label">
+          创建时间
+        </template>
+        {{ dataForm.createTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          更新时间
+        </template>
+        {{ dataForm.updateTime }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          付款备注
+        </template>
+        {{ dataForm.notes }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-descriptions v-if="dataForm.shippingType == '物流配送'" class="margin-top" style="margin-top:10px" title="收货信息" :column="1" border>
+      <el-descriptions-item>
+        <template slot="label">
+          收货人
+        </template>
+        {{dataForm.addrName}}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          收货电话
+        </template>
+        {{dataForm.addrMobile}}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          收货地址
+        </template>
+        {{dataForm.address}}
+      </el-descriptions-item>
+    </el-descriptions>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detail",
+  props: {
+    dataForm:{},
+  },
+  data() {
+    return {
+
+    }
+  },
+
+  created(){
+    console.log("dataForm",this.dataForm)
+  }
+
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue
new file mode 100644
index 000000000..59472c0b9
--- /dev/null
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/outcome.vue
@@ -0,0 +1,214 @@
+<template>
+  <div class="">
+    <el-card>
+      <el-row style="margin-bottom: 10px;">
+          <span style=";font-size: 20px;">兑换详情</span>
+      </el-row>
+      <el-row :gutter="24">
+        <el-col :span="7">
+          <el-image
+            style="width: 100px; height: 100px"
+            :src="imagePath+dataForm.coverImage"
+            fit="cover"></el-image>
+        </el-col>
+        <el-col :span="15">
+          <el-descriptions title="" :colon=false :column="1">
+              <el-descriptions-item label="礼品名称:">{{ dataForm.giftName }}</el-descriptions-item>
+              <el-descriptions-item label="兑换数量:">{{dataForm.exchangeQuantity}}</el-descriptions-item>
+              <el-descriptions-item ></el-descriptions-item>
+              <el-descriptions-item label="用户手机号:">
+                <el-tag size="small">{{ dataForm.mobile }}</el-tag>
+                </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+    </el-card>
+    <el-card style="margin-top: 20px;">
+      <el-form :model="editForm" ref="form" :rules="rules" size="small" :inline="true" label-width="100px">
+      <el-row v-if="flag">
+        <el-form-item  label="处理结果" prop="processingResult" >
+          <el-radio-group :disabled="!flagOrderStart" v-model="editForm.processingResult">
+            <el-radio label='0'>快递发货</el-radio>
+            <el-radio label='1'>拒绝</el-radio>
+          </el-radio-group>
+
+          <span style="display: block; width: 400px; color: red;font-size: 10px;">用户的收货地址请在订单详情中查看
+            如当前实物礼品关联商品信息,将会在发货完成后直接更新对应的商品库存</span>
+
+        </el-form-item>
+      </el-row>
+      <el-row v-if="!flag">
+        <el-form-item   label="处理结果" prop="processingResult" >
+          <el-radio-group :disabled="!flagOrderStart" v-model="editForm.processingResult">
+            <el-radio label='0'>通过</el-radio>
+            <el-radio label='1'>拒绝</el-radio>
+          </el-radio-group>
+
+          <span style="display: block; width: 400px; color: red;font-size: 10px;">请确认是否兑换完成、兑换结果将展现给用户、且不可再次更新状态
+            如当前实物礼品关联商品信息,将会在兑换完成后直接更新对应的商品库存</span>
+
+        </el-form-item>
+      </el-row>
+      <template v-if="flag">
+        <el-row :gutter="24">
+        <el-col :span="12">
+          <el-form-item label="快递公司" prop="courierCompanies">
+            <el-select v-model="editForm.courierCompanies" style="width: 150px" placeholder="全部">
+              <el-option
+                v-for="item in courierCompaniesList"
+                :key="item.id"
+                :label="item.dictLabel"
+                :value="item.dictValue"
+              />
+              <el-option value="0" label="其他快递"></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col v-if="editForm.courierCompanies == '0'" :span="12">
+          <el-form-item label="快递名称" label-width="80px" prop="name">
+          <el-input v-model="editForm.name" style="width: 150px"></el-input>
+        </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-form-item label="快递单号" prop="theTrackingNumber">
+          <el-input v-model="editForm.theTrackingNumber" style="width: 250px"></el-input>
+        </el-form-item>
+      </el-row>
+      </template>
+      <el-row>
+        <el-form-item label="处理备注">
+          <el-input type="textarea" v-model="editForm.notes" style="width: 250px"></el-input>
+          </el-form-item>
+      </el-row>
+    </el-form>
+    <div style="float: right; margin-bottom: 20px;">
+        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {updateOrderApi} from "@/api/cashier/integral/order";
+import {getDicts} from "@/api/dict/data";
+
+export default {
+
+  name: "outcome",
+  dicts: ['zhzt','lplx','courier_companies',],
+
+  props: {
+    dataForm:{},
+    flagOrderStart:false,
+  },
+  data() {
+    return {
+      courierCompaniesList:[],
+      editForm:{
+        processingResult:'0', //处理结果
+        courierCompanies:'', //
+        name:'', //
+        theTrackingNumber:'', //单号
+        notes:'', //溃堤单号
+      },
+      dataFormC:{},
+      flag:true,
+      stateFlag: true,
+      // 图片根目录
+      imagePath: process.env.VUE_APP_SERVER_URL,
+
+      rules:{
+        processingResult: [
+          { required: true, message: "请选择处理结果", trigger: "change" },
+        ],
+        courierCompanies: [
+          { required: true, message: "请选择快递公司", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "快递名称不能为空", trigger: "blur" },
+        ],
+        noites: [
+          { required: true, message: "快递单号不能为空", trigger: "blur" },
+        ],
+      }
+    }
+  },
+
+  created(){
+    this.dataFormC=this.dataForm
+    // console.log("dataForm",this.dataFormC)
+    // console.log("flagOrderStart",this.flagOrderStart)
+
+
+    console.log("dataForm",this.dataFormC.shippingType)
+
+    if (this.dataFormC.shippingType == '物流配送') {
+      this.flag = true
+    }else {
+      this.flag = false
+    }
+
+
+    // 回显
+    if (!this.flagOrderStart) {
+      this.editForm.courierCompanies = this.dataForm.courierCompanies
+      this.editForm.theTrackingNumber = this.dataForm.theTrackingNumber
+      this.editForm.notes =  this.dataForm.notes
+    }
+		if (this.dataFormC.orderStatus == '已拒绝') {
+			this.editForm.processingResult='1' //处理结果
+		}
+
+  },
+  methods: {
+    getZList(){
+      getDicts("courier_companies").then( response => {
+        this.courierCompaniesList = response.data;
+      })
+    },
+
+  submit: function() {
+    let this_ = this
+
+    this_.$refs["form"].validate(valid => {
+        if (valid) {
+          let file = {
+            id : this_.dataForm.id,
+            orderStatus: '',
+            courierCompanies:this_.editForm.courierCompanies,
+            theTrackingNumber:this_.editForm.theTrackingNumber, //单号
+            notes:this_.editForm.notes, //溃堤单号
+          }
+
+          if (this.editForm.processingResult == '1') {
+            file.orderStatus='已拒绝'
+          }else if (this.flag) {
+            file.orderStatus='已发货'
+          } else {
+            file.orderStatus='已完成'
+          }
+          if (this_.editForm.courierCompanies == 0) {
+            file.courierCompanies = file.name
+          }
+          updateOrderApi(file).then(res=>{
+            this.$modal.msgSuccess("处理成功");
+
+          })
+        }
+      })
+    this.$emit('send-data', 'Data from child');
+  },
+  cancel() {
+    this.$emit('send-data', 'Data from child');
+  }
+
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue
new file mode 100644
index 000000000..8ba7f77db
--- /dev/null
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsCashier.vue
@@ -0,0 +1,256 @@
+<template>
+  <div class="app-container">
+    <el-card >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+        <el-form-item label="交易单号" prop="giftName">
+          <el-input
+            v-model="queryParams.orderNumber"
+            placeholder="请输入交易单号"
+            clearable
+            style="width: 220px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="兑换状态">
+          <el-select v-model="queryParams.status" style="width: 150px" placeholder="兑换状态" clearable>
+            <el-option
+            v-for="item in zhztList"
+              :key="item.id"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+        </el-select>
+        </el-form-item>
+        <el-form-item label="手机号码" prop="giftName">
+          <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入用户手机号"
+            clearable
+            style="width: 160px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </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="-"
+          clearable
+          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;" >
+      <div style="margin-bottom : 10px">
+        <span class="font-number">统计</span>
+      </div>
+      <el-row :gutter="10" class="mb8" >
+        <el-col :span="2.5">
+          <div class="box">
+              <span class="font-chinese">笔数</span>
+              <span class="font-number">{{statisticsForm.num}}</span>
+            </div>
+        </el-col>
+        <el-col :span="2.5">
+          <div class="box">
+              <span class="font-chinese">商品数量</span>
+              <span class="font-number">{{statisticsForm.exchangeQuantity}}</span>
+            </div>
+        </el-col>
+        <el-col :span="2.5">
+          <div class="box">
+              <span class="font-chinese">积分</span>
+              <span class="font-number">{{statisticsForm.integral}}</span>
+            </div>
+        </el-col>
+        <el-col :span="3">
+          <div class="box">
+              <span class="font-chinese">支付总额
+                <el-tooltip class="item" effect="dark" content="实际支付订单详细信息请在增值订单页面查看
+" placement="top-start">
+                  <i class="el-icon-info"></i>
+                </el-tooltip>
+              </span>
+              <span class="font-number">{{statisticsForm.amount}}</span>
+            </div>
+        </el-col>
+      </el-row>
+    </el-card>
+
+    <el-card style="margin-top: 20px" >
+      <el-table ref="tables"
+                v-loading="loading"
+                :data="dataList"
+                :default-sort="defaultSort">
+        <el-table-column label="用户手机号" align="center" prop="mobile"/>
+        <el-table-column label="订单号" align="center" prop="orderNumber"/>
+        <el-table-column label="商品信息" align="center" prop="" >
+          <el-table-column label="简述" align="center" prop="categoryName" />
+          <el-table-column label="商品" align="center" prop="giftName" />
+        </el-table-column>
+        <el-table-column label="实付信息" align="center"  >
+          <el-table-column label="积分" align="center" prop="integral" width=""/>
+          <el-table-column label="支付金额" align="center" prop="amount" width=""/>
+        </el-table-column>
+        <el-table-column label="状态" align="center" prop="status" width=""/>
+        <el-table-column label="创建时间" align="center" prop="createTime" width=""/>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+            >订单详情</el-button>
+
+          </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>
+    <el-dialog title="订单详情" :visible.sync="openDetail" width="500px" append-to-body :close-on-click-modal="false">
+      <detail :dataForm = "dataForm"></detail>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import Detail from "@/views/cashier/orderComponents/integralComponents/detail.vue";
+import {getOrderApi, getStatisticsApi} from "@/api/cashier/integral/order";
+import {getDicts} from "@/api/dict/data";
+
+
+export default {
+  name: "pointsCashier",
+  components: { Detail },
+
+  dicts: ['zhzt','lplx','redemptionMethod','expressShippingCosts','shippingMethod'],
+
+  data() {
+    return {
+      // 账户状态
+      zhztList:[],
+      openDetail:false,
+      dataForm:{},
+      dataList:[],
+      queryParams: {
+        orderType:1,
+
+        giftName: '',
+        status: '',
+        mobile: '',
+        orderNumber: '',
+        page:null,
+        pageSize:null
+      },
+      loading: false,
+      dateRange: [],
+      defaultSort: {prop: 'createTime', order: 'descending'},
+
+      total: 0,
+
+      statisticsForm: {
+        num:0,
+        exchangeQuantity:0,
+        integral:0,
+        amount:0
+      }
+    }
+  },
+  created() {
+    this.getList();
+    this.getStatistics();
+    this.getZhztList();
+  },
+  methods: {
+    getZhztList(){
+      getDicts("zhzt").then( response => {
+        this.zhztList = response.data;
+      })
+    },
+    getList(){
+      getOrderApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+        this.dataList = res.data.records
+      })
+    },
+    getStatistics() {
+      getStatisticsApi().then(res=>{
+        this.statisticsForm = res.data
+      })
+    },
+
+    handleUpdate(){},
+    handleQuery(){
+      this.getList();
+
+    },
+    resetQuery(){
+      this.queryParams = {
+        giftName: '',
+        status: '',
+        mobile: '',
+        orderNumber: '',
+        page:1,
+        pageSize:10
+      },
+      this.dateRange = []
+    },
+    handleDetail(data){
+      this.openDetail = true
+      this.dataForm = data;
+    },
+  }
+}
+</script>
+
+<style scoped>
+.app-container {
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+    padding-top: 0px;
+    padding: 0px
+}
+ .box {
+    padding: 10px;
+    height: 80px;
+    width: 150px;
+    margin-right: 0px;
+    background-color: rgba(204, 204, 204, 0.3);
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: left;
+    text-align: left;
+  }
+
+.font-chinese {
+  font-size: 15px;
+  font-family:Microsoft YaHei;
+  font-weight: bold;
+  line-height:1.5
+}
+.font-number {
+  font-size: 20px;
+  font-family: PingFang SC,sans-serif;
+  font-weight: bold;
+  line-height:1.3
+  }
+</style>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue
new file mode 100644
index 000000000..2f6d2168e
--- /dev/null
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/integralComponents/pointsMall.vue
@@ -0,0 +1,318 @@
+<template>
+  <div class="app-container">
+    <el-card >
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="100px">
+        <el-form-item label="礼品名称" prop="giftName">
+          <el-input
+            v-model="queryParams.giftName"
+            placeholder="请输入礼品名称"
+            clearable
+            style="width: 200px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="手机号码" prop="mobile">
+          <el-input
+            v-model="queryParams.mobile"
+            placeholder="请输入用户手机号"
+            clearable
+            style="width: 160px;"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="配送方式">
+          <el-select v-model="queryParams.shippingType" style="width: 150px" placeholder="全部" clearable>
+            <el-option
+              v-for="item in shippingMethodList"
+              :key="item.id"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            />
+        </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="-"
+          clearable
+          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-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane label="全部订单" name="0">
+        </el-tab-pane>
+        <el-tab-pane label="待处理/待发货" name="1">
+          <span slot="label">待处理/待发货<el-badge class="mark" v-show="statisticsForm.await!=0" :value="statisticsForm.await" /></span>
+        </el-tab-pane>
+        <el-tab-pane label="已完成/已发货" name="2">
+          <span slot="label">已完成/已发货<el-badge class="mark" v-show="statisticsForm.dispose!=0" :value="statisticsForm.dispose" /></span>
+        </el-tab-pane>
+        <el-tab-pane label="已拒绝/已退款" name="3">
+          <span slot="label">已拒绝/已退款<el-badge class="mark" v-show="statisticsForm.refuse!=0" :value="statisticsForm.refuse" /></span>
+        </el-tab-pane>
+        <el-tab-pane label="未付款订单" name="4">
+        </el-tab-pane>
+      </el-tabs>
+
+      <el-table ref="tables"
+      style="margin-top: 15px"
+                v-loading="loading"
+                :data="dataList"
+                :default-sort="defaultSort">
+        <el-table-column type="expand">
+          <template slot-scope="props">
+            <el-form style="margin-left : 20px" label-position="left" inline class="demo-table-expand">
+              <el-form-item  label="订单号">
+                <span>{{ props.row.orderNumber }}</span>
+              </el-form-item>
+              <br>
+              <el-form-item  label="用户编号">
+                <span>{{ props.row.userNo }}</span>
+              </el-form-item>
+              <br>
+
+              <el-form-item  label="用户名称">
+                <span>{{ props.row.name }}</span>
+              </el-form-item>
+            </el-form>
+          </template>
+        </el-table-column>
+        <el-table-column label="用户手机号" align="center" prop="mobile"/>
+        <el-table-column label="商品信息" align="center" prop="categoryName" >
+          <el-table-column label="名称" align="center" prop="giftName" />
+          <el-table-column label="图片" align="center" prop="coverImage">
+            <template slot-scope="scope">
+              <el-image
+                style="width: 50px; height: 50px"
+                :src="imagePath+scope.row.coverImage"
+                :preview-src-list="[imagePath + scope.row.coverImage]"
+                fit="cover">
+              </el-image>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="配送类型" align="center" prop="shippingType">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.shippingType=='门店自提'">{{scope.row.shippingType}}</el-tag>
+            <el-tag type="success" v-else>{{scope.row.shippingType}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="实付信息" align="center" prop="categoryName" >
+          <el-table-column label="积分" align="center" prop="integral" width=""/>
+          <el-table-column label="金额" align="center" prop="amount" width=""/>
+        </el-table-column>
+        <el-table-column label="兑换数量" align="center" prop="exchangeQuantity" width=""/>
+        <el-table-column label="订单状态" align="center" prop="orderStatus" width="">
+          <template slot-scope="scope">
+            <el-tag  effect="plain" v-if="scope.row.orderStatus=='待处理' || scope.row.orderStatus=='待发货'">{{scope.row.orderStatus}}</el-tag>
+            <el-tag type="success" effect="plain" v-else-if="scope.row.orderStatus=='已完成' || scope.row.orderStatus=='已发货'">{{scope.row.orderStatus}}</el-tag>
+            <el-tag type="danger" effect="plain" v-else-if="scope.row.orderStatus=='已拒绝' || scope.row.orderStatus=='已退款'">{{scope.row.orderStatus}}</el-tag>
+            <el-tag type="warning" effect="plain" v-else>{{scope.row.orderStatus}}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="订单时间信息" align="center" prop="categoryName" width="">
+          <el-table-column label="创建时间" align="center" prop="createTime" width="150px"/>
+          <el-table-column label="更新时间" align="center" prop="updateTime" width="150px"/>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleDetail(scope.row)"
+            >订单详情</el-button>
+
+            <template v-if="scope.row.orderStatus=='待支付' ||scope.row.orderStatus=='待处理' || scope.row.orderStatus=='待发货'">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row,true)"
+            >
+            处理订单
+          </el-button>
+           </template>
+          <template v-else>
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleUpdate(scope.row,false)"
+            >
+            处理变更
+          </el-button>
+          </template>
+        </template>
+
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNo"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-dialog title="订单详情" :visible.sync="openDetail" width="500px" append-to-body :close-on-click-modal="false">
+      <detail :dataForm = "dataForm"></detail>
+    </el-dialog>
+    <el-dialog title="处理兑换结果" :visible.sync="openOutcome" width="650px" append-to-body :close-on-click-modal="false">
+      <Outcome v-if="outComeFlag" :dataForm = "dataForm" :flagOrderStart="flagOrderStart"  @send-data="handleDataFromChild"></Outcome>
+
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import Detail from "@/views/cashier/orderComponents/integralComponents/detail.vue";
+import Outcome from "@/views/cashier/orderComponents/integralComponents/outcome.vue";
+import {getOrderApi, getStatisticsApi} from "@/api/cashier/integral/order";
+import {getDicts} from "@/api/dict/data";
+
+export default {
+  name: "pointsMall",
+  components: { Detail, Outcome },
+  dicts: ['zhzt','lplx','redemptionMethod','expressShippingCosts','shippingMethod'],
+
+  data() {
+    return {
+      shippingMethodList:[],
+      outComeFlag : false,
+
+      dataList:[],
+      dataForm:{},
+      // 图片根目录
+      imagePath: process.env.VUE_APP_SERVER_URL,
+      queryParams: {
+        orderType:0,
+        giftName: '',
+        mobile:'',
+        shippingType: '',
+        orderStatus:'',
+        pageNo:null,
+        pageSize:null
+      },
+      total: 0,
+      loading: false,
+      openDetail: false, // 订单详情
+      openOutcome: false, // 订单详情
+      // 日期范围
+      dateRange: [],
+      defaultSort: {prop: 'createTime', order: 'descending'},
+
+      statisticsForm: {
+        await:0,
+        dispose:0,
+        refuse:0,
+      },
+      flagOrderStart : true,  // true 代表未处理订单
+      activeName: '0',
+    }
+  },
+  created() {
+    this.getList();
+    this.getStatistics();
+    this.getZList();
+  },
+  methods: {
+    getZList(){
+      getDicts("shippingMethod").then( response => {
+        this.shippingMethodList = response.data;
+      })
+    },
+    getList(){
+      getOrderApi(this.addDateRange(this.queryParams, this.dateRange)).then(res=>{
+        this.dataList = res.data.records
+      })
+    },
+
+    getStatistics() {
+      getStatisticsApi().then(res=>{
+        this.statisticsForm = res.data
+      })
+    },
+    handleUpdate(data,flag){
+      this.flagOrderStart = flag
+      this.dataForm = {}
+      console.log("data",data)
+      this.dataForm = data;
+      console.log("dataForm",this.dataForm)
+      this.outComeFlag = !this.outComeFlag; // 切换 v-if，强制重新渲染子组件
+
+      this.openOutcome = true
+
+
+    },
+    handleDetail(data){
+      this.openDetail = true
+      this.dataForm = data;
+    },
+    handleQuery(){
+      this.getList();
+    },
+
+    // 重置搜索条件
+    resetQuery(){
+      this.queryParams = {
+        giftName: '',
+        shippingType: '',
+        mobile:'',
+        orderStatus:'',
+        pageNo:1,
+        pageSize:10
+      },
+      this.dateRange = []
+    },
+    resetQuery2(){
+      this.queryParams = {
+        pageNo:1,
+        pageSize:10
+      }
+    },
+
+    handleClick(tab, event) {
+      this.resetQuery2()
+      this.queryParams.orderStatus = tab.name
+      console.log(tab.name);
+      this.getList();
+    },
+    handleDataFromChild(data) {
+      this.outComeFlag = false
+      this.openOutcome = false
+      this.dataForm = {}
+      console.log('Received data in parent:', data);
+    }
+  }
+
+}
+</script>
+
+<style scoped>
+.app-container {
+    width: 100%;
+    height: 100%;
+    background: #f6f8f9;
+    padding-top: 0px;
+    padding: 0px
+}
+
+</style>
+
+
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 5fc92143b..4f4a0fd5b 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -74,9 +74,12 @@
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
                 <el-form-item label="收银员">
-                  <span>{{ props.row.staffId }}</span>
+                  <span>{{ getRealName(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="收银员">
+                  <span>{{ getMobile(staffList,props.row.staffId) }}</span>
                 </el-form-item>
               </el-form>
             </template>
@@ -359,6 +362,26 @@ import {getOrderGoods} from "@/api/cashier/goodsorder";
       this.getStaffList();
     },
     methods:{
+      // 获取员工姓名
+      getRealName(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.realName
+          }
+        })
+        return name;
+      },
+      // 获取员工手机号
+      getMobile(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.mobile
+          }
+        })
+        return name;
+      },
       // 补打
       patchwork(data){
         const orderNo = data.orderNo
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
index f47f3366d..fe56f6fca 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Goods.vue
@@ -102,9 +102,12 @@
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
-                <el-form-item label="名称">
-                  <span>{{ props.row.name }}</span>
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="收银员">
+                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="来源终端">
+                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>
                 </el-form-item>
               </el-form>
             </template>
@@ -140,16 +143,16 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-              >更多操作</el-button>
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-edit"-->
+<!--              >更多操作</el-button>-->
 
-            </template>
-          </el-table-column>
+<!--            </template>-->
+<!--          </el-table-column>-->
 
         </el-table>
       </div>
@@ -190,6 +193,8 @@ export default {
   name: "order_Cashier",
   data(){
     return{
+      // 终端列表
+      terminalList:[],
       // 员工列表
       staffList:[],
       // 日期范围
@@ -218,6 +223,7 @@ export default {
       },
       // 支付列表
       payList:[],
+
       // tableData: [{
       //   date: '2016-05-03',
       //   name: '王小狼',
@@ -273,12 +279,36 @@ export default {
   created() {
     this.getList();
     this.getStaffList();
+    this.getPayList();
   },
   methods:{
+    // 根据员工id查询员工信息
+    queryStaf(list,id){
+      let name = "";
+      list.forEach(item => {
+        if (item.id == id){
+          name = `${item.realName}(${item.mobile})`
+        }
+      })
+      return name;
+    },
+    getVal(list,val){
+      let name = "";
+      list.forEach(item => {
+        if (item.dictValue == val){
+          name = item.dictLabel
+        }
+      })
+      return name;
+    },
+    // 获取付款类型列表
     getPayList(){
       getDicts("payment_type").then( response => {
         this.payList = response.data;
       })
+      getDicts("terminal").then( response => {
+        this.terminalList = response.data;
+      })
     },
     // 获取商品详情
     getGoods(id){
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
index 0161662c6..57371d0e2 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Integral.vue
@@ -2,260 +2,263 @@
 <template>
     <div>
       <el-tabs type="border-card">
-        <el-tab-pane label="用户管理">
+        <el-tab-pane label="积分商城订单">
           <el-alert
             title="当前页面订单为油站小程序端用户在积分商城兑换的订单记录,如有付款金额,付款订单请在增值性订单列表中查看,类型为:积分商城"
             type="error">
           </el-alert>
-            <div class="top-dis">
-              <div class="top-app-sou">
-                <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
-                  <el-form-item label="名称">
-                    <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>
-                  </el-form-item>
-                </el-form>
-              </div>
-              <div style="margin-left: 10px">
-                <el-button type="primary" icon="el-icon-search">查询</el-button>
-              </div>
-            </div>
 
-<!--          列表-->
-          <div class="bottom-dis">
-            <div class="wgang">
-              <el-tabs v-model="activeName" @tab-click="handleClick">
-                <el-tab-pane label="全部订单" name="first"></el-tab-pane>
-                <el-tab-pane name="first1">
-                  <div slot="label" class="hgang"> 待处理/待发货 <span class="hongdian">1</span>  </div>
-                </el-tab-pane>
-                <el-tab-pane name="first2">
-                  <div slot="label" class="hgang"> 已完成/已发货 <span class="hongdian">1</span>  </div>
-                </el-tab-pane>
-                <el-tab-pane name="first3">
-                  <div slot="label" class="hgang"> 已拒绝/已退款 <span class="hongdian">1</span>  </div>
-                </el-tab-pane>
-                <el-tab-pane name="first4">
-                  <div slot="label" class="hgang"> 未付款订单 <span class="hongdian">1</span>  </div>
-                </el-tab-pane>
+          <points-mall></points-mall>
 
-              </el-tabs>
-            </div>
-            <div class="table-box">
-              <el-table
-                :data="tableData"
-                style="width: 100%">
-                <el-table-column type="expand">
-                  <template slot-scope="props">
-                    <el-form label-position="left" inline class="demo-table-expand">
-                      <el-form-item label="名称">
-                        <span>{{ props.row.name }}</span>
-                      </el-form-item>
-                    </el-form>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="date"
-                  label="用户信息"
-                  width="150">
-                </el-table-column>
-                <el-table-column label="余额">
-                  <el-table-column
-                    prop="name"
-                    label="储值卡"
-                    width="120">
-                  </el-table-column>
-                  <el-table-column
-                    prop="name"
-                    label="升值卡"
-                    width="120">
-                  </el-table-column>
+<!--            <div class="top-dis">-->
+<!--              <div class="top-app-sou">-->
+<!--                <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+<!--                  <el-form-item label="名称">-->
+<!--                    <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+<!--                  </el-form-item>-->
+<!--                </el-form>-->
+<!--              </div>-->
+<!--              <div style="margin-left: 10px">-->
+<!--                <el-button type="primary" icon="el-icon-search">查询</el-button>-->
+<!--              </div>-->
+<!--            </div>-->
 
-                </el-table-column>
-                <el-table-column label="会员等级">
-                  <el-table-column
-                    prop="province"
-                    label="汽油"
-                    width="120">
-                  </el-table-column>
-                  <el-table-column
-                    prop="city"
-                    label="柴油"
-                    width="120">
-                  </el-table-column>
-                  <el-table-column
-                    prop="city"
-                    label="天然气"
-                    width="120">
-                  </el-table-column>
-                </el-table-column>
-                <el-table-column label="统计">
-                  <el-table-column
-                    prop="province"
-                    label="加油金"
-                    width="120">
-                  </el-table-column>
-                  <el-table-column
-                    prop="city"
-                    label="积分"
-                    width="120">
-                  </el-table-column>
-                  <el-table-column
-                    prop="city"
-                    label="消费次数"
-                    width="120">
-                  </el-table-column>
-                </el-table-column>
+<!--&lt;!&ndash;          列表&ndash;&gt;-->
+<!--          <div class="bottom-dis">-->
+<!--            <div class="wgang">-->
+<!--              <el-tabs v-model="activeName" @tab-click="handleClick">-->
+<!--                <el-tab-pane label="全部订单" name="first"></el-tab-pane>-->
+<!--                <el-tab-pane name="first1">-->
+<!--                  <div slot="label" class="hgang"> 待处理/待发货 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+<!--                <el-tab-pane name="first2">-->
+<!--                  <div slot="label" class="hgang"> 已完成/已发货 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+<!--                <el-tab-pane name="first3">-->
+<!--                  <div slot="label" class="hgang"> 已拒绝/已退款 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
+<!--                <el-tab-pane name="first4">-->
+<!--                  <div slot="label" class="hgang"> 未付款订单 <span class="hongdian">1</span>  </div>-->
+<!--                </el-tab-pane>-->
 
-                <el-table-column
-                  prop="zip"
-                  label="实体卡号"
-                  width="220">
-                </el-table-column>
+<!--              </el-tabs>-->
+<!--            </div>-->
+<!--            <div class="table-box">-->
+<!--              <el-table-->
+<!--                :data="tableData"-->
+<!--                style="width: 100%">-->
+<!--                <el-table-column type="expand">-->
+<!--                  <template slot-scope="props">-->
+<!--                    <el-form label-position="left" inline class="demo-table-expand">-->
+<!--                      <el-form-item label="名称">-->
+<!--                        <span>{{ props.row.name }}</span>-->
+<!--                      </el-form-item>-->
+<!--                    </el-form>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="date"-->
+<!--                  label="用户信息"-->
+<!--                  width="150">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column label="余额">-->
+<!--                  <el-table-column-->
+<!--                    prop="name"-->
+<!--                    label="储值卡"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="name"-->
+<!--                    label="升值卡"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
 
-                <el-table-column
-                  prop="zip"
-                  label="状态"
-                  width="120">
-                </el-table-column>
+<!--                </el-table-column>-->
+<!--                <el-table-column label="会员等级">-->
+<!--                  <el-table-column-->
+<!--                    prop="province"-->
+<!--                    label="汽油"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="柴油"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="天然气"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                </el-table-column>-->
+<!--                <el-table-column label="统计">-->
+<!--                  <el-table-column-->
+<!--                    prop="province"-->
+<!--                    label="加油金"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="积分"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                  <el-table-column-->
+<!--                    prop="city"-->
+<!--                    label="消费次数"-->
+<!--                    width="120">-->
+<!--                  </el-table-column>-->
+<!--                </el-table-column>-->
 
-                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                  <template slot-scope="scope">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      icon="el-icon-edit"
-                    >更多操作</el-button>
+<!--                <el-table-column-->
+<!--                  prop="zip"-->
+<!--                  label="实体卡号"-->
+<!--                  width="220">-->
+<!--                </el-table-column>-->
 
-                  </template>
-                </el-table-column>
+<!--                <el-table-column-->
+<!--                  prop="zip"-->
+<!--                  label="状态"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
 
-              </el-table>
-            </div>
-            <div class="pagination-box">
-              <el-pagination
-                background
-                layout="prev, pager, next"
-                :total="1000">
-              </el-pagination>
-            </div>
-
-          </div>
+<!--                <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--                  <template slot-scope="scope">-->
+<!--                    <el-button-->
+<!--                      size="mini"-->
+<!--                      type="text"-->
+<!--                      icon="el-icon-edit"-->
+<!--                    >更多操作</el-button>-->
+<!--                  </template>-->
+<!--                </el-table-column>-->
+<!--              </el-table>-->
+<!--            </div>-->
+<!--            <div class="pagination-box">-->
+<!--              <el-pagination-->
+<!--                background-->
+<!--                layout="prev, pager, next"-->
+<!--                :total="1000">-->
+<!--              </el-pagination>-->
+<!--            </div>-->
+<!--          </div>-->
 
         </el-tab-pane>
-        <el-tab-pane label="配置管理">
+        <el-tab-pane label="积分收银台订单">
           <el-alert
             title="PC积分收银台在线兑换订单记录,收银台订单无需确认操作,如有付款金额,付款订单请在增值性订单列表中查看,类型为:积分收银"
             type="error">
           </el-alert>
-           <div class="bottom-dis">
-            <div slot="header" class="clearfix">
-              <span>统计</span>
-            </div>
-            <div class="box-gang">
-              <div class="box" v-for="(item,index) in 7" :key="index">
-                <div class="size-hui">订单总数</div>
-                <div class="size-bole">55</div>
-              </div>
-            </div>
-            </div>
-          <div class="table-box">
-            <el-table
-              :data="tableData"
-              style="width: 100%">
-              <el-table-column type="expand">
-                <template slot-scope="props">
-                  <el-form label-position="left" inline class="demo-table-expand">
-                    <el-form-item label="名称">
-                      <span>{{ props.row.name }}</span>
-                    </el-form-item>
-                  </el-form>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="date"
-                label="用户信息"
-                width="150">
-              </el-table-column>
-              <el-table-column label="余额">
-                <el-table-column
-                  prop="name"
-                  label="储值卡"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  prop="name"
-                  label="升值卡"
-                  width="120">
-                </el-table-column>
 
-              </el-table-column>
-              <el-table-column label="会员等级">
-                <el-table-column
-                  prop="province"
-                  label="汽油"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  prop="city"
-                  label="柴油"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  prop="city"
-                  label="天然气"
-                  width="120">
-                </el-table-column>
-              </el-table-column>
-              <el-table-column label="统计">
-                <el-table-column
-                  prop="province"
-                  label="加油金"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  prop="city"
-                  label="积分"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  prop="city"
-                  label="消费次数"
-                  width="120">
-                </el-table-column>
-              </el-table-column>
+          <points-cashier></points-cashier>
 
-              <el-table-column
-                prop="zip"
-                label="实体卡号"
-                width="220">
-              </el-table-column>
-
-              <el-table-column
-                prop="zip"
-                label="状态"
-                width="120">
-              </el-table-column>
-
-              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-                <template slot-scope="scope">
-                  <el-button
-                    size="mini"
-                    type="text"
-                    icon="el-icon-edit"
-                  >更多操作</el-button>
-
-                </template>
-              </el-table-column>
-
-            </el-table>
-          </div>
-          <div class="pagination-box">
-            <el-pagination
-              background
-              layout="prev, pager, next"
-              :total="1000">
-            </el-pagination>
-          </div>
+<!--          <div class="bottom-dis">-->
+<!--          <div slot="header" class="clearfix">-->
+<!--            <span>统计</span>-->
+<!--          </div>-->
+<!--          <div class="box-gang">-->
+<!--            <div class="box" v-for="(item,index) in 7" :key="index">-->
+<!--              <div class="size-hui">订单总数</div>-->
+<!--              <div class="size-bole">55</div>-->
+<!--            </div>-->
+<!--          </div>-->
+<!--          </div>-->
+<!--          <div class="table-box">-->
+<!--            <el-table-->
+<!--              :data="tableData"-->
+<!--              style="width: 100%">-->
+<!--              <el-table-column type="expand">-->
+<!--                <template slot-scope="props">-->
+<!--                  <el-form label-position="left" inline class="demo-table-expand">-->
+<!--                    <el-form-item label="名称">-->
+<!--                      <span>{{ props.row.name }}</span>-->
+<!--                    </el-form-item>-->
+<!--                  </el-form>-->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column-->
+<!--                prop="date"-->
+<!--                label="用户信息"-->
+<!--                width="150">-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="余额">-->
+<!--                <el-table-column-->
+<!--                  prop="name"-->
+<!--                  label="储值卡"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="name"-->
+<!--                  label="升值卡"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--          -->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="会员等级">-->
+<!--                <el-table-column-->
+<!--                  prop="province"-->
+<!--                  label="汽油"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="柴油"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="天然气"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--              </el-table-column>-->
+<!--              <el-table-column label="统计">-->
+<!--                <el-table-column-->
+<!--                  prop="province"-->
+<!--                  label="加油金"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="积分"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--                <el-table-column-->
+<!--                  prop="city"-->
+<!--                  label="消费次数"-->
+<!--                  width="120">-->
+<!--                </el-table-column>-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--              <el-table-column-->
+<!--                prop="zip"-->
+<!--                label="实体卡号"-->
+<!--                width="220">-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--              <el-table-column-->
+<!--                prop="zip"-->
+<!--                label="状态"-->
+<!--                width="120">-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--              <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--                <template slot-scope="scope">-->
+<!--                  <el-button-->
+<!--                    size="mini"-->
+<!--                    type="text"-->
+<!--                    icon="el-icon-edit"-->
+<!--                  >更多操作</el-button>-->
+<!--          -->
+<!--                </template>-->
+<!--              </el-table-column>-->
+<!--          -->
+<!--            </el-table>-->
+<!--          </div>-->
+<!--          <div class="pagination-box">-->
+<!--          <el-pagination-->
+<!--            background-->
+<!--            layout="prev, pager, next"-->
+<!--            :total="1000">-->
+<!--          </el-pagination>-->
+<!--          </div>-->
         </el-tab-pane>
 
       </el-tabs>
@@ -263,75 +266,79 @@
 </template>
 
 <script>
-    export default {
-      name: "order_Integral",
-      data(){
-        return{
-          labelPosition: 'right',
-          radio1:'',
-          activeName: 'first',
-          formLabelAlign: {
-            name: '',
-            },
-          tableData: [{
-            date: '2016-05-03',
-            name: '王小狼',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }, {
-            date: '2016-05-02',
-            name: '王小虎',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }, {
-            date: '2016-05-04',
-            name: '王小虎',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }, {
-            date: '2016-05-01',
-            name: '王小虎',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }, {
-            date: '2016-05-08',
-            name: '王小虎',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }, {
-            date: '2016-05-06',
-            name: '王小虎',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }, {
-            date: '2016-05-07',
-            name: '王小虎',
-            province: '上海',
-            city: '普陀区',
-            address: '上海市普陀区金沙江路 1518 弄',
-            zip: 200333
-          }]
-        }
-      },
-      methods:{
-        handleClick(tab, event) {
-          console.log(tab, event);
-        }
-      }
+import PointsCashier from "@/views/cashier/orderComponents/integralComponents/pointsCashier.vue";
+import PointsMall from "@/views/cashier/orderComponents/integralComponents/pointsMall.vue";
 
+export default {
+  name: "order_Integral",
+  components: {PointsCashier, PointsMall},
+  data(){
+    return{
+      labelPosition: 'right',
+      radio1:'',
+      activeName: 'first',
+      formLabelAlign: {
+        name: '',
+        },
+      tableData: [{
+        date: '2016-05-03',
+        name: '王小狼',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-02',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-04',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-01',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-08',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-06',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }, {
+        date: '2016-05-07',
+        name: '王小虎',
+        province: '上海',
+        city: '普陀区',
+        address: '上海市普陀区金沙江路 1518 弄',
+        zip: 200333
+      }]
     }
+  },
+  methods:{
+    handleClick(tab, event) {
+      console.log(tab, event);
+    }
+  }
+
+}
 </script>
 
 <style scoped>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
index 5753d61b2..ed177b20e 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Oil.vue
@@ -47,7 +47,7 @@
             <el-form-item label="手机号">
               <el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
             </el-form-item>
-            <el-form-item label="油枪号" prop="order.oilGunNum">
+            <el-form-item label="油枪号" prop="oilGunNum">
               <el-select
                 v-model="queryParams.oilGunNum"
                 filterable
@@ -115,27 +115,37 @@
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="用户信息">
+                  <span>{{ props.row.userId ? queryUser(props.row.userId):"--" }}</span>
+                </el-form-item>
                 <el-form-item label="收银员">
-                  <span>{{ props.row.staffId }}</span>
+                  <span>{{ queryStaf(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="来源终端">
+                  <span>{{ getVal(terminalList,props.row.terminal) }}</span>
+                </el-form-item>
+                <el-form-item label="订单备注">
+                  <span>{{ props.row.remark ? props.row.remark:"--" }}</span>
+                  <div style="color: grey;font-size: 12px">订单备注为系统后台操作备注信息,非用户提交信息</div>
                 </el-form-item>
               </el-form>
             </template>
           </el-table-column>
           <el-table-column
             prop="terminal"
-            label="终端"
+            label="终端" align="center"
             width="80">
           </el-table-column>
           <el-table-column
             prop="orderNo"
             label="订单号"
-            width="180">
+            width="200">
           </el-table-column>
-          <el-table-column label="订单信息">
+          <el-table-column label="订单信息" align="center">
             <el-table-column
               prop="oilGunNum"
-              label="油品/油枪"
+              label="油品/油枪" align="center"
               width="120">
               <template slot-scope="props">
                 <span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}号枪</span>
@@ -143,34 +153,30 @@
             </el-table-column>
             <el-table-column
               prop="orderAmount"
-              label="订单金额"
+              label="订单金额" align="center"
               width="120">
             </el-table-column>
             <el-table-column
               prop="discountAmount"
-              label="优惠金额"
+              label="优惠金额" align="center"
               width="120">
             </el-table-column>
 
           </el-table-column>
-          <el-table-column label="付款信息">
+          <el-table-column label="付款信息" align="center">
             <el-table-column
               prop="payAmount"
-              label="实付金额"
+              label="实付金额" align="center"
               width="120">
             </el-table-column>
             <el-table-column
               prop="payUser"
-              label="付款用户"
+              label="付款用户" align="center"
               width="120">
             </el-table-column>
-            <el-table-column
-              prop="city"
-              label="orderType"
-              width="120">
             <el-table-column
               prop="orderStatus"
-              label="付款状态"
+              label="付款状态" align="center"
               width="120">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
@@ -181,7 +187,7 @@
           </el-table-column>
           <el-table-column
             prop="invoicing"
-            label="开票标识"
+            label="开票标识" align="center"
             width="220">
           </el-table-column>
 
@@ -201,7 +207,6 @@
 
             </template>
           </el-table-column>
-          </el-table-column>
         </el-table>
       </div>
       <div class="pagination-box">
@@ -226,6 +231,7 @@
   import {getDicts} from "@/api/dict/data";
   import {getOilNameList, getOilNumGun } from "@/api/cashier/oilnumgun";
   import {listOilOrder} from "@/api/cashier/oilorder";
+  import {getUser} from "@/api/cashier/user/user";
 
   export default {
     name: "order_Cashier",
@@ -251,56 +257,57 @@
           pageSize: 10,
         },
         total:0,
-        tableData: [{
-          date: '2016-05-03',
-          name: '王小狼',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-08',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-06',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-07',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }]
+
+        // tableData: [{
+        //   date: '2016-05-03',
+        //   name: '王小狼',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-02',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-04',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-01',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-08',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-06',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-07',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }]
       }
     },
     created() {
@@ -308,6 +315,34 @@
       this.getList();
     },
     methods:{
+      // 根据员工id查询员工信息
+      queryStaf(list,id){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == id){
+            name = `${item.realName}(${item.mobile})`
+          }
+        })
+        return name;
+      },
+      // 根据id查询会员信息
+      async queryUser(id){
+        let result = "";
+        if (id!=null && id!=""){
+          let data = await getUser(id);
+          result = data.data.name + "|" + data.data.mobile
+        }
+        return result.toString();
+      },
+      getVal(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
       // 获取订单列表信息
       getList(val){
         if (val!=undefined){
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
index 7a864df54..c6e0f5691 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Ordinary.vue
@@ -2,22 +2,44 @@
 <template>
   <div>
     <el-card class="box-card">
-      <div style="display: flex;">
-        <div class="top-app-sou">
-          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
-            <el-form-item label="名称">
-              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div style="margin-left: 10px">
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-        </div>
-      </div>
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号">
+          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+        </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 class="box-card">
       <div slot="header" class="clearfix">
-        <span>普通收款统计</span>
+        <span>小程序订单统计</span>
       </div>
       <div class="box-gang">
         <div class="box" v-for="(item,index) in 7" :key="index">
@@ -29,7 +51,7 @@
     </el-card>
     <el-card class="box-card">
       <div class="wgang">
-        <div>普通收款列表</div>
+        <div>小程序订单列表</div>
         <div style="display: flex ">
 
           <el-button type="primary" size="mini" icon="el-icon-plus">新增会员</el-button>
@@ -37,90 +59,82 @@
       </div>
       <div class="table-box">
         <el-table
-          :data="tableData"
+          :data="list"
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
-                <el-form-item label="名称">
-                  <span>{{ props.row.name }}</span>
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="收银员">
+                  <span>{{ getRealName(staffList,props.row.staffId) }}</span>
+                </el-form-item>
+                <el-form-item label="收银员">
+                  <span>{{ getMobile(staffList,props.row.staffId) }}</span>
                 </el-form-item>
               </el-form>
             </template>
           </el-table-column>
           <el-table-column
-            prop="date"
-            label="用户信息"
-            width="150">
-          </el-table-column>
-          <el-table-column label="余额">
-            <el-table-column
-              prop="name"
-              label="储值卡"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="升值卡"
-              width="120">
-            </el-table-column>
-
-          </el-table-column>
-          <el-table-column label="会员等级">
-            <el-table-column
-              prop="province"
-              label="汽油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="柴油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="天然气"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-          <el-table-column label="统计">
-            <el-table-column
-              prop="province"
-              label="加油金"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="积分"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="消费次数"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="实体卡号"
-            width="220">
-          </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="状态"
-            width="120">
-          </el-table-column>
-
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            prop="terminal"
+            label="终端"
+            width="180">
             <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-              >更多操作</el-button>
+              <span>{{getType(terminalList,scope.row.terminal)}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            prop="orderNo"
+            label="订单号"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="amount"
+            label="订单金额">
+          </el-table-column>
+          <el-table-column
+            prop="payAmount"
+            label="实付金额">
+          </el-table-column>
+          <el-table-column label="订单金额组成">
+            <el-table-column
+              prop="oilOrderAmount"
+              label="油品金额">
+            </el-table-column>
+            <el-table-column
+              prop="goodsOrderAmount"
+              label="商品金额">
+            </el-table-column>
+          </el-table-column>
 
+          <el-table-column
+            prop="payUser"
+            label="付款用户">
+          </el-table-column>
+
+          <el-table-column
+            prop="status"
+            label="状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.status == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.status == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="交易时间" align="center" width="160" prop="payTime">
+            <template slot-scope="scope">
+              <span>{{ scope.row.payTime ? parseTime(scope.row.payTime):"--" }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+            <template slot-scope="scope">
+<!--              <el-button style="width: 60px" size="mini"-->
+<!--                         @click="getOrdersInfo(scope.row.id)"-->
+<!--                         type="success" plain round>详情</el-button>-->
+              <el-button style="width: 60px" size="mini"
+                         @click="patchwork(scope.row)"
+                         type="primary" plain round>补打</el-button>
+              <el-button style="width: 60px" size="mini"
+                         @click="handleRefund(scope.row.id)"
+                         type="danger" plain round>退款</el-button>
             </template>
           </el-table-column>
 
@@ -129,76 +143,219 @@
       <div class="pagination-box">
         <el-pagination
           background
+          v-show="total>0"
           layout="prev, pager, next"
-          :total="1000">
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
         </el-pagination>
       </div>
 
 
     </el-card>
+
+<!--    订单退款-->
+    <el-dialog
+      title="订单退款"
+      width="25%"
+      :visible.sync="dialogRefund">
+      <div style="text-align: center;font-weight: bold">
+        ￥<span style="font-size: 35px">{{ cashierOrder.amount }}</span>
+      </div>
+      <div class="tk">退款金额</div>
+      <div class="tk">退款单号：{{ cashierOrder.orderNo }}</div>
+      <div style="margin: 10px 0">
+        退款原因<br/>
+        <el-radio-group v-model="radio1" style="margin: 10px 0">
+          <el-radio-button label="油号选错"></el-radio-button>
+          <el-radio-button label="金额错误"></el-radio-button>
+          <el-radio-button label="其他原因"></el-radio-button>
+        </el-radio-group>
+      </div>
+      <div>
+        <el-input placeholder="请输入密码" v-model="password" show-password></el-input>
+        <br/>
+        <span style="color: grey;font-size: 12px">退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理</span>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogRefund = false">取 消</el-button>
+        <el-button type="primary" @click="dialogRefund = false">确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+import {cashierOrder, listCashierOrder} from "@/api/cashier/cashierorder";
+import {getDicts} from "@/api/dict/data";
+import {queryStaffs} from "@/api/cashier/staff";
+
   export default {
     name: "order_Cashier",
     data(){
       return{
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+          terminal:"applet",
+        },
+        // 总条数
+        total:0,
+        // 列表信息
+        list:[],
+        dialogRefund:false,
+        // 收银员订单详情
+        cashierOrder:{},
+        // 退款密码
+        password:"",
+        radio1:"油号选错",
+        // 终端列表
+        terminalList:[],
+        // 员工列表
+        staffList:[],
+        // 日期范围
+        dateRange: [],
+
         labelPosition: 'right',
         formLabelAlign: {
           name: '',
         },
-        tableData: [{
-          date: '2016-05-03',
-          name: '王小狼',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-08',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-06',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-07',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }]
+        // tableData: [{
+        //   date: '2016-05-03',
+        //   name: '王小狼',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-02',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-04',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-01',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-08',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-06',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-07',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }]
       }
+    },
+    created() {
+      this.getList();
+      this.getTerList();
+    },
+    methods:{
+      // 获取员工姓名
+      getRealName(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.realName
+          }
+        })
+        return name;
+      },
+      // 获取员工手机号
+      getMobile(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.id == val){
+            name = item.mobile
+          }
+        })
+        return name;
+      },
+      getType(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
+      // 获取终端列表信息
+      getTerList(){
+        getDicts("terminal").then( response => {
+          this.terminalList = response.data;
+        })
+        queryStaffs().then( response => {
+          this.staffList = response.data;
+        })
+      },
+      // 补打
+      patchwork(data){
+        const orderNo = data.orderNo
+        this.$modal.confirm('确定您要补打当前订单吗？当前订单号[' + orderNo + '],请确保云打印机正在运行中').then(function() {
+          // return delUser(row.id);
+        }).then(() => {
+          this.$modal.msgSuccess("打印指令已发送打印机,请查看打印结果");
+        }).catch(() => {});
+      },
+      // 退款
+      handleRefund(id){
+        this.dialogRefund = true;
+        cashierOrder(id).then( response => {
+          this.cashierOrder = response.data
+        })
+      },
+      // 获取列表信息
+      getList(){
+        listCashierOrder(this.queryParams).then( response => {
+          this.list = response.data.records;
+          this.total = response.data.total;
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          page: 1,
+          pageSize: 10,
+          terminal:"applet",
+        }
+        // this.resetForm("queryForm");
+        this.handleQuery();
+      },
     }
   }
 </script>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
index cbbf35031..9e0775eb2 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Unpaid.vue
@@ -2,18 +2,83 @@
 <template>
   <div>
     <el-card class="box-card">
-      <div style="display: flex;">
-        <div class="top-app-sou">
-          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">
-            <el-form-item label="名称">
-              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-        <div style="margin-left: 10px">
-          <el-button type="primary" icon="el-icon-search">搜索</el-button>
-        </div>
-      </div>
+<!--      <div style="display: flex;">-->
+<!--        <div class="top-app-sou">-->
+<!--          <el-form :label-position="labelPosition" label-width="40px" :model="formLabelAlign">-->
+<!--            <el-form-item label="名称">-->
+<!--              <el-input v-model="formLabelAlign.name" placeholder="请输入要搜索的内容"></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-form>-->
+<!--        </div>-->
+<!--        <div style="margin-left: 10px">-->
+<!--          <el-button type="primary" icon="el-icon-search">搜索</el-button>-->
+<!--        </div>-->
+<!--      </div>-->
+      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="68px">
+        <el-form-item label="交易员工" prop="staffId">
+          <el-select
+            v-model="queryParams.staffId"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in staffList" :key="item.id" :label="item.realName" :value="item.id">
+              <span style="float: left">{{ item.realName }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.mobile }}</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="支付类型" prop="payType">
+          <el-select
+            v-model="queryParams.payType"
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in payList"
+                       :key="item.id"
+                       :label="item.dictLabel"
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="queryParams.payUser" placeholder="请输入手机号"></el-input>
+        </el-form-item>
+        <el-form-item label="油枪号" prop="oilGunNum">
+          <el-select
+            v-model="queryParams.oilGunNum"
+            filterable
+            clearable
+            placeholder="全部"
+          >
+            <el-option v-for="item in oilNumList"
+                       :key="item.id"
+                       :label="item.oilGunNum"
+                       :value="item.id">
+              <span style="float: left">{{ getName(oilNameList,item.oilName) }}</span>
+              <span style="float: right; color: #8492a6; font-size: 13px">{{ item.oilGunNum }}号枪</span>
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="订单号">
+          <el-input v-model="queryParams.orderNo" placeholder="订单号、官方单号检索"></el-input>
+        </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 class="box-card">
       <div slot="header" class="clearfix">
@@ -37,7 +102,7 @@
       </div>
       <div class="table-box">
         <el-table
-          :data="tableData"
+          :data="list"
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
@@ -49,88 +114,77 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="date"
-            label="用户信息"
-            width="150">
+            prop="terminal"
+            label="终端">
           </el-table-column>
-          <el-table-column label="余额">
-            <el-table-column
-              prop="name"
-              label="储值卡"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="升值卡"
-              width="120">
-            </el-table-column>
-
-          </el-table-column>
-          <el-table-column label="会员等级">
-            <el-table-column
-              prop="province"
-              label="汽油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="柴油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="天然气"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-          <el-table-column label="统计">
-            <el-table-column
-              prop="province"
-              label="加油金"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="积分"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="消费次数"
-              width="120">
-            </el-table-column>
-          </el-table-column>
-
           <el-table-column
-            prop="zip"
-            label="实体卡号"
-            width="220">
-          </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="状态"
-            width="120">
-          </el-table-column>
-
-          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button
-                size="mini"
-                type="text"
-                icon="el-icon-edit"
-              >更多操作</el-button>
-
+            prop="oils"
+            label="油品/油枪">
+            <template slot-scope="props">
+              <span>{{ getName(oilNameList,props.row.oils) }}/{{ props.row.oilGunNum }}号枪</span>
             </template>
           </el-table-column>
+          <el-table-column label="订单信息">
+            <el-table-column
+              prop="orderNo"
+              label="订单号">
+            </el-table-column>
+            <el-table-column
+              prop="orderAmount"
+              label="交易金额">
+            </el-table-column>
+
+          </el-table-column>
+
+          <el-table-column
+            prop="payType"
+            label="付款类型">
+            <template slot-scope="scope">
+              <span>{{getPayType(payTypeList,scope.row.payType)}}</span>
+            </template>
+          </el-table-column>
+
+          <el-table-column
+            prop="payUser"
+            label="付款用户">
+          </el-table-column>
+
+          <el-table-column
+            prop="createTime"
+            label="交易时间">
+          </el-table-column>
+
+          <el-table-column
+            prop="orderStatus"
+            label="支付状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.orderStatus == 'unpaid'">未支付</el-tag>
+              <el-tag type="info" v-else>支付失败</el-tag>
+            </template>
+          </el-table-column>
+
+<!--          <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--            <template slot-scope="scope">-->
+<!--              <el-button-->
+<!--                size="mini"-->
+<!--                type="text"-->
+<!--                icon="el-icon-edit"-->
+<!--              >更多操作</el-button>-->
+
+<!--            </template>-->
+<!--          </el-table-column>-->
 
         </el-table>
       </div>
       <div class="pagination-box">
         <el-pagination
           background
+          v-show="total>0"
           layout="prev, pager, next"
-          :total="1000">
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
         </el-pagination>
       </div>
 
@@ -140,65 +194,162 @@
 </template>
 
 <script>
+  import {listOilOrder} from "@/api/cashier/oilorder";
+  import {getDicts} from "@/api/dict/data";
+  import {getOilNameList, getOilNumGun} from "@/api/cashier/oilnumgun";
+
   export default {
     name: "order_Cashier",
     data(){
       return{
+        // 查询参数
+        queryParams: {
+          page: 1,
+          pageSize: 10,
+          orderStatus:"paid",
+        },
+        // 总条数
+        total:0,
+        // 列表信息
+        list:[],
+        // 支付状态列表
+        payList:[],
+        // 支付类型列表
+        payTypeList:[],
+        oilNameList:[],
+        // 员工列表
+        staffList:[],
+        // 油枪列表
+        oilNumList:[],
+        // 日期范围
+        dateRange: [],
+
         labelPosition: 'right',
         formLabelAlign: {
           name: '',
         },
-        tableData: [{
-          date: '2016-05-03',
-          name: '王小狼',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-02',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-04',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-01',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-08',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-06',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }, {
-          date: '2016-05-07',
-          name: '王小虎',
-          province: '上海',
-          city: '普陀区',
-          address: '上海市普陀区金沙江路 1518 弄',
-          zip: 200333
-        }]
+        // tableData: [{
+        //   date: '2016-05-03',
+        //   name: '王小狼',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-02',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-04',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-01',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-08',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-06',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }, {
+        //   date: '2016-05-07',
+        //   name: '王小虎',
+        //   province: '上海',
+        //   city: '普陀区',
+        //   address: '上海市普陀区金沙江路 1518 弄',
+        //   zip: 200333
+        // }]
       }
+    },
+    created() {
+      this.getList();
+      this.getPayList();
+    },
+    methods:{
+      // 获取油号名称
+      getName(oilNameList,id){
+        let name = ""
+        let _this = this;
+        if(oilNameList!=null && oilNameList!=""){
+          oilNameList.forEach(item => {
+            if (item.id == id){
+              name = item.oilName;
+              _this.oilType = item.oilType;
+            }
+          })
+        }
+        return name;
+      },
+      // 获取付款类型
+      getPayType(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
+      // 获取支付信息列表
+      getPayList(){
+        getDicts("pay_status").then( response => {
+          this.payList = response.data;
+        })
+        getDicts("payment_type").then( response => {
+          this.payTypeList = response.data;
+        })
+        getOilNameList().then( response => {
+          this.oilNameList = response.data;
+        })
+        getOilNumGun({oilNum : "全部"}).then( response => {
+          this.oilNumList = response.data
+        })
+      },
+      // 获取列表信息
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.page = val
+        }
+        listOilOrder(this.addDateRange(this.queryParams, this.dateRange)).then( response => {
+          this.list = response.data.records;
+          this.total = response.data.total;
+        })
+      },
+      // 搜索按钮操作
+      handleQuery() {
+        this.queryParams.page = 1;
+        this.getList();
+      },
+      // 重置按钮操作
+      resetQuery() {
+        this.dateRange = [];
+        this.queryParams = {
+          page: 1,
+          pageSize: 10,
+          orderStatus:"paid",
+        }
+        // this.resetForm("queryForm");
+        this.handleQuery();
+      },
     }
   }
 </script>
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
index e75cf6d3c..b126b27ef 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Vip.vue
@@ -1,6 +1,7 @@
 <!--会员充值订单-->
 <template>
   <div>
+<!--    条件查询-->
     <el-card class="box-card">
       <div style="display: flex;">
         <div class="top-app-sou">
@@ -15,6 +16,7 @@
         </div>
       </div>
     </el-card>
+<!--    统计-->
     <el-card class="box-card">
       <div slot="header" class="clearfix">
         <span>会员充值统计</span>
@@ -27,92 +29,67 @@
 
       </div>
     </el-card>
+<!--    表格-->
     <el-card class="box-card">
       <div class="wgang">
         <div>会员充值列表</div>
-        <div style="display: flex ">
+<!--        <div style="display: flex ">-->
 
-          <el-button type="primary" size="mini" icon="el-icon-plus">新增会员</el-button>
-        </div>
+<!--          <el-button type="primary" size="mini" icon="el-icon-plus">新增会员</el-button>-->
+<!--        </div>-->
       </div>
       <div class="table-box">
         <el-table
-          :data="tableData"
+          :data="list"
           style="width: 100%">
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
-                <el-form-item label="名称">
+              <el-form label-position="left" class="demo-table-expand" style="margin-left: 20px">
+                <el-form-item label="会员名称">
                   <span>{{ props.row.name }}</span>
                 </el-form-item>
+                <el-form-item label="会员手机号">
+                  <span>{{ props.row.mobile }}</span>
+                </el-form-item>
+                <el-form-item label="操作人">
+                  <span>{{ props.row.realName }}</span>
+                </el-form-item>
+                <el-form-item label="操作人手机号">
+                  <span>{{ props.row.staffMobile }}</span>
+                </el-form-item>
+                <el-form-item label="储值优惠">
+                  <span>充值满{{ props.row.rechargeBalance }}元赠送{{ props.row.giftBalance }}元</span>
+                </el-form-item>
               </el-form>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="date"
-            label="用户信息"
-            width="150">
+          <el-table-column prop="name" label="会员名称"> </el-table-column>
+          <el-table-column prop="bidBalance" label="储值卡面值"> </el-table-column>
+          <el-table-column prop="rechargeBalance" label="储值卡实售金额"> </el-table-column>
+          <el-table-column prop="giftBalance" label="储值卡赠送金额"></el-table-column>
+          <el-table-column prop="paymentType" label="支付方式">
+            <template slot-scope="scope">
+              <span>{{getType(payList,scope.row.paymentType)}}</span>
+            </template>
           </el-table-column>
-          <el-table-column label="余额">
-            <el-table-column
-              prop="name"
-              label="储值卡"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="name"
-              label="升值卡"
-              width="120">
-            </el-table-column>
-
+          <el-table-column prop="payStatus" label="支付状态">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.payStatus == 'unpaid'">未支付</el-tag>
+              <el-tag type="success" v-else-if="scope.row.payStatus == 'paid'">已支付</el-tag>
+              <el-tag type="danger" v-else>支付失败</el-tag>
+            </template>
           </el-table-column>
-          <el-table-column label="会员等级">
-            <el-table-column
-              prop="province"
-              label="汽油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="柴油"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="天然气"
-              width="120">
-            </el-table-column>
+          <el-table-column prop="realName" label="交易员工"></el-table-column>
+          <el-table-column prop="remark" label="充值备注">
+            <template slot-scope="scope">
+              <span>{{ scope.row.remark ? scope.row.remark:"--" }}</span>
+            </template>
           </el-table-column>
-          <el-table-column label="统计">
-            <el-table-column
-              prop="province"
-              label="加油金"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="积分"
-              width="120">
-            </el-table-column>
-            <el-table-column
-              prop="city"
-              label="消费次数"
-              width="120">
-            </el-table-column>
+          <el-table-column prop="fringeBenefit" label="附加福利">
+            <template slot-scope="scope">
+              <span>{{ scope.row.fringeBenefit ? scope.row.fringeBenefit:"--" }}</span>
+            </template>
           </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="实体卡号"
-            width="220">
-          </el-table-column>
-
-          <el-table-column
-            prop="zip"
-            label="状态"
-            width="120">
-          </el-table-column>
-
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
             <template slot-scope="scope">
               <el-button
@@ -129,8 +106,12 @@
       <div class="pagination-box">
         <el-pagination
           background
+          v-show="total>0"
           layout="prev, pager, next"
-          :total="1000">
+          :total="total"
+          :page.sync="queryParams.page"
+          :limit.sync="queryParams.pageSize"
+          @current-change="getList">
         </el-pagination>
       </div>
 
@@ -140,10 +121,25 @@
 </template>
 
 <script>
+  import {listCardValueRecord} from "@/api/cashier/cardvaluerecord";
+  import {getDicts} from "@/api/dict/data";
+
   export default {
     name: "order_Cashier",
     data(){
       return{
+        // 支付方式列表
+        payList:[],
+        // 查询参数
+        queryParams: {
+          pageNo: 1,
+          pageSize: 10,
+        },
+        // 列表信息
+        list:[],
+        // 总条数
+        total:0,
+
         labelPosition: 'right',
         formLabelAlign: {
           name: '',
@@ -199,6 +195,37 @@
           zip: 200333
         }]
       }
+    },
+    created() {
+      this.getList();
+      this.getPayList();
+    },
+    methods:{
+      getType(list,val){
+        let name = "";
+        list.forEach(item => {
+          if (item.dictValue == val){
+            name = item.dictLabel
+          }
+        })
+        return name;
+      },
+      // 获取支付列表信息
+      getPayList(){
+        getDicts("payment_type").then( response => {
+          this.payList = response.data;
+        })
+      },
+      // 获取列表信息
+      getList(val){
+        if (val!=undefined){
+          this.queryParams.pageNo = val
+        }
+        listCardValueRecord(this.queryParams).then( response => {
+          this.list = response.data.records;
+          this.total = response.data.total;
+        })
+      }
     }
   }
 </script>