修改bug

src/main/java/com/sqx/modules/app/service/impl/UserServiceImpl.java

@@ -816,7 +816,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> 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<UserDao, UserEntity> implements
                 case "touSu":
                     req.setTemplateParamSet(null);
                     break;
+                case "qtsx":
+                    req.setTemplateParamSet(null);
+                    break;
                 default:
                     req.setTemplateId(commonInfoService.findOne(399).getValue());
                     break;

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);
     }
 
 

src/main/java/com/sqx/modules/artificer/service/impl/ArtificerServiceImpl.java

@@ -77,6 +77,19 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> 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<Artificer> 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<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, massageTypeId, artificerName,
                 longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType,isBack);
         List<Artificer> records = artificerIPage.getRecords();

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");
         }
 
 

src/main/resources/mapper/artificer/ArtificerDao.xml

@@ -48,9 +48,7 @@
             and a.longitude is not null and a.latitude is not null
         </if>
         ) b
-        <if test="isBack==null or isBack==''">
+
-            where distance &lt;= 5000
-        </if>
         <if test="by!=null and by==1">
             order by
             <if test="status!=null and status==-1">

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