From 478a08160e34dbcb002fa248730b6d41523a0948 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 5 Aug 2024 20:42:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/service/impl/UserServiceImpl.java | 5 ++++- .../controller/app/AppArtificerController.java | 2 +- .../service/impl/ArtificerServiceImpl.java | 13 +++++++++++++ .../controller/app/AppMessageController.java | 2 +- .../resources/mapper/artificer/ArtificerDao.xml | 4 +--- .../mapper/artificer/CollectArtificerDao.xml | 3 ++- 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java index 5a29cd5..c3df9a9 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java @@ -816,7 +816,7 @@ public class UserServiceImpl extends ServiceImpl implements req.setTemplateId(commonInfoService.findOne(404).getValue()); break; case "qtsx": - req.setTemplateId(commonInfoService.findOne(405).getValue()); + req.setTemplateId(commonInfoService.findOne(453).getValue()); break; case "touSu": req.setTemplateId(commonInfoService.findOne(453).getValue()); @@ -840,6 +840,9 @@ public class UserServiceImpl extends ServiceImpl implements case "touSu": req.setTemplateParamSet(null); break; + case "qtsx": + req.setTemplateParamSet(null); + break; default: req.setTemplateId(commonInfoService.findOne(399).getValue()); break; diff --git a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java index deaaa19..ed13ae2 100644 --- a/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java +++ b/src/main/java/com/sqx/modules/artificer/controller/app/AppArtificerController.java @@ -139,7 +139,7 @@ public class AppArtificerController { String longitude,String latitude,Integer sort,Integer authentication, Integer by,String city,Long classifyId,String phone, Integer isStart,Integer technicianType,String isBack){ return artificerService.selectArtificerList(page, limit, massageTypeId, artificerName,longitude,latitude, - sort,authentication,by,-1,city,classifyId,phone,1,isStart,technicianType,isBack); + sort,authentication,by,1,city,classifyId,phone,1,isStart,technicianType,isBack); } 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 66780d9..4c9fe1f 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 @@ -77,6 +77,19 @@ public class ArtificerServiceImpl extends ServiceImpl i String longitude,String latitude,Integer sort,Integer authentication, Integer by,Integer status,String city,Long classifyId,String phone,Integer user, Integer isStart,Integer technicianType,String isBack){ Page pages=new Page<>(page,limit); + + if(StringUtils.isEmpty(longitude)){ + longitude = "125.430896"; + } + if(StringUtils.isEmpty(latitude)){ + latitude = "43.880798"; + } + if(StringUtils.isEmpty(city)||StringUtils.equals("请选择城市",city)){ + city = "长春市"; + } + + + IPage artificerIPage = baseMapper.selectArtificerList(pages, massageTypeId, artificerName, longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType,isBack); List records = artificerIPage.getRecords(); diff --git a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java index 6548b28..422feea 100644 --- a/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java +++ b/src/main/java/com/sqx/modules/message/controller/app/AppMessageController.java @@ -132,7 +132,7 @@ public class AppMessageController { if (StringUtils.isNotEmpty(artificerUser.getPhone())) { - userService.sendMsg(userEntity.getPhone(), "qtsx"); + userService.sendMsg(artificerUser.getPhone(), "qtsx"); } diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index 5da717c..1a5408b 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -48,9 +48,7 @@ and a.longitude is not null and a.latitude is not null ) b - - where distance <= 5000 - + order by diff --git a/src/main/resources/mapper/artificer/CollectArtificerDao.xml b/src/main/resources/mapper/artificer/CollectArtificerDao.xml index f20ab98..d5b5157 100644 --- a/src/main/resources/mapper/artificer/CollectArtificerDao.xml +++ b/src/main/resources/mapper/artificer/CollectArtificerDao.xml @@ -8,9 +8,10 @@ ifnull((select avg(c.score) from taking_commnt c where c.artificer_id=a.artificer_id ),0.00) as ordersScore, (select count(*) from collect_artificer o where o.artificer_id=a.artificer_id and classify=1) as collectCount, (select count(*) from taking_commnt c where c.artificer_id=a.artificer_id ) as commentCount, - (st_distance (point (a.longitude, a.latitude),point(#{longitude},#{latitude}) ) *111195) as distance + (st_distance (point (a.longitude, a.latitude),point(#{longitude},#{latitude}) ) *111195) as distance,c.consortia_name from artificer a left join tb_user u on u.user_id=a.user_id + left join consortia c on u.consortia_id = c.consortia_id where a.artificer_id in (select artificer_id from collect_artificer where user_id=#{userId} and classify=1) order by a.create_time desc