From 846ce4c33fdb986aa0bdf29e5d1d639ed548ecce Mon Sep 17 00:00:00 2001
From: cun-nan <19819293608@163.com>
Date: Thu, 24 Oct 2024 16:25:56 +0800
Subject: [PATCH] 10.24
---
fuintAdmin/src/api/seeting/youqiji.js | 6 +++
.../views/setting/device/content/youqiji.vue | 20 +++++++--
fuintAdmin/src/views/setting/print/index.vue | 45 +++++++++----------
.../service/impl/OilOrderServiceImpl.java | 4 +-
.../mapper/xml/PrintDeviceInfoMapper.xml | 12 +++++
5 files changed, 59 insertions(+), 28 deletions(-)
diff --git a/fuintAdmin/src/api/seeting/youqiji.js b/fuintAdmin/src/api/seeting/youqiji.js
index e9c72f6b0..2e6d9415c 100644
--- a/fuintAdmin/src/api/seeting/youqiji.js
+++ b/fuintAdmin/src/api/seeting/youqiji.js
@@ -7,6 +7,12 @@ export function getListByPageApi(query) {
params: query
})
}
+export function getInfoByPageApi(id) {
+ return request({
+ url: 'oilEngineConfig/'+id,
+ method: 'get',
+ })
+}
export function addOilEngineConfigApi(data) {
return request({
url: 'oilEngineConfig',
diff --git a/fuintAdmin/src/views/setting/device/content/youqiji.vue b/fuintAdmin/src/views/setting/device/content/youqiji.vue
index 4185d7d4a..757f53f89 100644
--- a/fuintAdmin/src/views/setting/device/content/youqiji.vue
+++ b/fuintAdmin/src/views/setting/device/content/youqiji.vue
@@ -95,6 +95,7 @@
clearable
placeholder="设备类型"
style="width: 300px;"
+ @change="chooseType"
>
@@ -129,7 +130,7 @@
import {
addOilEngineConfigApi,
delOilEngineConfigApi,
- editOilEngineConfigApi,
+ editOilEngineConfigApi, getInfoByPageApi,
getListByPageApi
} from "@/api/seeting/youqiji";
@@ -182,7 +183,12 @@ export default {
this.getDeptList()
},
methods: {
-
+ // 选择设备类型
+ chooseType(){
+ if (this.deviceInfo.deviceType!='BY'){
+ this.deviceInfo.deviceId = ''
+ }
+ },
getList(){
let dateRange = []
if (this.beginTime && this.endTime) {
@@ -247,8 +253,14 @@ export default {
this.clean()
this.open = true;
this.title = "编辑设备"
- this.deviceInfo = e
- console.log('提交设备信息数据:', this.deviceInfo);
+ getInfoByPageApi(e.id).then(res => {
+ this.deviceInfo = res.data
+ if (this.deviceInfo.deviceType!='BY'){
+ this.deviceInfo.deviceId = ''
+ }
+ console.log('提交设备信息数据:', this.deviceInfo);
+ })
+
},
del(e) {
diff --git a/fuintAdmin/src/views/setting/print/index.vue b/fuintAdmin/src/views/setting/print/index.vue
index b907520a4..e5240723b 100644
--- a/fuintAdmin/src/views/setting/print/index.vue
+++ b/fuintAdmin/src/views/setting/print/index.vue
@@ -11,37 +11,36 @@
@keyup.enter.native="handleQuery"
/>
-
+
-
-
-
+
+
-
+
-
-
-
+
+ {{ item.realName }}
+ {{ item.mobile }}
+
-
+
-
-
-
+
+
@@ -108,15 +107,15 @@
/>
-
-
+
-
+
@@ -125,17 +124,17 @@
-
+
-
+
@@ -150,7 +149,7 @@
v-model="deviceInfo.deptId"
clearable
placeholder=""
- style="width: 300px"
+ style="width: 100%"
collapse-tags
>
-
+
取消
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 1c04785d9..628ce994b 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
@@ -803,10 +803,12 @@ public class OilOrderServiceImpl extends ServiceImpl i
// 调用消费有礼接口
public void updateCardAndActiveById(Integer storeId, Integer userId, Integer orderId) {
if (ObjectUtil.isNotEmpty(userId)) {
+ OilOrder oilOrder = selectOilOrderById(orderId);
+ AllOrderInfo allOrderInfo = allOrderInfoService.selectAllOrderInfoByOrderNo(oilOrder.getOrderNo());
Map map = new HashMap<>();
map.put("userId", userId.toString());
map.put("storeId", storeId.toString());
- map.put("orderId", orderId.toString());
+ map.put("orderId", allOrderInfo.getId().toString());
payCenterService.cashRegisterSpendWisely(map);
}
}
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
index 08eb60f5b..511cd6cdf 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/printer/mapper/xml/PrintDeviceInfoMapper.xml
@@ -68,6 +68,18 @@
and store_id = #{printDeviceInfo.storeId}
+
+ and acquiesce = #{printDeviceInfo.acquiesce}
+
+
+ and status = #{printDeviceInfo.status}
+
+
+ and device_ab like concat('%', #{printDeviceInfo.deviceAb}, '%')
+
+
+ and staff_ids like concat('%', #{printDeviceInfo.staffIds}, '%')
+
order by create_time desc