添加约到店列表接口,查询企业预约项目,成为代理商接口
This commit is contained in:
parent
2a44b33edc
commit
6a7e21412d
|
@ -98,6 +98,15 @@ public class AppArtificerController {
|
|||
public Result selectMassageTypePage(Integer page,Integer limit,Integer status,Integer sort,String city,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId){
|
||||
return massageTypeService.selectMassageTypePage(page, limit, status, city, sort,authentication,by,title,artificerId,userId,parentId,classifyId);
|
||||
}
|
||||
|
||||
|
||||
|
||||
@GetMapping("/selectMassageTypeQyPage")
|
||||
@ApiOperation("查询按摩分类(分页)")
|
||||
public Result selectMassageTypeQyPage(Integer page,Integer limit,String city,String title){
|
||||
return massageTypeService.selectMassageTypeQyPage(page, limit,city,title);
|
||||
}
|
||||
|
||||
@GetMapping("/selectMassageTypeChildrenPage")
|
||||
@ApiOperation("查询按摩分类子项目(分页)")
|
||||
public Result selectMassageTypeChildrenPage(Integer page,Integer limit,Integer status,Integer sort,String city,Integer authentication,Integer by,String title,Long artificerId,Long userId,Long parentId,Long classifyId){
|
||||
|
|
|
@ -22,4 +22,6 @@ public interface MassageTypeDao extends BaseMapper<MassageType> {
|
|||
List<MassageType> selectMassageTypeList(@Param("status") Integer status,@Param("city") String city,@Param("sort") Integer sort,@Param("authentication") Integer authentication,@Param("by")Integer by,@Param("title") String title,@Param("artificerId") Long artificerId,@Param("parentId") Long parentId,@Param("classifyId") Long classifyId);
|
||||
|
||||
IPage<MassageType> selectMassageTypeChildrenPage(Page<MassageType> pages, Integer status, String city, Integer sort, Integer authentication, Integer by, String title, Long artificerId, Long parentId, Long classifyId);
|
||||
|
||||
IPage<?> selectMassageTypeQyPage(Page<MassageType> pages, String city, String title);
|
||||
}
|
|
@ -17,4 +17,6 @@ public interface MassageTypeService extends IService<MassageType> {
|
|||
Result selectMassageTypeChildrenPage(Integer page, Integer limit, Integer status, String city, Integer sort, Integer authentication, Integer by, String title, Long artificerId, Long userId, Long parentId, Long classifyId);
|
||||
|
||||
Result selectMassageTypeById(Long massageTypeId,Long userId);
|
||||
|
||||
Result selectMassageTypeQyPage(Integer page, Integer limit, String city, String title);
|
||||
}
|
|
@ -72,4 +72,10 @@ public class MassageTypeServiceImpl extends ServiceImpl<MassageTypeDao, MassageT
|
|||
return Result.success().put("data",massageType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Result selectMassageTypeQyPage(Integer page, Integer limit, String city, String title) {
|
||||
Page<MassageType> pages=new Page<>(page,limit);
|
||||
return Result.success().put("data",new PageUtils(baseMapper.selectMassageTypeQyPage(pages,city,title)));
|
||||
}
|
||||
|
||||
}
|
|
@ -39,4 +39,10 @@ public class AppConsortiaController extends AbstractController {
|
|||
return consortiaService.selectConsortiaMoney(shopId, flag, time);
|
||||
}
|
||||
|
||||
@Login
|
||||
@GetMapping("/selectConsortiaList")
|
||||
@ApiOperation("查询店铺信息")
|
||||
public Result selectConsortiaList(Integer page,Integer limit,String consortiaName,String userName,String phone){
|
||||
return consortiaService.selectConsortiaList(page, limit, consortiaName,userName,phone);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,59 @@
|
|||
package com.sqx.modules.dlssqjl.controller;
|
||||
|
||||
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.dlssqjl.entity.Dlssqjl;
|
||||
import com.sqx.modules.dlssqjl.service.DlssqjlService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/dlssqjl")
|
||||
@Api(value = "代理商申请信息", tags = {"代理商申请信息"})
|
||||
public class DlssqjlController {
|
||||
|
||||
@Autowired
|
||||
private DlssqjlService dlssqjlService;
|
||||
|
||||
@PostMapping("/insertDlssqjl")
|
||||
@ApiOperation("添加代理商")
|
||||
public Result insertDlssqjl(@RequestBody Dlssqjl dlssqjl){
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
dlssqjl.setCreateTime(new Date());
|
||||
dlssqjlService.save(dlssqjl);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@PostMapping("/updateDlssqjl")
|
||||
@ApiOperation("修改代理商")
|
||||
public Result updateDlssqjl(@RequestBody Dlssqjl dlssqjl){
|
||||
dlssqjlService.updateById(dlssqjl);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@PostMapping("/deleteDlssqjl")
|
||||
@ApiOperation("删除代理商")
|
||||
public Result deleteDlssqjl(Long DlssqjlId){
|
||||
dlssqjlService.removeById(DlssqjlId);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/selectDlssqjlPage")
|
||||
@ApiOperation("查询代理商(分页)")
|
||||
public Result selectDlssqjlPage(Integer page,Integer limit,String name,String phone){
|
||||
return dlssqjlService.selectDlssqjlPage(page, limit,name,phone);
|
||||
}
|
||||
|
||||
@GetMapping("/selectDlssqjlById")
|
||||
@ApiOperation("查询详情")
|
||||
public Result selectDlssqjlById(Long DlssqjlId){
|
||||
return Result.success().put("data",dlssqjlService.getById(DlssqjlId));
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,59 @@
|
|||
package com.sqx.modules.dlssqjl.controller.app;
|
||||
|
||||
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.dlssqjl.entity.Dlssqjl;
|
||||
import com.sqx.modules.dlssqjl.service.DlssqjlService;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
@RestController
|
||||
@RequestMapping("/app/dlssqjl")
|
||||
@Api(value = "代理商申请信息", tags = {"代理商申请信息"})
|
||||
public class AppDlssqjlController {
|
||||
|
||||
@Autowired
|
||||
private DlssqjlService dlssqjlService;
|
||||
|
||||
@PostMapping("/insertDlssqjl")
|
||||
@ApiOperation("添加代理商")
|
||||
public Result insertDlssqjl(@RequestBody Dlssqjl dlssqjl){
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
||||
dlssqjl.setCreateTime(new Date());
|
||||
dlssqjlService.save(dlssqjl);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@PostMapping("/updateDlssqjl")
|
||||
@ApiOperation("修改代理商")
|
||||
public Result updateDlssqjl(@RequestBody Dlssqjl dlssqjl){
|
||||
dlssqjlService.updateById(dlssqjl);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
@PostMapping("/deleteDlssqjl")
|
||||
@ApiOperation("删除代理商")
|
||||
public Result deleteDlssqjl(Long DlssqjlId){
|
||||
dlssqjlService.removeById(DlssqjlId);
|
||||
return Result.success();
|
||||
}
|
||||
|
||||
|
||||
@GetMapping("/selectDlssqjlPage")
|
||||
@ApiOperation("查询代理商(分页)")
|
||||
public Result selectDlssqjlPage(Integer page,Integer limit,String name,String phone){
|
||||
return dlssqjlService.selectDlssqjlPage(page, limit,name,phone);
|
||||
}
|
||||
|
||||
@GetMapping("/selectDlssqjlById")
|
||||
@ApiOperation("查询详情")
|
||||
public Result selectDlssqjlById(Long DlssqjlId){
|
||||
return Result.success().put("data",dlssqjlService.getById(DlssqjlId));
|
||||
}
|
||||
|
||||
}
|
|
@ -0,0 +1,15 @@
|
|||
package com.sqx.modules.dlssqjl.dao;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.sqx.modules.dlssqjl.entity.Dlssqjl;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
|
||||
@Mapper
|
||||
public interface DlssqjlDao extends BaseMapper<Dlssqjl> {
|
||||
|
||||
IPage<Dlssqjl> selectDlssqjlPage(Page<Dlssqjl> pages, String name, String phone);
|
||||
}
|
|
@ -0,0 +1,41 @@
|
|||
package com.sqx.modules.dlssqjl.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import lombok.Data;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @description artificer
|
||||
* @author fang
|
||||
* @date 2021-12-18
|
||||
*/
|
||||
@Data
|
||||
@TableName("bl_dls_sqjl")
|
||||
public class Dlssqjl implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@TableId(type = IdType.AUTO)
|
||||
private Long id;
|
||||
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
private String name;
|
||||
private String phone;
|
||||
private String remark;
|
||||
private String queone;
|
||||
private String quetwo;
|
||||
private String quethree;
|
||||
private String queforu;
|
||||
|
||||
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
package com.sqx.modules.dlssqjl.service;
|
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.modules.dlssqjl.entity.Dlssqjl;
|
||||
|
||||
|
||||
public interface DlssqjlService extends IService<Dlssqjl> {
|
||||
|
||||
Result selectDlssqjlPage(Integer page, Integer limit, String name, String phone);
|
||||
}
|
|
@ -0,0 +1,60 @@
|
|||
package com.sqx.modules.dlssqjl.service.impl;
|
||||
|
||||
import cn.hutool.core.date.DateTime;
|
||||
import cn.hutool.core.date.DateUtil;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
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;
|
||||
import com.google.common.collect.Maps;
|
||||
import com.sqx.common.utils.PageUtils;
|
||||
import com.sqx.common.utils.Result;
|
||||
import com.sqx.face.FaceMain;
|
||||
import com.sqx.map.CommonMapUtils;
|
||||
import com.sqx.modules.app.entity.UserMoney;
|
||||
import com.sqx.modules.app.service.UserMoneyService;
|
||||
import com.sqx.modules.artificer.dao.ArtificerDao;
|
||||
import com.sqx.modules.artificer.dao.OrdersDao;
|
||||
import com.sqx.modules.artificer.dao.UserRechargeDao;
|
||||
import com.sqx.modules.artificer.entity.*;
|
||||
import com.sqx.modules.artificer.service.ArtificerService;
|
||||
import com.sqx.modules.artificer.service.ArtificerTimeService;
|
||||
import com.sqx.modules.artificer.service.CollectArtificerService;
|
||||
import com.sqx.modules.common.dao.CommonInfoDao;
|
||||
import com.sqx.modules.common.service.CommonInfoService;
|
||||
import com.sqx.modules.dlssqjl.dao.DlssqjlDao;
|
||||
import com.sqx.modules.dlssqjl.entity.Dlssqjl;
|
||||
import com.sqx.modules.dlssqjl.service.DlssqjlService;
|
||||
import com.sqx.modules.message.entity.MessageInfo;
|
||||
import com.sqx.modules.message.service.MessageService;
|
||||
import com.sqx.modules.pay.dao.CashOutDao;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.math.RoundingMode;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import static com.sqx.modules.utils.PeriodUtil.calculationPeriod;
|
||||
|
||||
|
||||
@Service
|
||||
public class DlssqjlServiceImpl extends ServiceImpl<DlssqjlDao, Dlssqjl> implements DlssqjlService {
|
||||
|
||||
|
||||
@Override
|
||||
public Result selectDlssqjlPage(Integer page, Integer limit, String name, String phone) {
|
||||
Page<Dlssqjl> pages=new Page<>(page,limit);
|
||||
IPage<Dlssqjl> dlssqjlIPage = baseMapper.selectDlssqjlPage(pages, name, phone);
|
||||
return Result.success().put("data",new PageUtils(dlssqjlIPage));
|
||||
}
|
||||
}
|
|
@ -184,7 +184,7 @@
|
|||
</select>
|
||||
|
||||
<select id="getHomeStartArtificerList" resultType="com.sqx.modules.artificer.entity.Artificer">
|
||||
select a.artificer_id,artificer_name,artificer_img,s.code as classifyName,a.content,v.vip_name as technicianTypeName,a.city
|
||||
select a.artificer_id,artificer_name,artificer_img,s.code as classifyName,a.content,v.vip_name as technicianTypeName,a.city,a.bdxsl
|
||||
from artificer a
|
||||
inner join tb_user u on a.user_id=u.user_id
|
||||
inner join sys_dict s on s.id=a.classify_id
|
||||
|
|
|
@ -59,6 +59,52 @@
|
|||
order by massageScore desc
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="selectMassageTypeQyPage" resultType="com.sqx.modules.artificer.entity.MassageType">
|
||||
select * from (
|
||||
select m.*,s.code as classifyName,
|
||||
(select ifnull(avg(c.score),0.00) from taking_commnt c where c.artificer_id in (select a.artificer_id from artificer_massage a
|
||||
where a.massage_type_id=m.massage_type_id
|
||||
)) as massageScore
|
||||
from massage_type m
|
||||
left join sys_dict s on s.id=m.classify_id
|
||||
where 1=1 and qy_type = 1
|
||||
<if test="artificerId!=null">
|
||||
and m.massage_type_id not in (select massage_type_id from artificer_massage where artificer_id=#{artificerId})
|
||||
</if>
|
||||
<if test="status!=null and status!=0">
|
||||
and m.status=#{status}
|
||||
</if>
|
||||
<if test="parentId==null or parentId==0">
|
||||
and (m.parent_id is null or m.parent_id=0)
|
||||
</if>
|
||||
<if test="parentId!=null and parentId!=0">
|
||||
and m.parent_id=#{parentId}
|
||||
</if>
|
||||
<if test="classifyId!=null and classifyId!=0">
|
||||
and m.classify_id=#{classifyId}
|
||||
</if>
|
||||
<if test="city!=null and city!=''">
|
||||
and (m.city like concat('%',#{city},'%') or m.city='不限')
|
||||
</if>
|
||||
<if test="title!=null and title!=''">
|
||||
and m.title like concat('%',#{title},'%')
|
||||
</if>
|
||||
) a
|
||||
<if test="by!=null and by==1">
|
||||
order by price desc
|
||||
</if>
|
||||
<if test="by!=null and by==2">
|
||||
order by price asc
|
||||
</if>
|
||||
<if test="by!=null and by==3">
|
||||
order by sales desc
|
||||
</if>
|
||||
<if test="by!=null and by==4">
|
||||
order by massageScore desc
|
||||
</if>
|
||||
</select>
|
||||
|
||||
<select id="selectMassageTypeChildrenPage" resultType="com.sqx.modules.artificer.entity.MassageType">
|
||||
select * from (
|
||||
select m.*,s.code as classifyName,
|
||||
|
|
|
@ -27,6 +27,9 @@
|
|||
<if test="params.title!=null and params.title!=''">
|
||||
and m.title like concat('%',#{params.title},'%')
|
||||
</if>
|
||||
<if test="params.qyType!=null and params.qyType!=''">
|
||||
and m.qy_type like concat('%',#{params.qyType},'%')
|
||||
</if>
|
||||
order by type asc,id desc
|
||||
</select>
|
||||
|
||||
|
|
|
@ -0,0 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
|
||||
<mapper namespace="com.sqx.modules.dlssqjl.dao.DlssqjlDao">
|
||||
|
||||
<select id="selectDlssqjlPage" resultType="com.sqx.modules.dlssqjl.entity.Dlssqjl">
|
||||
select * from bl_dls_sqjl
|
||||
<where>
|
||||
<if test="name!=null and name!=''">
|
||||
and name like concat('%',#{name},'%')
|
||||
</if>
|
||||
<if test="phone!=null and phone!=''">
|
||||
and phone like concat('%',#{phone},'%')
|
||||
</if>
|
||||
</where>
|
||||
order by create_time desc
|
||||
</select>
|
||||
|
||||
</mapper>
|
Loading…
Reference in New Issue