From 17f18c3d56a70327874aa7dda0adfa2f5e3dafce Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 14 六月 2023 20:57:38 +0800
Subject: [PATCH] 代理商修改优惠券展示
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
index dd6964d..8ed368c 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TDriverServiceImpl.java
@@ -128,9 +128,9 @@
TDriverResp tDriverResp = new TDriverResp();
BeanUtils.copyProperties(tDriver,tDriverResp);
- if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){
+ if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance()) && Objects.nonNull(tDriver.getCouponBalance())){
// 设置余额
- tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
+ tDriverResp.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()).add(tDriver.getCouponBalance()));
}
// 所属代理商
@@ -184,6 +184,7 @@
model.addAttribute("areaName",tDriver.getAreaName());
model.addAttribute("integral",tDriver.getIntegral());
model.addAttribute("score",tDriver.getScore());
+ model.addAttribute("source",tDriver.getSource());
model.addAttribute("createTime",new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tDriver.getCreateTime()));
// 计算驾龄
@@ -198,9 +199,9 @@
String monthDate = new SimpleDateFormat("yyyyMM").format(new Date());
- if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance())){
+ if(Objects.nonNull(tDriver.getBackgroundBalance()) && Objects.nonNull(tDriver.getBalance()) && Objects.nonNull(tDriver.getCouponBalance())){
// 设置余额
- tDriver.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()));
+ tDriver.setBalance(tDriver.getBackgroundBalance().add(tDriver.getBalance()).add(tDriver.getCouponBalance()));
model.addAttribute("balance",tDriver.getBalance());
}else {
model.addAttribute("balance",BigDecimal.ZERO);
@@ -334,12 +335,24 @@
tDriver.setCityName(city.getName());
tDriver.setCityCode(city.getCode());
- TRegion area = tRegionMapper.selectById(split[2]);
- if(Objects.isNull(area)){
- area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+// TRegion area = tRegionMapper.selectById(split[2]);
+// if(Objects.isNull(area)){
+// area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+// }
+// tDriver.setAreaName(area.getName());
+// tDriver.setAreaCode(area.getCode());
+ TRegion area = null;
+ if(split.length>2){
+ area = itRegionService.selectById(split[2]);
+ if(Objects.isNull(area)){
+ area = itRegionService.selectOne(new EntityWrapper<TRegion>().eq("name",split[2]));
+ }
+ tDriver.setAreaName(area.getName());
+ tDriver.setAreaCode(area.getCode());
+ }else {
+ tDriver.setAreaName(city.getName());
+ tDriver.setAreaCode(city.getCode());
}
- tDriver.setAreaName(area.getName());
- tDriver.setAreaCode(area.getCode());
// 通过省市查询代理商
List<TAgent> tAgent = tAgentMapper.selectList(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
@@ -362,12 +375,26 @@
return new SuccessTip(500, "该邀约人:"+tDriver.getInviterName()+"不存在");
}
}
- // 通过省市区查询分公司
- List<TBranchOffice> tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
- .eq("cityCode", city.getCode())
- .eq("status", StatusEnum.NORMAL.getCode())
- .eq("districtCode", area.getCode())
- .last("LIMIT 1"));
+ List<TBranchOffice> tBranchOffice;
+ if(split.length>2){
+ // 通过省市区查询分公司
+ tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+ .eq("cityCode", city.getCode())
+ .eq("status", StatusEnum.NORMAL.getCode())
+ .eq("districtCode", area.getCode())
+ .last("LIMIT 1"));
+ }else {
+ // 通过省市区查询分公司
+ tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+ .eq("cityCode", city.getCode())
+ .eq("status", StatusEnum.NORMAL.getCode())
+ .last("LIMIT 1"));
+// tBranchOffice = tBranchOfficeMapper.selectList(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
+// .eq("cityCode", city.getCode())
+// .eq("status", StatusEnum.NORMAL.getCode())
+// .eq("districtCode", city.getCode())
+// .last("LIMIT 1"));
+ }
if(!CollectionUtils.isEmpty(tBranchOffice)){
tDriver.setBranchOfficeId(tBranchOffice.get(0).getId());
}else {
@@ -470,11 +497,12 @@
}
@Override
- public void driverCommissionDetail(Integer tDriverId, Model model) {
+ public void driverCommissionDetail(Integer tDriverId, Integer levelFlag,Model model) {
// 查询司机
TDriver driver = tDriverMapper.selectById(tDriverId);
+ model.addAttribute("levelFlag",levelFlag);
// 司机信息封装
model.addAttribute("driverId",tDriverId);
model.addAttribute("name",driver.getName());
--
Gitblit v1.7.1