From 79134699fd6919eb4300151b23288609729a6eea Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Sat, 11 Nov 2023 18:04:49 +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 --- fuintAdmin/src/views/member/index.vue | 169 ++- .../fuyou/service/impl/FyPayServiceImpl.java | 15 + .../controller/CashierOrderController.java | 16 +- .../order/controller/OilOrderController.java | 17 + .../controller/OrderGoodsController.java | 20 +- .../business/order/entity/CashierOrder.java | 16 + .../order/mapper/CashierOrderMapper.java | 9 + .../business/order/mapper/OilOrderMapper.java | 10 + .../order/mapper/xml/CashierOrderMapper.xml | 6 + .../order/mapper/xml/OilOrderMapper.xml | 8 + .../order/service/CashierOrderService.java | 7 + .../order/service/OilOrderService.java | 8 + .../service/impl/CashierOrderServiceImpl.java | 7 + .../service/impl/OilOrderServiceImpl.java | 15 +- .../business/order/vo/CashierOrderVo.java | 12 + .../fuint/business/order/vo/OilOrderVo.java | 19 +- .../src/api/cashier/cashierorder.js | 8 + fuintCashierWeb/src/api/cashier/goodsorder.js | 7 +- fuintCashierWeb/src/api/cashier/oilorder.js | 11 +- .../cashier/orderComponents/order_Cashier.vue | 332 ++++-- .../cashier/orderComponents/order_Goods.vue | 100 +- .../views/cashier/vipComponents/vipList.vue | 1032 ++++++++++++++--- fuintCashierWeb/src/views/details/index.vue | 2 +- 23 files changed, 1416 insertions(+), 430 deletions(-) create mode 100644 fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CashierOrderVo.java diff --git a/fuintAdmin/src/views/member/index.vue b/fuintAdmin/src/views/member/index.vue index 6eff6452e..4167c3486 100644 --- a/fuintAdmin/src/views/member/index.vue +++ b/fuintAdmin/src/views/member/index.vue @@ -7,85 +7,85 @@ - - - - - - - - - - - - - - - - - - - - - - - + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - 搜索 - 重置 - - + + 搜索 + 重置 + + @@ -192,16 +192,6 @@
{{ scope.row.cardBalance ? scope.row.cardBalance.toFixed(2) : '0.00' }}
- - - - - - - - - - - + @@ -144,28 +144,148 @@
+ :total="total" + :page.sync="queryParams.page" + :limit.sync="queryParams.pageSize" + @current-change="getList">
-
+ + + +
+ + {{ cashierOrder.realName }} + {{ cashierOrder.mobile }} + {{ cashierOrder.orderNo }} + {{ cashierOrder.amount }} + {{ cashierOrder.oilOrderAmount }} + {{ cashierOrder.goodsOrderAmount }} + {{ cashierOrder.oilDiscountAmount }} + {{ cashierOrder.goodsDiscountAmount }} + {{ cashierOrder.payAmount }} + + 未支付 + 已支付 + 支付失败 + + + {{ cashierOrder.payTime ? parseTime(cashierOrder.payTime):"--" }} + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ ¥{{ cashierOrder.amount }} +
+
退款金额
+
退款单号:{{ cashierOrder.orderNo }}
+
+ 退款原因
+ + + + + +
+
+ +
+ 退款仅支持全额退款,退款金额将按照支付信息原路退回、优惠券、储值卡等原路退回处理 +
+ + 取 消 + 确 定 + +