From 5fddd189dccfbf427fd7e1f9c21142eb4d6ad10b Mon Sep 17 00:00:00 2001 From: wen <1455474577@qq.com> Date: Thu, 6 Jan 2022 13:04:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E7=A5=A8=E7=B3=BB?= =?UTF-8?q?=E7=BB=9FBug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BC=80=E7=A5=A8=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=97=B6?= =?UTF-8?q?isRead=E5=A7=8B=E7=BB=88=E6=9C=AAnull=EF=BC=8C=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=87=8D=E5=A4=8D=E6=9F=A5=E7=9C=8B=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=8A=A5=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88=E5=BC=82=E5=B8=B8=E9=94=99=E8=AF=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invoice/constant/IsReadStatusConst.java | 21 +++++++++++++++++++ .../controller/XhpcInvoiceController.java | 3 +-- .../service/impl/XhpcInvoiceServiceImpl.java | 6 +++++- .../resources/mapper/XhpcInvoiceMapper.xml | 3 ++- 4 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java new file mode 100644 index 00000000..037628c9 --- /dev/null +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/constant/IsReadStatusConst.java @@ -0,0 +1,21 @@ +package com.xhpc.invoice.constant; + +/** + * 用户是否已经阅读了发票的状态常量类 + * + * @author WH + * @date 2022/1/6 12:51 + * @since version-1.0 + */ +public class IsReadStatusConst { + + /** + * 用户已读 + */ + public static final Integer READED = 1; + /** + * 用户未读 + */ + public static final Integer NO_READ = 0; + +} diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java index a3a36c63..efd09327 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java @@ -152,7 +152,7 @@ public class XhpcInvoiceController extends BaseController { * @since version-1.0 */ @GetMapping("/detail") - public AjaxResult findSpecificInvoice(Map invoiceIdMap) { + public AjaxResult findSpecificInvoice(@RequestParam Map invoiceIdMap) { Long invoiceId = Long.valueOf(String.valueOf(invoiceIdMap.get("invoiceId"))); SpecificInvoiceWrap specificInvoiceWrap = xhpcInvoiceService.findSpecificInvoice(invoiceId); @@ -160,7 +160,6 @@ public class XhpcInvoiceController extends BaseController { return AjaxResult.error("要回显的订单发票id有误"); } return AjaxResult.success(specificInvoiceWrap); - } } diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java index 8a7f5133..cd96ad56 100644 --- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java +++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/service/impl/XhpcInvoiceServiceImpl.java @@ -10,6 +10,7 @@ import com.xhpc.common.domain.XhpcChargingStation; import com.xhpc.common.redis.service.RedisService; import com.xhpc.invoice.constant.InvoiceMapHistoryOrderStatusConst; import com.xhpc.invoice.constant.InvoiceStatusConst; +import com.xhpc.invoice.constant.IsReadStatusConst; import com.xhpc.invoice.domain.*; import com.xhpc.invoice.mapper.*; import com.xhpc.invoice.pojo.XhpcInvoice; @@ -304,7 +305,10 @@ public class XhpcInvoiceServiceImpl implements XhpcInvoiceService { if (xhpcInvoice.getStatus().equals(InvoiceStatusConst.INVOICING)) { return specificInvoicedResponse; } - + //如果用户已经查看了该发票，却再次调用该接口，那么就直接返回数据。 + if (xhpcInvoice.getIsRead().equals(IsReadStatusConst.READED)) { + return specificInvoicedResponse; + } //一旦调了详情接口，就去掉该已开发票的未读状态，同时redis中的未读数量数据-1 xhpcInvoiceMapper.updateByInvoiceId(invoiceId); reduceNoReadInvoiceCount(xhpcInvoice); diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml index ff90ebca..d77b9192 100644 --- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml +++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml @@ -29,12 +29,13 @@ + `invoice_id` - , + ,invoice_type, `receive_email`, `title_type`, `title_content`,