dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
xvv 2024-06-11 17:31:01 +08:00
commit 6fa6970613
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintAdmin/src/views/oilConfig/oilPrice/index.vue
View File

@ -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()">

10
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -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;