From 247af4b65cfa8fd4e4bde9473ae58cfcd9fe1ec8 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 15 Jul 2024 22:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E8=A1=8C=E6=A6=9C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArtificerController.java | 7 + .../modules/artificer/dao/ArtificerDao.java | 8 + .../artificer/service/ArtificerService.java | 2 + .../service/impl/ArtificerServiceImpl.java | 25 ++- .../mapper/artificer/ArtificerDao.xml | 179 ++++++++++++++++++ 5 files changed, 218 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java index c35f3d5..b95c8b2 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/ArtificerController.java @@ -450,6 +450,13 @@ public class ArtificerController { } + @GetMapping("/selectArtificerPhbList") + @ApiOperation("排行榜(在线时长+业绩++加钟率+充值率)") + public Result selectArtificerPhbList(Integer page,Integer limit,String startTime,String endTime,String type){ + return artificerService.selectArtificerPhbList(page, limit, startTime, endTime, type); + } + + @GetMapping("/selectArtificerOrdersList") @ApiOperation("查询进行中的技师订单") public Result selectArtificerOrdersList(Integer page,Integer limit,String artificerName, diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java index 21cf352..318f0b3 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java @@ -47,4 +47,12 @@ public interface ArtificerDao extends BaseMapper { List selectInlineList(Artificer artificer); Artificer selectByPhone(@Param("phone")String mobile); + + IPage> getZxscList(Page objectPage,@Param("startTime") String startTime, @Param("endTime") String endTime); + + IPage> getYejiList(Page objectPage,@Param("startTime") String startTime, @Param("endTime") String endTime); + + IPage> getJzlList(Page objectPage, String startTime, String endTime); + + IPage> getCzlList(Page objectPage, String startTime, String endTime); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java index f916876..91621ae 100644 --- a/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerService.java @@ -47,4 +47,6 @@ public interface ArtificerService extends IService { Result updateShz(Artificer artificer); Artificer selectByPhone(String mobile); + + Result selectArtificerPhbList(Integer page, Integer limit, String startTime, String endTime, String type); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java index 748c2cb..39ca0c6 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java @@ -3,12 +3,12 @@ package com.sqx.modules.artificer.service.impl; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; +import com.alibaba.druid.util.StringUtils; import com.alibaba.fastjson.JSONObject; import com.baidu.aip.face.AipFace; import com.baidu.aip.face.MatchRequest; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.google.common.collect.Lists; @@ -516,7 +516,7 @@ public class ArtificerServiceImpl extends ServiceImpl i messageService.saveBody(messageInfo); artificer.setLatitude(latitude); artificer.setLongitude(longitude); - if(StringUtils.isNotEmpty(latitude) && StringUtils.isNotEmpty(longitude)){ + if(!StringUtils.isEmpty(latitude) && !StringUtils.isEmpty(longitude)){ JSONObject adInfo = CommonMapUtils.getLocationToAdInfo(messageInfo.getTypeId(), messageInfo.getTypeName()); String cityName = adInfo.getString("city"); artificer.setCity(cityName); @@ -781,7 +781,7 @@ public class ArtificerServiceImpl extends ServiceImpl i if(artificer.getArtificerId()!=null){ try { - if(StringUtils.isNotEmpty(artificer.getLifePhoto())){ + if(!StringUtils.isEmpty(artificer.getLifePhoto())){ String lifePhoto = artificer.getLifePhoto();//生活照 if(artificer.getLifePhoto().indexOf(",")>-1){ lifePhoto = artificer.getLifePhoto().split(",")[0]; @@ -835,6 +835,25 @@ public class ArtificerServiceImpl extends ServiceImpl i return baseMapper.selectByPhone(mobile); } + @Override + public Result selectArtificerPhbList(Integer page, Integer limit, String startTime, String endTime, String type) { + IPage> pageList = null; + if(!StringUtils.isEmpty(endTime)){ + endTime = endTime+" 23:59:59"; + } + if(StringUtils.equals(type,"1")){//在线时长 + pageList = baseMapper.getZxscList(new Page<>(page,limit),startTime,endTime); + }else if(StringUtils.equals(type,"2")){//业绩 + pageList = baseMapper.getYejiList(new Page<>(page,limit),startTime,endTime); + }else if(StringUtils.equals(type,"3")){//加钟率 + pageList = baseMapper.getJzlList(new Page<>(page,limit),startTime,endTime); + }else if(StringUtils.equals(type,"4")){//充值率 + pageList = baseMapper.getCzlList(new Page<>(page,limit),startTime,endTime); + + } + return Result.success().put("data",pageList); + } + // public static void main(String[] args) { // String lifePhoto = "http://1.92.152.160/file/uploadPath/2024/07/09/a892623c518812421cec310d3d5e8d0a.jpg"; // String artificerImg = "https://sausers.blxinchuang.com/file/uploadPath/2024/07/03/423843a244c16b04819a131c2160c0af.png"; diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index 5849979..def60cf 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -227,4 +227,183 @@ inner join tb_user u on a.user_id=u.user_id where u.phone = #{phone} + + + + + + + + + + + + \ No newline at end of file