From d7ecfab561a81379acf0490aa7b2bbde4c746f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 15 Aug 2024 15:28:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E5=88=97=E8=A1=A8=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=AD=9B=E9=80=89=EF=BC=8C=E6=9C=AA=E6=94=AF=E4=BB=98?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../artificer/dao/ArtificerClassifyDao.java | 3 +++ .../modules/artificer/dao/ArtificerDao.java | 2 +- .../service/ArtificerClassifyService.java | 4 +++- .../impl/ArtificerClassifyServiceImpl.java | 7 ++++++ .../service/impl/ArtificerServiceImpl.java | 22 +++++++++++++++++-- .../service/impl/OrdersServiceImpl.java | 14 ++++++++++-- .../mapper/artificer/ArtificerClassifyDao.xml | 15 +++++++++++++ .../mapper/artificer/ArtificerDao.xml | 10 +++++++-- 8 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/mapper/artificer/ArtificerClassifyDao.xml diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java index 8a3f568..ec917e1 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerClassifyDao.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sqx.modules.artificer.entity.ArtificerClassify; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + @Mapper public interface ArtificerClassifyDao extends BaseMapper { + List getUserIdByClassify(List classifyIdList); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java index e3e6066..db6bb09 100644 --- a/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java +++ b/src/main/java/com/sqx/modules/artificer/dao/ArtificerDao.java @@ -22,7 +22,7 @@ public interface ArtificerDao extends BaseMapper { @Param("authentication") Integer authentication,@Param("by") Integer by, @Param("status") Integer status,@Param("city") String city, @Param("classifyId") String classifyId,@Param("phone") String phone, - Integer user,@Param("isStart") Integer isStart,@Param("technicianType")Integer technicianType,@Param("isBack")String isBack); + Integer user,@Param("isStart") Integer isStart,@Param("technicianType")Integer technicianType,@Param("isBack")String isBack, @Param("userIdList")List userIdList); Artificer selectArtificerById(@Param("userId") Long userId,@Param("artificerId") Long artificerId,@Param("longitude") String longitude,@Param("latitude") String latitude); diff --git a/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java b/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java index bb6825b..646e42e 100644 --- a/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java +++ b/src/main/java/com/sqx/modules/artificer/service/ArtificerClassifyService.java @@ -3,6 +3,8 @@ package com.sqx.modules.artificer.service; import com.baomidou.mybatisplus.extension.service.IService; import com.sqx.modules.artificer.entity.ArtificerClassify; -public interface ArtificerClassifyService extends IService { +import java.util.List; +public interface ArtificerClassifyService extends IService { + List getUserIdByClassify(List classifyIdList); } \ No newline at end of file diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java index 0ec8226..4fe5e53 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/ArtificerClassifyServiceImpl.java @@ -6,7 +6,14 @@ import com.sqx.modules.artificer.entity.ArtificerClassify; import com.sqx.modules.artificer.service.ArtificerClassifyService; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class ArtificerClassifyServiceImpl extends ServiceImpl implements ArtificerClassifyService { + @Override + public List getUserIdByClassify(List classifyIdList){ + return baseMapper.getUserIdByClassify(classifyIdList); + } + } \ No newline at end of file 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 e6ada28..d1e4a19 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 @@ -20,6 +20,7 @@ import com.sqx.modules.app.entity.UserMoney; import com.sqx.modules.app.service.UserMoneyService; import com.sqx.modules.artificer.dao.*; import com.sqx.modules.artificer.entity.*; +import com.sqx.modules.artificer.service.ArtificerClassifyService; import com.sqx.modules.artificer.service.ArtificerService; import com.sqx.modules.artificer.service.ArtificerTimeService; import com.sqx.modules.artificer.service.CollectArtificerService; @@ -74,6 +75,8 @@ public class ArtificerServiceImpl extends ServiceImpl i private FaceMain faceMain; @Autowired private SysDictService sysDictService; + @Autowired + private ArtificerClassifyService artificerClassifyService; @Override public Result selectArtificerList(Integer page, Integer limit, Long massageTypeId,String artificerName, @@ -91,8 +94,23 @@ public class ArtificerServiceImpl extends ServiceImpl i city = "长春市"; } + List userIdList = new ArrayList<>(); + if(classifyId!=null && !classifyId.equals("")){ + String[] classifyIdArr = classifyId.split(","); + List classifyIdList = new ArrayList<>(); + if(classifyIdArr.length>0){ + for(int i=0;i0){ + userIdList = artificerClassifyService.getUserIdByClassify(classifyIdList); + } + } IPage artificerIPage = baseMapper.selectArtificerList(pages, massageTypeId, artificerName, - longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType,isBack); + longitude, latitude, sort, authentication, by, status, city, classifyId,phone,user,isStart,technicianType,isBack,userIdList); List records = artificerIPage.getRecords(); String value = commonInfoService.findOne(392).getValue(); if("30".equals(value)){ @@ -731,7 +749,7 @@ public class ArtificerServiceImpl extends ServiceImpl i public Result getHomeArtificerList(Integer page, Integer limit, Integer isStart,Integer status, String city, String longitude, String latitude){ Map map = new HashMap(); Page pages=new Page<>(page,limit); - IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null,""); + IPage artificerIPage = baseMapper.selectArtificerList(pages, null, "",longitude, latitude, 1, 2, 1, status, city, null,"",1,0,null,"",null); map.put("nearData",new PageUtils(artificerIPage)); map.put("startData",new PageUtils(baseMapper.getHomeStartArtificerList(pages,isStart,status,city))); return Result.success(map); diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index 94bda66..24a4877 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -2544,7 +2544,10 @@ public class OrdersServiceImpl extends ServiceImpl implements @Override public Result cancelOrdersMoney(Long userId, Long ordersId) { Orders orders = baseMapper.selectById(ordersId); - if (orders.getStatus() == 4) { + if (orders.getStatus() == 1) { + String remarks = "取消订单将扣除：0元的手续费！"; + return Result.success().put("data",remarks); + }else if (orders.getStatus() == 4) { return Result.error("订单已经取消了！"); }else if (orders.getStatus() == 1) { String remarks = "取消订单将扣除：0元的手续费！"; @@ -2659,7 +2662,14 @@ public class OrdersServiceImpl extends ServiceImpl implements public Result cancelOrders(Long userId, Long ordersId) { Orders orders = baseMapper.selectById(ordersId); //状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单 - if (orders.getStatus() == 4) { + if (orders.getStatus() == 1) { + if(orders.getUserPackageDetailId() !=null){ + return cancelPackageOrders(userId,orders,BigDecimal.ZERO,BigDecimal.ZERO); + }else{ + return cancelMassageOrders(userId,orders,BigDecimal.ZERO,BigDecimal.ZERO,BigDecimal.ZERO,BigDecimal.ZERO); + } + } + else if (orders.getStatus() == 4) { return Result.error("订单已经取消了！"); } else if (orders.getStatus() == 3 || orders.getStatus() == 5) { return Result.error("订单已经完成了，无法取消！"); diff --git a/src/main/resources/mapper/artificer/ArtificerClassifyDao.xml b/src/main/resources/mapper/artificer/ArtificerClassifyDao.xml new file mode 100644 index 0000000..8059d2a --- /dev/null +++ b/src/main/resources/mapper/artificer/ArtificerClassifyDao.xml @@ -0,0 +1,15 @@ + + + + + + + + \ 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 33dff21..95a0653 100644 --- a/src/main/resources/mapper/artificer/ArtificerDao.xml +++ b/src/main/resources/mapper/artificer/ArtificerDao.xml @@ -23,8 +23,14 @@ and a.is_start=#{isStart} - - and FIND_IN_SET(#{classifyId},a.classify_id) > 0 + + + + + and a.user_id IN + + #{id} + and a.technician_type=#{technicianType}