From 6a7e21412dc71e400d7d63cc27f2ff692c10d0a6 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Wed, 10 Jul 2024 10:45:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BA=A6=E5=88=B0=E5=BA=97?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E9=A2=84=E7=BA=A6=E9=A1=B9=E7=9B=AE=EF=BC=8C?= =?UTF-8?q?=E6=88=90=E4=B8=BA=E4=BB=A3=E7=90=86=E5=95=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/AppArtificerController.java | 9 +++ .../modules/artificer/dao/MassageTypeDao.java | 2 + .../artificer/service/MassageTypeService.java | 2 + .../service/impl/MassageTypeServiceImpl.java | 6 ++ .../app/AppConsortiaController.java | 6 ++ .../dlssqjl/controller/DlssqjlController.java | 59 ++++++++++++++++++ .../controller/app/AppDlssqjlController.java | 59 ++++++++++++++++++ .../sqx/modules/dlssqjl/dao/DlssqjlDao.java | 15 +++++ .../sqx/modules/dlssqjl/entity/Dlssqjl.java | 41 +++++++++++++ .../dlssqjl/service/DlssqjlService.java | 12 ++++ .../service/impl/DlssqjlServiceImpl.java | 60 +++++++++++++++++++ .../mapper/artificer/ArtificerDao.xml | 2 +- .../mapper/artificer/MassageTypeDao.xml | 46 ++++++++++++++ .../mapper/bl/massage/MassagePackageDao.xml | 3 + .../resources/mapper/dlssqjl/DlssqjlDao.xml | 19 ++++++ 15 files changed, 340 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/sqx/modules/dlssqjl/controller/DlssqjlController.java create mode 100644 src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java create mode 100644 src/main/java/com/sqx/modules/dlssqjl/dao/DlssqjlDao.java create mode 100644 src/main/java/com/sqx/modules/dlssqjl/entity/Dlssqjl.java create mode 100644 src/main/java/com/sqx/modules/dlssqjl/service/DlssqjlService.java create mode 100644 src/main/java/com/sqx/modules/dlssqjl/service/impl/DlssqjlServiceImpl.java create mode 100644 src/main/resources/mapper/dlssqjl/DlssqjlDao.xml 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 c91feee..4d87f43 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 @@ -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){ diff --git a/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java b/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java index 5b6f1cd..f73ccd2 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/MassageTypeDao.java @@ -22,4 +22,6 @@ public interface MassageTypeDao extends BaseMapper { List 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 selectMassageTypeChildrenPage(Page pages, Integer status, String city, Integer sort, Integer authentication, Integer by, String title, Long artificerId, Long parentId, Long classifyId); + + IPage selectMassageTypeQyPage(Page pages, String city, String title); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/MassageTypeService.java b/src/main/java/com/sqx/modules/artificer/service/MassageTypeService.java index f0e8481..a24d72a 100644 --- a/src/main/java/com/sqx/modules/artificer/service/MassageTypeService.java +++ b/src/main/java/com/sqx/modules/artificer/service/MassageTypeService.java @@ -17,4 +17,6 @@ public interface MassageTypeService extends IService { 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); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/MassageTypeServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/MassageTypeServiceImpl.java index 43453fd..73006e5 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/MassageTypeServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/MassageTypeServiceImpl.java @@ -72,4 +72,10 @@ public class MassageTypeServiceImpl extends ServiceImpl pages=new Page<>(page,limit); + return Result.success().put("data",new PageUtils(baseMapper.selectMassageTypeQyPage(pages,city,title))); + } + } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/consortia/controller/app/AppConsortiaController.java b/src/main/java/com/sqx/modules/consortia/controller/app/AppConsortiaController.java index f1237cc..37e85b5 100644 --- a/src/main/java/com/sqx/modules/consortia/controller/app/AppConsortiaController.java +++ b/src/main/java/com/sqx/modules/consortia/controller/app/AppConsortiaController.java @@ -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); + } } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/dlssqjl/controller/DlssqjlController.java b/src/main/java/com/sqx/modules/dlssqjl/controller/DlssqjlController.java new file mode 100644 index 0000000..bcedec6 --- /dev/null +++ b/src/main/java/com/sqx/modules/dlssqjl/controller/DlssqjlController.java @@ -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)); + } + +} diff --git a/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java b/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java new file mode 100644 index 0000000..b51a068 --- /dev/null +++ b/src/main/java/com/sqx/modules/dlssqjl/controller/app/AppDlssqjlController.java @@ -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)); + } + +} diff --git a/src/main/java/com/sqx/modules/dlssqjl/dao/DlssqjlDao.java b/src/main/java/com/sqx/modules/dlssqjl/dao/DlssqjlDao.java new file mode 100644 index 0000000..fa0d688 --- /dev/null +++ b/src/main/java/com/sqx/modules/dlssqjl/dao/DlssqjlDao.java @@ -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 { + + IPage selectDlssqjlPage(Page pages, String name, String phone); +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/dlssqjl/entity/Dlssqjl.java b/src/main/java/com/sqx/modules/dlssqjl/entity/Dlssqjl.java new file mode 100644 index 0000000..80573b1 --- /dev/null +++ b/src/main/java/com/sqx/modules/dlssqjl/entity/Dlssqjl.java @@ -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; + + +} diff --git a/src/main/java/com/sqx/modules/dlssqjl/service/DlssqjlService.java b/src/main/java/com/sqx/modules/dlssqjl/service/DlssqjlService.java new file mode 100644 index 0000000..4116b86 --- /dev/null +++ b/src/main/java/com/sqx/modules/dlssqjl/service/DlssqjlService.java @@ -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 { + + Result selectDlssqjlPage(Integer page, Integer limit, String name, String phone); +} \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/dlssqjl/service/impl/DlssqjlServiceImpl.java b/src/main/java/com/sqx/modules/dlssqjl/service/impl/DlssqjlServiceImpl.java new file mode 100644 index 0000000..62f65f7 --- /dev/null +++ b/src/main/java/com/sqx/modules/dlssqjl/service/impl/DlssqjlServiceImpl.java @@ -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 implements DlssqjlService { + + + @Override + public Result selectDlssqjlPage(Integer page, Integer limit, String name, String phone) { + Page pages=new Page<>(page,limit); + IPage dlssqjlIPage = baseMapper.selectDlssqjlPage(pages, name, phone); + return Result.success().put("data",new PageUtils(dlssqjlIPage)); + } +} \ No newline at end of file diff --git a/src/main/resources/mapper/artificer/ArtificerDao.xml b/src/main/resources/mapper/artificer/ArtificerDao.xml index b757d40..9e2bc05 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -184,7 +184,7 @@ + + + diff --git a/src/main/resources/mapper/dlssqjl/DlssqjlDao.xml b/src/main/resources/mapper/dlssqjl/DlssqjlDao.xml new file mode 100644 index 0000000..d3249cb --- /dev/null +++ b/src/main/resources/mapper/dlssqjl/DlssqjlDao.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file