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

更新10.16

Browse Source
This commit is contained in:
许允枞 2024-10-16 14:05:40 +08:00
parent b78e2a0f1d
commit 4bcc6fbe02
1 changed files with 33 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fuintBackend/fuint-application/src/main/java/com/fuint/business/fleet/service/impl/FleetInfoServiceImpl.java
View File

@ -233,9 +233,9 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
* @return * @return
*/ */
@Override @Override
public List<FleetInfoUniVo> queryByStoreId(Integer storeId,Integer userId) { public List<FleetInfoUniVo> queryByStoreId(Integer storeId, Integer userId) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
if (ObjectUtil.isEmpty(userId)){ if (ObjectUtil.isEmpty(userId)) {
userId = nowAccountInfo.getId(); userId = nowAccountInfo.getId();
} }
//查询当前登录人的车队信息 //查询当前登录人的车队信息
@ -386,7 +386,7 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
int i = baseMapper.updateById(fleetInfo); int i = baseMapper.updateById(fleetInfo);
if (i > 0) { if (i > 0) {
return fleetInfo.getId(); return fleetInfo.getId();
}else { } else {
throw new RuntimeException("编辑失败"); throw new RuntimeException("编辑失败");
} }
} }
@ -432,13 +432,13 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
//查找车队成员 //查找车队成员
FleetMember fleetMember = fleetMemberMapper.selectOne(new LambdaQueryWrapper<FleetMember>() FleetMember fleetMember = fleetMemberMapper.selectOne(new LambdaQueryWrapper<FleetMember>()
.eq(FleetMember::getUserId, allOrderInfo.getUserId()) .eq(FleetMember::getUserId, allOrderInfo.getUserId())
.orderBy(true,true,FleetMember::getCreateTime) .orderBy(true, true, FleetMember::getCreateTime)
.last("limit 1")); .last("limit 1"));
// 获取当前车队卡 // 获取当前车队卡
FleetInfo fleetInfo = baseMapper.selectOne(new LambdaQueryWrapper<FleetInfo>() FleetInfo fleetInfo = baseMapper.selectOne(new LambdaQueryWrapper<FleetInfo>()
.eq(FleetInfo::getId, fleetMember.getFleetId())); .eq(FleetInfo::getId, fleetMember.getFleetId()));
//判断支付金额是否超过当前余额 //判断支付金额是否超过当前余额
if (money > fleetInfo.getTotalBalance()){ if (money > fleetInfo.getTotalBalance()) {
throw new RuntimeException("支付金额超过当前车队余额"); throw new RuntimeException("支付金额超过当前车队余额");
} }
@ -510,7 +510,6 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
if (ObjectUtil.isEmpty(fleetConsumeRecord)) { if (ObjectUtil.isEmpty(fleetConsumeRecord)) {
throw new RuntimeException("车队订单不存在"); throw new RuntimeException("车队订单不存在");
} }
if ("paid".equals(fleetConsumeRecord.getOrderStatus())) {
//退款金额 //退款金额
Double refundMoney = fleetConsumeRecord.getNetReceiptsAmount(); Double refundMoney = fleetConsumeRecord.getNetReceiptsAmount();
//获取当前车队卡 //获取当前车队卡
@ -539,8 +538,6 @@ public class FleetInfoServiceImpl extends ServiceImpl<FleetInfoMapper, FleetInfo
fleetConsumeRecord.setUpdateBy(nowAccountInfo.getStaffId().toString()); fleetConsumeRecord.setUpdateBy(nowAccountInfo.getStaffId().toString());
return fleetConsumeRecordMapper.updateById(fleetConsumeRecord); return fleetConsumeRecordMapper.updateById(fleetConsumeRecord);
} }
return 0;
}
/** /**