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 @@ - + 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 i @Lazy private CardFuelRecordService cardFuelRecordService; + @Resource + private TagCodeService tagCodeService; @Override public IPage selectOilOrderList(Page page, OilOrder order) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); @@ -1476,6 +1478,12 @@ public class OilOrderServiceImpl extends ServiceImpl 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 i @Resource private PrinterService printerService; - @Resource - private TagCodeService tagCodeService; @Override public int updateOrderStatus(String orderNo, String status) throws Exception { int row = 0;