From 0c8ebfdef57a5a11bc7385e57be93cde0e51e456 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 12 Jul 2024 15:31:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/UserMoneyServiceImpl.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java index 9cb4701..c6988e8 100644 --- a/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java +++ b/src/main/java/com/sqx/modules/app/service/impl/UserMoneyServiceImpl.java @@ -156,16 +156,19 @@ public class UserMoneyServiceImpl extends ServiceImpl i } //收益明细 @Override - public Result profitDetailed(Long userId, IPage page1, String startTime,String endTime) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("artificer_id", userId); - queryWrapper.between("end_times", startTime, endTime); - //只查询已完成和待评价的订单 - queryWrapper.in("status", Arrays.asList(5, 3)); - //只查询根节点数据 - queryWrapper.eq("parent_id", 0); - queryWrapper.orderByDesc("end_times"); - IPage page2 = ordersDao.selectPage(page1, queryWrapper); + public Result profitDetailed(Long userId, Page page, String startTime,String endTime) { +// QueryWrapper queryWrapper = new QueryWrapper(); +// queryWrapper.eq("artificer_id", userId); +// queryWrapper.between("end_times", startTime, endTime); +// //只查询已完成和待评价的订单 +// queryWrapper.in("status", Arrays.asList(5, 3)); +// //只查询根节点数据 +// queryWrapper.eq("parent_id", 0); +// queryWrapper.orderByDesc("end_times"); +// IPage page2 = ordersDao.selectPage(page1, queryWrapper); + + IPage page2 = ordersDao.selectDividedIntoDetails(page, userId,startTime,endTime,null); + //分成明细添加到返回对象中 return Result.success().put("data", page2); } From 409c436bc5e30c8ffe293f2c84f5b941c29e1eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 12 Jul 2024 15:31:57 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=94=B6=E7=9B=8A=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/app/controller/app/AppUserMoneyController.java | 4 ++-- .../java/com/sqx/modules/app/service/UserMoneyService.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java index 1691cb9..0aa6d04 100644 --- a/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java +++ b/src/main/java/com/sqx/modules/app/controller/app/AppUserMoneyController.java @@ -183,8 +183,8 @@ public class AppUserMoneyController { if(page == null){page = 1L;} if(limit == null){limit = 10L;} - IPage ipage = new Page(page, limit); - return userMoneyService.profitDetailed(artificer.getArtificerId(), ipage,startTime,endTime); + Page page1 = new Page(page, limit); + return userMoneyService.profitDetailed(artificer.getArtificerId(), page1,startTime,endTime); } diff --git a/src/main/java/com/sqx/modules/app/service/UserMoneyService.java b/src/main/java/com/sqx/modules/app/service/UserMoneyService.java index 4ef93ea..b88c95b 100644 --- a/src/main/java/com/sqx/modules/app/service/UserMoneyService.java +++ b/src/main/java/com/sqx/modules/app/service/UserMoneyService.java @@ -26,6 +26,6 @@ public interface UserMoneyService extends IService { PageUtils balanceDetailed(@RequestAttribute Long userId, Page ipage); - Result profitDetailed(@RequestAttribute Long userId, IPage ipage, String startTime,String endTime); + Result profitDetailed(@RequestAttribute Long userId, Page ipage, String startTime,String endTime); } From 358ae466f65f9a311d9d63a7d3c42ba0544b9d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 12 Jul 2024 15:50:48 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BE=85=E8=A1=A5=E5=8D=95=E6=8B=92?= =?UTF-8?q?=E5=8D=95=E5=86=8D=E7=94=9F=E6=88=90=E5=BE=85=E8=A1=A5=E5=8D=95?= =?UTF-8?q?=E8=BF=98=E5=8F=AF=E4=BB=A5=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/artificer/service/impl/OrdersServiceImpl.java | 7 +++++-- src/main/resources/mapper/artificer/OrdersDao.xml | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) 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 e2307a7..e09523f 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 @@ -3162,8 +3162,11 @@ public class OrdersServiceImpl extends ServiceImpl implements public Result cancelSupplementOrders(Long userId, Long ordersId, Integer isAuto, Integer type) { Orders orders = baseMapper.selectById(ordersId); //状态 1待支付 2待服务 3待评论 4已取消 5已完成 6进行中 7技师出发 8技师到达 9用户已支付技师待接单 10待补单 - if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){ - return Result.error("补差价的单据无法生成待补单！"); + if(!orders.getRefusalContent().equals("")){ + }else{ + if(orders.getOldOrdersId()!=null && orders.getOldOrdersId() !=0 && type == 1){ + return Result.error("补差价的单据无法生成待补单！"); + } } if (orders.getStatus() == 8 || orders.getStatus() == 9 || orders.getStatus() == 10 || orders.getStatus() == 11) { if(orders.getUserPackageDetailId() !=null){ diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml index e545a27..c6384b9 100644 --- a/src/main/resources/mapper/artificer/OrdersDao.xml +++ b/src/main/resources/mapper/artificer/OrdersDao.xml @@ -1711,7 +1711,8 @@