From d92c33373a70e4994e6ab124ca52f37464604ed5 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, 5 Jan 2024 18:19:48 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fuintAdmin/src/api/EventMarketing/oilBlock.js | 8 ++++++++ .../EventMarketing/storeOilBlock/index.vue | 13 +++++++----- .../impl/MerchantConfigServiceImpl.java | 2 +- .../impl/CardFuelDieselServiceImpl.java | 19 +++++++++++++++--- .../impl/CardFuelRecordServiceImpl.java | 13 ++++-------- .../impl/CardValueRecordServiceImpl.java | 20 ++++++++++++------- gasStation-uni/pages/my/my.vue | 4 +--- 7 files changed, 51 insertions(+), 28 deletions(-) diff --git a/fuintAdmin/src/api/EventMarketing/oilBlock.js b/fuintAdmin/src/api/EventMarketing/oilBlock.js index bf7f5da4c..1b90a21c6 100644 --- a/fuintAdmin/src/api/EventMarketing/oilBlock.js +++ b/fuintAdmin/src/api/EventMarketing/oilBlock.js @@ -16,6 +16,14 @@ export function oilName(oilType) { }) } + +// 查询油号 +export function getById(id) { + return request({ + url: 'business/marketingActivity/cardFuelDiesel/'+id, + method: 'get', + }) +} // 新增列表 export function addList(data) { return request({ diff --git a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue index dda9860f3..3b64b432f 100644 --- a/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue +++ b/fuintAdmin/src/views/EventMarketing/storeOilBlock/index.vue @@ -156,7 +156,7 @@ @@ -256,7 +256,7 @@