qichexitong/car-system-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix-租车商品

Browse Source
This commit is contained in:
xl
2024-07-09 17:40:36 +08:00
parent 8e6cb32f9d
commit 3ff64bf825
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lxk-service/src/main/java/com/zbkj/service/service/impl/CarRentalProductServiceImpl.java
View File

@@ -206,7 +206,7 @@ public class CarRentalProductServiceImpl extends ServiceImpl<CarRentalProductDao
}
q = Boolean.TRUE;
}
if (q && (CollUtil.isEmpty(bid) || CollUtil.isEmpty(mid))) {
if (q && CollUtil.isEmpty(bid) && CollUtil.isEmpty(mid)) {
return CommonPage.copyPageInfo(new Page(), CollUtil.newArrayList());
}
LambdaQueryWrapper<CarInformation> infoLqw = new LambdaQueryWrapper<>();

2
lxk-service/src/main/java/com/zbkj/service/service/impl/UserBrokerageRecordServiceImpl.java
View File

@@ -278,7 +278,7 @@ public class UserBrokerageRecordServiceImpl extends ServiceImpl<UserBrokerageRec
record.setSubAvator(order.getMerAvatar());
}
if (record.getLinkType().equals("rebate")) {
record.setSubNickName("流水返佣");
record.setSubNickName("流水返佣预估收益");
String imge = systemConfigService.getValueByKey("rebate_expend");
if (record.getType().equals(BrokerageRecordConstants.BROKERAGE_RECORD_TYPE_ADD)) {
imge = systemConfigService.getValueByKey("rebate_income");