附近技师
This commit is contained in:
parent
e33b364d47
commit
397f1fccab
|
@ -662,7 +662,7 @@ public class ArtificerServiceImpl extends ServiceImpl<ArtificerDao, Artificer> i
|
|||
public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){
|
||||
Map<String, Object> map = new HashMap<String, Object>();
|
||||
Page<Artificer> pages=new Page<>(page,limit);
|
||||
IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,isStart,null);
|
||||
IPage<Artificer> artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null);
|
||||
map.put("nearData",new PageUtils(artificerIPage));
|
||||
map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city)));
|
||||
return Result.success(map);
|
||||
|
|
|
@ -799,7 +799,7 @@
|
|||
<if test="type==5">
|
||||
and date_format(o.serve_time,'%Y-%m-%d') = date_format(now(),'%Y-%m-%d') and o.status=2
|
||||
</if>
|
||||
order by serve_time desc
|
||||
order by serve_time desc, orders_id desc
|
||||
</select>
|
||||
|
||||
<select id="selectDividedIntoDetails" resultType="com.sqx.modules.artificer.entity.Orders">
|
||||
|
@ -1561,21 +1561,6 @@
|
|||
</select>
|
||||
|
||||
<select id="getChongzhiList" resultType="com.sqx.modules.artificer.entity.Orders">
|
||||
<!-- select-->
|
||||
<!-- o.*,uu.user_recharge as userRecharge,b.massage_img-->
|
||||
<!-- from orders o-->
|
||||
<!-- left join artificer a on a.artificer_id=o.artificer_id-->
|
||||
<!-- left join user_recharge uu on uu.orders_id = o.orders_id-->
|
||||
<!-- left join massage_type b on o.massage_type_id = b.massage_type_id-->
|
||||
<!-- where o.artificer_id=#{userId} and o.parent_id = 0-->
|
||||
<!-- and o.status in (3,5,15)-->
|
||||
<!-- and o.end_times BETWEEN #{startTime} and #{endTime}-->
|
||||
<!-- <if test="isSfwc != null and isSfwc == 0">-->
|
||||
<!-- and uu.type is null-->
|
||||
<!-- </if>-->
|
||||
<!-- <if test="isSfwc != null and isSfwc == 1">-->
|
||||
<!-- and uu.type = 2-->
|
||||
<!-- </if>-->
|
||||
select o.*,
|
||||
(case when o.user_package_detail_id is null then m.title else bl.title end ) as title,
|
||||
(case when o.user_package_detail_id is null then m.massage_img else bl.massage_img end ) as massageImg,
|
||||
|
|
Loading…
Reference in New Issue