chuangte/electripper-v2
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

客服等

Browse Source
This commit is contained in:
磷叶 2025-04-27 18:08:33 +08:00
parent d1a67d6f37
commit 16477eefe3
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-service/src/main/java/com/ruoyi/bst/area/mapper/AreaMapper.xml
View File

@ -93,6 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="query.keyword != null and query.keyword != ''">
and (
ba.name like concat('%', #{query.keyword}, '%')
or su.nick_name like concat('%', #{query.keyword}, '%')
)
</if>
<if test="query.radius != null and query.center != null and query.center.size() >= 2">

2
ruoyi-service/src/main/java/com/ruoyi/bst/customerService/domain/dto/AppCustomerQuery.java → ruoyi-service/src/main/java/com/ruoyi/bst/customerService/domain/dto/CustomerServiceIndexQuery.java
View File

@ -10,7 +10,7 @@ import lombok.Data;
* 小程序客服查询
*/
@Data
public class AppCustomerQuery {
public class CustomerServiceIndexQuery {
@ApiModelProperty("中心点经纬度")
private List<BigDecimal> center;

32
ruoyi-web/src/main/java/com/ruoyi/web/app/AppCustomerServiceController.java
View File

@ -1,8 +1,5 @@
package com.ruoyi.web.app;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -12,16 +9,18 @@ import com.ruoyi.bst.area.domain.AreaQuery;
import com.ruoyi.bst.area.domain.AreaVO;
import com.ruoyi.bst.area.service.AreaService;
import com.ruoyi.bst.customerService.domain.CustomerServiceQuery;
import com.ruoyi.bst.customerService.domain.CustomerServiceVO;
import com.ruoyi.bst.customerService.domain.dto.AppCustomerQuery;
import com.ruoyi.bst.customerService.domain.dto.CustomerServiceIndexQuery;
import com.ruoyi.bst.customerService.service.CustomerServiceService;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.vo.UserVO;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.system.user.service.UserService;
import io.swagger.annotations.ApiOperation;
@RestController
@RequestMapping("/app/customerService")
public class AppCustomerServiceController extends BaseController {
@ -37,12 +36,19 @@ public class AppCustomerServiceController extends BaseController {
private AreaService areaService;
@ApiOperation("获取客服列表")
@Anonymous
@GetMapping("/list")
public AjaxResult list(AppCustomerQuery query) {
public TableDataInfo list(CustomerServiceQuery query) {
startPage();
return getDataTable(customerServiceService.selectCustomerServiceList(query));
}
@ApiOperation("首页客服")
@Anonymous
@GetMapping("/indexList")
public AjaxResult indexList(CustomerServiceIndexQuery query) {
AjaxResult ajax = AjaxResult.success();
// 售后客服
UserVO user = userService.selectUserById(getUserId());
Long areaId = user.getAreaId();
@ -60,14 +66,16 @@ public class AppCustomerServiceController extends BaseController {
areaQuery.setRadius(query.getRadius());
areaQuery.setId(user.getAreaId());
AreaVO area = areaService.selectNearBy(areaQuery);
// 查询运营区客服
CustomerServiceQuery beforeQuery = new CustomerServiceQuery();
beforeQuery.setAreaId(area.getId());
ajax.put("before", customerServiceService.selectCustomerServiceList(beforeQuery));
if (area != null) {
// 查询运营区客服
CustomerServiceQuery beforeQuery = new CustomerServiceQuery();
beforeQuery.setAreaId(area.getId());
ajax.put("before", customerServiceService.selectCustomerServiceList(beforeQuery));
}
}
return ajax;
}
}