From 3e6fe5d282574a20da4c77104ff27ff3da926704 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Thu, 24 Aug 2023 17:48:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomMadeInfoController.java | 8 ++--- .../desk/controller/OrderController.java | 32 +++++++------------ .../modules/desk/entity/Order.java | 6 ++++ .../modules/desk/mapper/OrderMapper.java | 6 +++- .../modules/desk/mapper/OrderMapper.xml | 27 +++++++++++++++- .../desk/service/ICustomMadeInfoService.java | 4 +++ .../modules/desk/service/IOrderService.java | 5 +++ .../impl/CustomMadeInfoServiceImpl.java | 11 +++++++ .../desk/service/impl/OrderServiceImpl.java | 8 +++++ .../controller/WeChatUserController.java | 2 +- src/main/resources/application.yml | 2 +- 11 files changed, 83 insertions(+), 28 deletions(-) diff --git a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java index d9ee2d2..0dbde83 100644 --- a/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java +++ b/src/main/java/org/springblade/modules/desk/controller/CustomMadeInfoController.java @@ -97,10 +97,8 @@ public class CustomMadeInfoController extends BladeController { */ @GetMapping("/list-by-order-no") public R> listByOrderNo(@RequestParam String orderNo) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - wrapper.eq(CustomMadeInfo::getOrderNo, orderNo); - List pages = iCustomMadeInfoService.list(wrapper); - return R.data(pages); + List list = iCustomMadeInfoService.listByOrderNo(orderNo); + return R.data(list); } /** @@ -138,6 +136,7 @@ public class CustomMadeInfoController extends BladeController { wrapper.lt(CustomMadeInfo::getCreateTime, endTime + " 23:59:59"); } + wrapper.orderByDesc(CustomMadeInfo::getCreateTime); IPage pages = iCustomMadeInfoService.page(Condition.getPage(query), wrapper); return R.data(pages); } @@ -177,6 +176,7 @@ public class CustomMadeInfoController extends BladeController { wrapper.lt(CustomMadeInfo::getCreateTime, endTime + " 23:59:59"); } + wrapper.orderByDesc(CustomMadeInfo::getCreateTime); List dataList = iCustomMadeInfoService.list(wrapper); List vos = new ArrayList<>(); diff --git a/src/main/java/org/springblade/modules/desk/controller/OrderController.java b/src/main/java/org/springblade/modules/desk/controller/OrderController.java index cc5dc74..90e36a4 100644 --- a/src/main/java/org/springblade/modules/desk/controller/OrderController.java +++ b/src/main/java/org/springblade/modules/desk/controller/OrderController.java @@ -4,9 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; -import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg; -import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -20,11 +17,12 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.*; +import org.springblade.modules.desk.entity.CustomMadeInfo; import org.springblade.modules.desk.entity.Order; +import org.springblade.modules.desk.service.ICustomMadeInfoService; import org.springblade.modules.desk.service.IOrderService; import org.springblade.modules.desk.vo.OrderExcelVO; import org.springblade.modules.weixin.entity.WeChatAddress; -import org.springblade.modules.weixin.entity.WeChatUser; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; @@ -45,12 +43,16 @@ public class OrderController { private final IOrderService orderService; + private final ICustomMadeInfoService madeInfoService; + /** * 详情 */ @GetMapping("/detail") public R detail(@RequestParam String id) { Order detail = orderService.getById(id); + List list = madeInfoService.listByOrderNo(detail.getOrderNo()); + detail.setFilledMadeInfoNum(Func.isEmpty(list) ? 0 : list.size()); return R.data(detail); } @@ -59,21 +61,7 @@ public class OrderController { */ @GetMapping("/page") public R> page(Query query, String buyerName, String buyerPhone, String orderNo, String status) { - LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); - if (Func.isNotEmpty(buyerName)) { - wrapper.like(Order::getBuyerName, buyerName); - } - if (Func.isNotEmpty(buyerPhone)) { - wrapper.like(Order::getBuyerPhone, buyerPhone); - } - if (Func.isNotEmpty(orderNo)) { - wrapper.like(Order::getOrderNo, orderNo); - } - if (Func.isNotEmpty(status)) { - wrapper.eq(Order::getStatus, status); - } - - IPage pages = orderService.page(Condition.getPage(query), wrapper); + IPage pages = orderService.pageWithMadeInfoCount(Condition.getPage(query), buyerName, buyerPhone, orderNo, status); return R.data(pages); } @@ -81,7 +69,7 @@ public class OrderController { * 导出 */ @GetMapping("/export") - public void export(HttpServletResponse response, String buyerName, String buyerPhone, String orderNo) { + public void export(HttpServletResponse response, String buyerName, String buyerPhone, String orderNo, String status) { LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); if (Func.isNotEmpty(buyerName)) { wrapper.like(Order::getBuyerName, buyerName); @@ -92,7 +80,11 @@ public class OrderController { if (Func.isNotEmpty(orderNo)) { wrapper.like(Order::getOrderNo, orderNo); } + if (Func.isNotEmpty(status)) { + wrapper.eq(Order::getStatus, status); + } + wrapper.orderByDesc(Order::getCreateTime); List dataList = orderService.list(wrapper); List vos = new ArrayList<>(); diff --git a/src/main/java/org/springblade/modules/desk/entity/Order.java b/src/main/java/org/springblade/modules/desk/entity/Order.java index f74004f..a871874 100644 --- a/src/main/java/org/springblade/modules/desk/entity/Order.java +++ b/src/main/java/org/springblade/modules/desk/entity/Order.java @@ -1,5 +1,6 @@ package org.springblade.modules.desk.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; @@ -152,4 +153,9 @@ public class Order extends BaseEntity { */ private Integer status; + /** + * 已填写报名单数量, 不予数据表中字段映射 + */ + @TableField(exist = false) + private Integer filledMadeInfoNum; } diff --git a/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.java b/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.java index 069830d..bb1fbeb 100644 --- a/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.java +++ b/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.java @@ -17,9 +17,13 @@ package org.springblade.modules.desk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.support.Query; import org.springblade.modules.desk.entity.CustomMadeInfo; import org.springblade.modules.desk.entity.Order; +import java.util.List; + /** * Mapper 接口 * @@ -28,6 +32,6 @@ import org.springblade.modules.desk.entity.Order; * @date 2023-07-25 17:47 */ public interface OrderMapper extends BaseMapper { - + List pageWithMadeInfoCount(IPage page, String buyerName, String buyerPhone, String orderNo, String status); } diff --git a/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml b/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml index f173bfb..9a28615 100644 --- a/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml +++ b/src/main/java/org/springblade/modules/desk/mapper/OrderMapper.xml @@ -3,7 +3,7 @@ - + @@ -29,5 +29,30 @@ + + + diff --git a/src/main/java/org/springblade/modules/desk/service/ICustomMadeInfoService.java b/src/main/java/org/springblade/modules/desk/service/ICustomMadeInfoService.java index 6177a45..317eb7e 100644 --- a/src/main/java/org/springblade/modules/desk/service/ICustomMadeInfoService.java +++ b/src/main/java/org/springblade/modules/desk/service/ICustomMadeInfoService.java @@ -18,6 +18,9 @@ package org.springblade.modules.desk.service; import org.springblade.core.mp.base.BaseService; import org.springblade.modules.desk.entity.CustomMadeInfo; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; /** * 服务类 @@ -28,4 +31,5 @@ import org.springblade.modules.desk.entity.CustomMadeInfo; */ public interface ICustomMadeInfoService extends BaseService { + List listByOrderNo(String orderNo); } diff --git a/src/main/java/org/springblade/modules/desk/service/IOrderService.java b/src/main/java/org/springblade/modules/desk/service/IOrderService.java index 4d67c61..d44bc44 100644 --- a/src/main/java/org/springblade/modules/desk/service/IOrderService.java +++ b/src/main/java/org/springblade/modules/desk/service/IOrderService.java @@ -16,9 +16,12 @@ */ package org.springblade.modules.desk.service; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; import org.springblade.modules.desk.entity.CustomMadeInfo; import org.springblade.modules.desk.entity.Order; +import org.springblade.modules.desk.vo.NoticeVO; /** * 服务类 @@ -29,4 +32,6 @@ import org.springblade.modules.desk.entity.Order; */ public interface IOrderService extends BaseService { String getAutoIncreSerialNumber(); + + IPage pageWithMadeInfoCount(IPage page, String buyerName, String buyerPhone, String orderNo, String status); } diff --git a/src/main/java/org/springblade/modules/desk/service/impl/CustomMadeInfoServiceImpl.java b/src/main/java/org/springblade/modules/desk/service/impl/CustomMadeInfoServiceImpl.java index 66f04f8..dfe1aec 100644 --- a/src/main/java/org/springblade/modules/desk/service/impl/CustomMadeInfoServiceImpl.java +++ b/src/main/java/org/springblade/modules/desk/service/impl/CustomMadeInfoServiceImpl.java @@ -16,12 +16,16 @@ */ package org.springblade.modules.desk.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.modules.desk.entity.CustomMadeInfo; import org.springblade.modules.desk.mapper.CustomMadeInfoMapper; import org.springblade.modules.desk.service.ICustomMadeInfoService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 服务实现类 * @@ -33,4 +37,11 @@ import org.springframework.stereotype.Service; public class CustomMadeInfoServiceImpl extends BaseServiceImpl implements ICustomMadeInfoService { + @Override + public List listByOrderNo(String orderNo) { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(); + wrapper.eq(CustomMadeInfo::getOrderNo, orderNo); + List list = this.list(wrapper); + return list; + } } diff --git a/src/main/java/org/springblade/modules/desk/service/impl/OrderServiceImpl.java b/src/main/java/org/springblade/modules/desk/service/impl/OrderServiceImpl.java index 5868d10..4354e24 100644 --- a/src/main/java/org/springblade/modules/desk/service/impl/OrderServiceImpl.java +++ b/src/main/java/org/springblade/modules/desk/service/impl/OrderServiceImpl.java @@ -16,15 +16,18 @@ */ package org.springblade.modules.desk.service.impl; +import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Query; import org.springblade.modules.desk.entity.CustomMadeInfo; import org.springblade.modules.desk.entity.Order; import org.springblade.modules.desk.mapper.CustomMadeInfoMapper; import org.springblade.modules.desk.mapper.OrderMapper; import org.springblade.modules.desk.service.ICustomMadeInfoService; import org.springblade.modules.desk.service.IOrderService; +import org.springblade.modules.desk.vo.NoticeVO; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Service; @@ -59,6 +62,11 @@ public class OrderServiceImpl extends BaseServiceImpl implem return numStr; } + @Override + public IPage pageWithMadeInfoCount(IPage page, String buyerName, String buyerPhone, String orderNo, String status) { + return page.setRecords(baseMapper.pageWithMadeInfoCount(page, buyerName, buyerPhone, orderNo, status)); + } + /** * 根据位数生成最大值 * diff --git a/src/main/java/org/springblade/modules/weixin/controller/WeChatUserController.java b/src/main/java/org/springblade/modules/weixin/controller/WeChatUserController.java index 313174d..90ea70c 100644 --- a/src/main/java/org/springblade/modules/weixin/controller/WeChatUserController.java +++ b/src/main/java/org/springblade/modules/weixin/controller/WeChatUserController.java @@ -30,7 +30,7 @@ public class WeChatUserController { @GetMapping("/list") public R list(WeChatUser weChatUser, Query query) { - return R.data(weChatUserService.page(Condition.getPage(query), Wrappers.lambdaQuery(weChatUser))); + return R.data(weChatUserService.page(Condition.getPage(query), Wrappers.lambdaQuery(weChatUser).orderByDesc(WeChatUser::getCreateTime))); } /** diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 58a9873..8158111 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -184,7 +184,7 @@ blade: #接口放行 skip-url: #- /blade-resource/** - #- /blade-system/** + - /blade-desk/** - /blade-desk/custom-made-info/** - /blade-system/dict-biz/get-logistics-companies - /blade-system/dict-biz/get-purchase-channel