From e44616fc3f0f6174f4d0b1d28be423b200062311 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 21 Feb 2025 17:16:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/BmMessageController.java | 14 ++++++++++++++ .../bonus/material/basic/domain/BmMessage.java | 3 +++ .../material/basic/mapper/BmMessageMapper.java | 7 +++++++ .../material/basic/service/IBmMessageService.java | 7 +++++++ .../basic/service/impl/BmMessageServiceImpl.java | 11 +++++++++++ .../material/device/domain/vo/DevInfoVo.java | 4 +++- .../bonus/material/order/domain/OrderInfoDto.java | 15 ++++++++++++++- .../order/service/impl/OrderServiceImpl.java | 14 ++++++++++++++ .../mapper/material/basic/BmMessageMapper.xml | 4 ++++ 9 files changed, 77 insertions(+), 2 deletions(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java index 6e9b35e..eff2deb 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java @@ -45,6 +45,20 @@ public class BmMessageController extends BaseController { List list = bmMessageService.selectBmMessageListFromCache(bmMessage); return AjaxResult.success(list); } + + /** + * 根据所属公司查询消息未读数量 + * @param bmMessage + * @return + */ + @ApiOperation(value = "根据所属公司查询消息未读数量") + //@RequiresPermissions("basic:message:list") + @GetMapping("/getNoReadNum") + public AjaxResult getNoReadNum(BmMessage bmMessage) { + BmMessage message = bmMessageService.getNoReadNum(bmMessage); + return AjaxResult.success(message); + } + @ApiOperation(value = "查询消息列表") //@RequiresPermissions("basic:message:list") @GetMapping("/listOneToOne") diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java index 71162b5..083f322 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/domain/BmMessage.java @@ -80,4 +80,7 @@ public class BmMessage extends BaseEntity { @ApiModelProperty(value = "是否已读(0:未读 1:已读)") private Integer isRead; + @ApiModelProperty(value = "消息未读数量") + private Integer isNoRead; + } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/BmMessageMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/BmMessageMapper.java index 89e77e0..7e10705 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/BmMessageMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/mapper/BmMessageMapper.java @@ -62,4 +62,11 @@ public interface BmMessageMapper { public int deleteBmMessageByIds(Long[] ids); List getdeptIds(); + + /** + * 根据所属公司查询消息未读数量 + * @param bmMessage + * @return + */ + BmMessage getNoReadNum(BmMessage bmMessage); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java index 67111e9..af6f52a 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java @@ -65,4 +65,11 @@ public interface IBmMessageService { public int deleteBmMessageById(Long id); List selectBmMessageListFromCacheOne(BmMessage bmMessage) throws JsonProcessingException; + + /** + * 根据所属公司查询消息未读数量 + * @param bmMessage + * @return + */ + BmMessage getNoReadNum(BmMessage bmMessage); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java index 9ee8f49..13445ab 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java @@ -113,6 +113,17 @@ public class BmMessageServiceImpl implements IBmMessageService { return sortedList; } + /** + * 根据所属公司查询消息未读数量 + * @param bmMessage + * @return + */ + @Override + public BmMessage getNoReadNum(BmMessage bmMessage) { + bmMessage.setToCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId()); + return bmMessageMapper.getNoReadNum(bmMessage); + } + /** * 新增消息 * diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 36bf991..a09a2a1 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import java.util.Date; import java.util.List; @@ -43,7 +44,8 @@ public class DevInfoVo extends DevInfo { private String companyLogoUrl; @ApiModelProperty(value = "公司入驻时间") - private String companyCreateTime; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date companyCreateTime; @ApiModelProperty(value = "公司上架数量") private Long companyUpNum; diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java index b385c80..0a3c619 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/domain/OrderInfoDto.java @@ -135,5 +135,18 @@ public class OrderInfoDto { private BigDecimal totalRealPrice; - private Integer orderCount; + /** + * 订单总数 + */ + private Integer orderCount = 0; + + /** + * 租赁中订单总数 + */ + private Integer leaseOrderCount = 0; + + /** + * 完成订单总数 + */ + private Integer completeOrderCount = 0; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index b50644c..d65ad84 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -241,6 +241,20 @@ public class OrderServiceImpl implements OrderService { dto.setBuyerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); } List orderInfoDto = orderMapper.getOrderStatusCount(dto); + int total = 0; + OrderInfoDto infoDto = new OrderInfoDto(); + if (!CollectionUtils.isEmpty(orderInfoDto)) { + for (OrderInfoDto info : orderInfoDto) { + if (info.getOrderStatus().equals(OrderStatusEnum.ORDER_AWAITING_RECEIPT.getStatus().toString())) { + infoDto.setLeaseOrderCount(info.getOrderCount()); + } else if (info.getOrderStatus().equals(OrderStatusEnum.ORDER_FINISHED.getStatus().toString())) { + infoDto.setCompleteOrderCount(info.getOrderCount()); + } + total += info.getOrderCount(); + } + infoDto.setOrderCount(total); + } + orderInfoDto.add(0, infoDto); return orderInfoDto; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml index 8cf7c75..50f6d4d 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/basic/BmMessageMapper.xml @@ -77,6 +77,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN sys_dept sd1 ON sd1.dept_id = subquery.first_ancestor + + insert into bm_message