From cddb9231a533b45aa583896bfffd1d7c5dbddd62 Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Wed, 6 Mar 2024 11:28:57 +0800
Subject: [PATCH] bug
---
.../src/api/EventMarketing/cardExchange.js | 8 +++++
.../EventMarketing/cardExchange/index.vue | 32 +++++++++++--------
.../service/impl/OilOrderServiceImpl.java | 8 ++---
gasStation-uni/pagesMy/details/details.vue | 10 +++++-
4 files changed, 39 insertions(+), 19 deletions(-)
diff --git a/fuintAdmin/src/api/EventMarketing/cardExchange.js b/fuintAdmin/src/api/EventMarketing/cardExchange.js
index 908df7b25..1d5583fa9 100644
--- a/fuintAdmin/src/api/EventMarketing/cardExchange.js
+++ b/fuintAdmin/src/api/EventMarketing/cardExchange.js
@@ -9,6 +9,14 @@ export function listExchange(query) {
})
}
+// 查询兑换券列表
+export function exchangeInfo(id) {
+ return request({
+ url: 'business/marketingActivity/cardExchange/'+id,
+ method: 'get',
+ })
+}
+
// 查询兑换券详细
export function getExchange(id) {
return request({
diff --git a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
index c296784b0..7e2f08f4b 100644
--- a/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/cardExchange/index.vue
@@ -17,12 +17,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -83,12 +83,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -225,7 +225,7 @@ import {
delExchange,
addExchange,
updateExchange,
- getqueryGoods
+ getqueryGoods, exchangeInfo
} from '@/api/EventMarketing/cardExchange'
export default {
@@ -395,7 +395,10 @@ export default {
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
- this.form = row
+ exchangeInfo(row.id).then(res => {
+ this.form = res.data
+ })
+ // this.form = row
this.open = true
this.title = '修改兑换券'
},
@@ -427,6 +430,7 @@ export default {
updateExchange(data).then(res => {
if (res.code == 200) {
this.$message.success('下线成功')
+ this.getList()
}
})
},
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
index 3c539b04d..06c30d92a 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
@@ -823,7 +823,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
cashierOrder.setPayType(map.get("payType"));
cashierOrderService.insertCashierOrder(cashierOrder);
this.insertAllOrderInfo(orderNo, storeId, oilAmount, oilAmount, map.get("payType"), userId, "PC", "1", status);
- staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
+ if (ObjectUtil.isNotEmpty(map.get("staffId"))) staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
res.put("success","success");
}
}
@@ -889,7 +889,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
cashierOrderService.insertCashierOrder(cashierOrder);
this.updateGrowthValue1(oilAmount,oilAmount,userId, Integer.valueOf(oilOrder.getOils()),0.0,storeId,orderNo);
this.insertAllOrderInfo(orderNo,accountInfo.getStoreId(),oilAmount,oilAmount,map.get("payType"),userId,"PC","1","paid");
- staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
+ if (ObjectUtil.isNotEmpty(map.get("staffId"))) staffCommissionService.countStaffCommission(Integer.valueOf(map.get("staffId")),storeId,oilAmount,oilAmount,"1",orderNo);
// this.insertCardBalance(oilAmount,userId,storeId);
res.put("success","success");
}else {
@@ -1205,7 +1205,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount);
this.insertAllOrderInfo(orderNo,oilOrder.getStoreId(),oilOrder.getOrderAmount(),payAmount,oilOrder.getPayType(),oilOrder.getUserId(),"applet","1","paid");
this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId(),orderNo);
- staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo);
+ if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getOrderAmount(),"1",orderNo);
oilOrder.setPayAmount(payAmount);
oilOrder.setDiscountAmount(Double.valueOf(discountAmount));
oilOrder.setPayTime(new Date());
@@ -1294,7 +1294,7 @@ public class OilOrderServiceImpl extends ServiceImpl i
this.addOilTracks(oilOrder,oilOrder.getStoreId());
this.updateCardAndActiveById(oilOrder.getStoreId(),oilOrder.getUserId(),oilOrder.getActiveId(),oilOrder.getCouponId(),oilOrder.getActiveType(),oilOrder.getOrderAmount(), Integer.valueOf(oilOrder.getOils()));
this.insertCardBalance(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()-oilOrder.getPayAmount(),userId,oilOrder.getStoreId(),orderNo);
- staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo);
+ if (ObjectUtil.isNotEmpty(oilOrder.getStaffId())) staffCommissionService.countStaffCommission(oilOrder.getStaffId(),oilOrder.getStoreId(),oilOrder.getOrderAmount(),oilOrder.getPayAmount(),"1",orderNo);
}
row = baseMapper.updateById(oilOrder);
}
diff --git a/gasStation-uni/pagesMy/details/details.vue b/gasStation-uni/pagesMy/details/details.vue
index ebc1a7a39..34ace217f 100644
--- a/gasStation-uni/pagesMy/details/details.vue
+++ b/gasStation-uni/pagesMy/details/details.vue
@@ -25,7 +25,7 @@
加油员工
- {{oilOrder.realName}}
+ {{oilOrder.realName || "--"}}
油号油枪
@@ -69,6 +69,14 @@
优惠券优惠
{{cardFavorable.discountAmount || oilOrder.discountAmount}}元
+
+ 会员等级优惠
+ {{cardFavorable.discountAmount ? (oilOrder.discountAmount - cardFavorable.discountAmount) : oilOrder.discountAmount}}元
+
+
+ 会员等级优惠
+ {{fullOrDiscount.deductionAmount ? (oilOrder.discountAmount - fullOrDiscount.deductionAmount) : oilOrder.discountAmount}}元
+
优惠合计金额