From 93b5665bb9362b8339e441556cfac1e5c42bf244 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, 11 Jun 2024 14:32:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=94=AF=E4=BB=98bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fuintAdmin/src/views/oilConfig/oilPrice/index.vue      |  2 +-
 .../order/service/impl/OilOrderServiceImpl.java        | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
index d0b554df4..60c09d694 100644
--- a/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
+++ b/fuintAdmin/src/views/oilConfig/oilPrice/index.vue
@@ -322,7 +322,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="450px" :close-on-click-modal="false">
+    <el-dialog title="添加预设" :visible.sync="dialogFormPricesAdd" width="500px" :close-on-click-modal="false">
       <el-form ref="priForm" :model="oilPresetPrices" label-width="100px" :rules="oilPresetPricesRules">
         <el-form-item label="预设油号" prop="numberId"  label-width="120px">
           <el-select v-model="oilPresetPrices.numberId" placeholder="请选择油号" @change="oilTypeClickByPrice()">
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 d7b3e6953..18a1d2202 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
@@ -142,6 +142,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     @Lazy
     private CardFuelRecordService cardFuelRecordService;
 
+    @Resource
+    private TagCodeService tagCodeService;
     @Override
     public IPage<OilOrder> selectOilOrderList(Page page, OilOrder order) {
         AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
@@ -1476,6 +1478,12 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
         oilOrder.setInvoicing("未开票");
         oilOrder.setUserId(nowAccountInfo.getId());
         oilOrder.setOilTagSn(oilOrder.getOilTagSn());
+        TagCode tagCode = tagCodeService.selectByTagCodeSn(oilOrder.getOilTagSn());
+        String collection = tagCode.getCollection();
+        if (collection.contains("staffId")){
+            String[] split = collection.split("staffId=");
+            oilOrder.setStaffId(Integer.parseInt(split[1]));
+        }
         //        判断当前店铺是否存在此用户的会员信息，没有的话进行添加
         LJStore store = storeService.selectStoreByStoreId(oilOrder.getStoreId());
         UserBalance balance = userBalanceService.selectUserBalance(oilOrder.getUserId(), store.getChainStoreId());
@@ -1729,8 +1737,6 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
     @Resource
     private PrinterService printerService;
 
-    @Resource
-    private TagCodeService tagCodeService;
     @Override
     public int updateOrderStatus(String orderNo, String status) throws Exception {
         int row = 0;