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`,