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

10.14

Browse Source
This commit is contained in:
cun-nan 2024-10-14 14:56:04 +08:00
parent 0edf36a6d3
commit 18f724d177
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1188,6 +1188,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
order.setInvoicing("未开票"); order.setInvoicing("未开票");
order.setOrderStatus("paid"); order.setOrderStatus("paid");
order.setPayTime(new Date()); order.setPayTime(new Date());
order.setTankId(Integer.valueOf(oilOrders.get("tankId").toString()));
this.addOilTracks(order, accountInfo.getStoreId()); this.addOilTracks(order, accountInfo.getStoreId());
if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))) { if (ObjectUtil.isNotEmpty(this.selectOilOrderByOrderNo(orderNo))) {
baseMapper.updateById(order); baseMapper.updateById(order);
@ -1195,7 +1196,11 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
baseMapper.insert(order); baseMapper.insert(order);
} }
// 计算成长值
this.updateGrowthValue1(oilAmount, 0.0, userId, Integer.valueOf(order.getOils()), 0.0, storeId, orderNo); this.updateGrowthValue1(oilAmount, 0.0, userId, Integer.valueOf(order.getOils()), 0.0, storeId, orderNo);
// 修改囤油卡升数信息
// userFuelService.
// 修改储值卡余额信息
cashierOrder.setStaffId(order.getStaffId()); cashierOrder.setStaffId(order.getStaffId());
cashierOrder.setStoreId(accountInfo.getStoreId()); cashierOrder.setStoreId(accountInfo.getStoreId());

7
fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/UserBalanceServiceImpl.java
View File

@ -351,8 +351,11 @@ public class UserBalanceServiceImpl extends ServiceImpl<UserBalanceMapper, UserB
growthValueChangeMapper.insert(growthValueChange); growthValueChangeMapper.insert(growthValueChange);
List<MtUserGrade> mtUserGrades = mtUserGradeMapper.selectList(new LambdaQueryWrapper<MtUserGrade>() // List<MtUserGrade> mtUserGrades = mtUserGradeMapper.selectList(new LambdaQueryWrapper<MtUserGrade>()
.eq(MtUserGrade::getStoreId, storeId)); // .eq(MtUserGrade::getStoreId, storeId));
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("store_id", storeId);
List<LJUserGrade> mtUserGrades = ljUserGradeMapper.selectList(queryWrapper);
//判断当前用户等级 //判断当前用户等级
for (int i = 0; i < mtUserGrades.size(); i++) { for (int i = 0; i < mtUserGrades.size(); i++) {