From 184261483e5371c61d43a71598c404da19b7820a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 二月 2023 18:12:21 +0800
Subject: [PATCH] 司机管理完善，佣金管理列表
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java | 132 ++++++++++++++++++++++++++-----------------
1 files changed, 80 insertions(+), 52 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
index 907dfaa..eb37640 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TDriverController.java
@@ -1,12 +1,12 @@
package com.stylefeng.guns.modular.system.controller.general;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.modular.system.controller.resp.TDriverResp;
-import com.stylefeng.guns.modular.system.controller.util.ExcelUtil;
-import com.stylefeng.guns.modular.system.controller.util.UUIDUtil;
+import com.stylefeng.guns.modular.system.controller.util.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.ITAgentService;
import com.stylefeng.guns.modular.system.service.ITBranchOfficeService;
@@ -19,6 +19,7 @@
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.shiro.subject.Subject;
import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,6 +32,7 @@
import com.stylefeng.guns.modular.system.service.ITDriverService;
import javax.servlet.http.HttpServletResponse;
+import java.io.File;
import java.io.OutputStream;
import java.math.BigDecimal;
import java.text.DateFormat;
@@ -38,6 +40,7 @@
import java.util.Date;
import java.util.List;
import java.util.Objects;
+import java.util.stream.Collectors;
/**
* 控制器
@@ -62,6 +65,12 @@
@Autowired
private ITBranchOfficeService tBranchOfficeService;
+ @Autowired
+ private RedisTemplate<String,String> redisTemplate;
+ @Autowired
+ private HttpUtils httpUtils;
+ @Autowired
+ private TokenUtils tokenUtils;
/**
* 跳转到首页
@@ -69,6 +78,14 @@
@RequestMapping("")
public String index() {
return PREFIX + "tDriver.html";
+ }
+
+ /**
+ * 跳转到佣金首页
+ */
+ @RequestMapping("/commission")
+ public String commissionIndex() {
+ return PREFIX + "tDriverCommission.html";
}
/**
@@ -173,7 +190,7 @@
*/
@RequestMapping("/driverDetail")
public String driverDetail(Integer tDriverId, Model model) {
- tDriverService.detail(tDriverId,model);
+ tDriverService.auditPage(tDriverId,model);
return PREFIX + "tDriverDetail.html";
}
@@ -181,9 +198,30 @@
* 跳转区域页面
*/
@RequestMapping("/areaPage")
- public String areaDetail(Model model) {
+ public String areaDetail(String area,String areaId,Model model) {
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
- model.addAttribute("province",tRegions);
+ model.addAttribute("provinceList",tRegions);
+ List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+ // 查询市
+ List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", provinceIds));
+ model.addAttribute("cityList",tRegions1);
+
+ // 查询区
+ List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
+ List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+ model.addAttribute("districtList",tRegions2);
+
+ if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){
+ String[] split = area.split("/");
+ model.addAttribute("provinceName",split[0]);
+ model.addAttribute("cityName",split[1]);
+ model.addAttribute("districtName",split[2]);
+
+ String[] split1 = areaId.split("/");
+ model.addAttribute("provinceId",split1[0]);
+ model.addAttribute("cityId",split1[1]);
+ model.addAttribute("districtId",split1[2]);
+ }
return PREFIX + "tDriverArea.html";
}
@@ -194,6 +232,17 @@
@ResponseBody
public Object list(String createTime,String phone,Integer status) {
EntityWrapper<TDriver> wrapper = tDriverService.getPageList(createTime,phone,status);
+ wrapper.ne("isException",2);
+ List<TDriver> tDrivers = tDriverService.selectList(wrapper);
+ return tDriverService.getTDriverResp(tDrivers);
+ }
+ /**
+ * 获取佣金列表
+ */
+ @RequestMapping(value = "/commission/list")
+ @ResponseBody
+ public Object commissionList(String name,String phone,Integer status) {
+ EntityWrapper<TDriver> wrapper = tDriverService.getCommissionPageList(name,phone,status);
wrapper.ne("isException",2);
List<TDriver> tDrivers = tDriverService.selectList(wrapper);
return tDriverService.getTDriverResp(tDrivers);
@@ -217,6 +266,24 @@
@ResponseBody
public Object listBack(String condition) {
return tDriverService.selectList(null);
+ }
+ /**
+ * ocr
+ */
+ @RequestMapping(value = "/ocr")
+ @ResponseBody
+ public Object ocr(String imgUrl) {
+ /*String accessToken = redisTemplate.opsForValue().get(TokenUtils.ACCESS_TOKEN_CACHE_KEY);
+ if (!StringUtils.hasLength(accessToken)) {
+ accessToken = tokenUtils.getSimpleAccessToken();
+ }
+ File file = new File(imgUrl);
+ String url = Constant.OCR_URL.replace("MODE", "scan").replace("ACCESS_TOKEN", accessToken);
+ String result = httpUtils.registRequest(url, file);
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ System.err.println(jsonObject);
+ return jsonObject;*/
+ return tDriverService.ocr(imgUrl);
}
/**
@@ -248,51 +315,7 @@
if(count>0){
return "该司机已存在!";
}
-
- // 对省市区做处理
- String[] split = tDriver.getAreaId().split("/");
- // 查询省市
- // 黑龙江省/大兴安岭地区
- // 702/852
- TRegion province = tRegionService.selectById(split[0]);
- tDriver.setProvinceName(province.getName());
- tDriver.setProvinceCode(province.getCode());
-
- TRegion city = tRegionService.selectById(split[1]);
- tDriver.setCityName(city.getName());
- tDriver.setCityCode(city.getCode());
-
- TRegion area = tRegionService.selectById(split[2]);
- tDriver.setAreaName(area.getName());
- tDriver.setAreaCode(area.getCode());
-
- tDriver.setCode(UUIDUtil.getNumberRandom(16));
- tDriver.setBalance(BigDecimal.ZERO);
- tDriver.setBackgroundBalance(BigDecimal.ZERO);
-
- // 通过省市查询代理商
- TAgent tAgent = tAgentService.selectOne(new EntityWrapper<TAgent>().eq("provinceCode", province.getCode())
- .eq("cityCode", city.getCode())
- .last("LIMIT 1"));
- if(Objects.nonNull(tAgent)){
- tDriver.setAgentId(tAgent.getId());
- }
- // 查询邀约人（司机端）
- TDriver emergencyDriver = tDriverService.selectOne(new EntityWrapper<TDriver>().eq("phone", tDriver.getEmergencyPhone())
- .last("LIMIT 1"));
- if(Objects.nonNull(emergencyDriver)){
- tDriver.setInviterId(emergencyDriver.getId());
- tDriver.setInviterType(2);
- }
- // 通过省市区查询分公司
- TBranchOffice tBranchOffice = tBranchOfficeService.selectOne(new EntityWrapper<TBranchOffice>().eq("provinceCode", province.getCode())
- .eq("cityCode", city.getCode())
- .eq("districtCode", area.getCode())
- .last("LIMIT 1"));
- if(Objects.nonNull(tBranchOffice)){
- tDriver.setBranchOfficeId(tBranchOffice.getId());
- }
-
+ tDriverService.addOrUpdate(tDriver);
tDriverService.insert(tDriver);
return SUCCESS_TIP;
}
@@ -345,6 +368,9 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TDriver tDriver) {
+// Object ocr = ocr("E:\\071bf986db0b00355c0ed190bbd3b16.png");
+// System.err.println(ocr);
+ tDriverService.addOrUpdate(tDriver);
tDriverService.updateById(tDriver);
return SUCCESS_TIP;
}
@@ -368,8 +394,10 @@
@ApiOperation(value = "市区查询",notes="市区查询")
@RequestMapping(value = "/areaCity")
@ResponseBody
- public Object areaCity(Integer parentId) {
- return tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id",parentId));
+ public Object areaCity(Integer parentId,Model model) {
+ List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", parentId));
+ model.addAttribute("list",tRegions);
+ return tRegions;
}
--
Gitblit v1.7.1