From 29e9b31c71f313b1a3bb9bdc125d055e75b557cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Mon, 29 Apr 2024 16:12:49 +0800
Subject: [PATCH 1/4] bug
---
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 2 ++
.../src/views/cashier/orderComponents/order_Cashier.vue | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index e3d46bd71..06bb95774 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3934,6 +3934,8 @@
this.map.recordId = this.recordId
this.map.userId = this.member.id
this.map.payUser = this.member.mobile
+ this.map.levelAmount = this.oilDiscount
+ this.map.activeAmount = this.fullReduction
let _this = this;
if (this.payType=="APPLET_CODE"){
diff --git a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
index 37fde0817..e2e5f9fb8 100644
--- a/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
+++ b/fuintCashierWeb/src/views/cashier/orderComponents/order_Cashier.vue
@@ -215,10 +215,10 @@
{{ oilInfo[0].couponAmount || 0 }}
- {{ oilInfo[0].deductionAmount || 0 }}
+ {{ oilInfo[0].activeAmount || 0 }}
- {{ cashierOrder.oilDiscountAmount - oilInfo[0].deductionAmount - oilInfo[0].couponAmount || 0 }}
+ {{ oilInfo[0].levelAmount || 0}}
{{ cashierOrder.oilDiscountAmount }}
{{ cashierOrder.goodsDiscountAmount }}
From a76908b9ee61d594d6542352cc91bd82d3dd5b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Tue, 7 May 2024 17:29:52 +0800
Subject: [PATCH 2/4] bug
---
fuintAdmin_zt/src/views/Site/index.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/fuintAdmin_zt/src/views/Site/index.vue b/fuintAdmin_zt/src/views/Site/index.vue
index 4c4b63607..44ae74d40 100644
--- a/fuintAdmin_zt/src/views/Site/index.vue
+++ b/fuintAdmin_zt/src/views/Site/index.vue
@@ -2178,8 +2178,5 @@ export default {
.custom-tree-box{
margin-right: 10px;
}
- .el-tree .el-tree-node__content .el-checkbox {
- display: none;
- }
From ff0af40e39f4d0f828c75302db32382abe2d17fd Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Fri, 10 May 2024 17:36:24 +0800
Subject: [PATCH 3/4] bug
---
fuintAdmin/src/views/member/userInfo.vue | 6 +++---
.../cardFule/mapper/xml/CardFuelRecordMapper.xml | 2 +-
fuintCashierWeb/src/api/cashier/user.js | 9 +++++++++
fuintCashierWeb/src/views/details/index.vue | 6 +++---
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue
index 98b1b5b82..afbdee7f5 100644
--- a/fuintAdmin/src/views/member/userInfo.vue
+++ b/fuintAdmin/src/views/member/userInfo.vue
@@ -301,7 +301,7 @@
v-for="(item,index) in cardFuelDieselList" :key="index"
:class="activeKey === index ? 'select' : ''"
@click="recharge(index)">
- {{ item.incomeLitres }}L
+
售价{{ item.rechargeBalance }}元
锁价{{ item.lockupPrice }}/升
@@ -1971,9 +1971,9 @@ export default {
.mon2 {
width: 20%;
- height: 75px;
+ height: 70px;
border: 0.5px #dadfe6 solid;
- line-height: 25px;
+ line-height: 35px;
border-radius: 5px;
text-align: center;
margin: 0 10px;
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
index f271b11ef..c08d1820c 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/mapper/xml/CardFuelRecordMapper.xml
@@ -424,7 +424,7 @@
mt_user_id = #{cardFuelRecord.mtUserId}
and store_id = #{cardFuelRecord.storeId}
and expire_time > NOW()
-
+
and oil_type = #{cardFuelRecord.oilType}
diff --git a/fuintCashierWeb/src/api/cashier/user.js b/fuintCashierWeb/src/api/cashier/user.js
index 548f91d6a..4ea87d4fd 100644
--- a/fuintCashierWeb/src/api/cashier/user.js
+++ b/fuintCashierWeb/src/api/cashier/user.js
@@ -44,4 +44,13 @@ export function getUserVoName(data) {
})
}
+// 获取用户囤油卡锁价信息
+export function getRecord(data) {
+ return request({
+ url: '/business/marketingActivity/cardFuelRecord/getRecordByUserId',
+ method: 'get',
+ params: data
+ })
+}
+
diff --git a/fuintCashierWeb/src/views/details/index.vue b/fuintCashierWeb/src/views/details/index.vue
index 6969bfa26..d4b5bab60 100644
--- a/fuintCashierWeb/src/views/details/index.vue
+++ b/fuintCashierWeb/src/views/details/index.vue
@@ -302,7 +302,7 @@
v-for="(item,index) in cardFuelDieselList" :key="index"
:class="activeKey === index ? 'select' : ''"
@click="recharge(index)">
- {{ item.incomeLitres }}L
+
售价{{ item.rechargeBalance }}元
锁价{{ item.lockupPrice }}/升
@@ -2344,9 +2344,9 @@ export default {
.mon2 {
width: 20%;
- height: 75px;
+ height: 70px;
border: 0.5px #dadfe6 solid;
- line-height: 25px;
+ line-height: 35px;
border-radius: 5px;
text-align: center;
margin: 0 10px;
From 983b7feb46df2de1e3a58610630366a0e34b2c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Fri, 10 May 2024 18:00:07 +0800
Subject: [PATCH 4/4] bug
---
fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue | 1 +
1 file changed, 1 insertion(+)
diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
index 06bb95774..16eae9523 100644
--- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
+++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue
@@ -3937,6 +3937,7 @@
this.map.levelAmount = this.oilDiscount
this.map.activeAmount = this.fullReduction
+
let _this = this;
if (this.payType=="APPLET_CODE"){
if (this.goodsOrder.length>0){