From b467020d412ded27cfbaedd8ec44c0018d284d07 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 8 Jul 2025 20:07:02 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java   | 3 +++
 .../main/java/com/bsd/pjcloud/hard/api/vo/order/HardCarVo.java | 3 +++
 .../src/main/resources/mapper/order/HardCarMapper.xml          | 1 +
 .../impl/recharge/WalletRechargeInvoiceServiceImpl.java        | 2 +-
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java
index 96f759996..106582980 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCanteenProductTotalVo.java
@@ -20,4 +20,7 @@ public class HardCanteenProductTotalVo {
     @Schema(description = "食品总价格")
     private Long totalPrice;
 
+    @Schema(description = "购买次数")
+    private Long timeCount;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCarVo.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCarVo.java
index 2fad842f3..59dabb76d 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCarVo.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/vo/order/HardCarVo.java
@@ -18,4 +18,7 @@ public class HardCarVo extends HardCarEntity {
     // 商品数量【统计使用】
     private Long count;
 
+    // 购买次数【统计使用】
+    private Long payCount;
+
 }
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
index 35e52ed68..3d0169def 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/resources/mapper/order/HardCarMapper.xml
@@ -52,6 +52,7 @@
     <select id="productTotal" resultType="com.bsd.pjcloud.hard.api.vo.order.HardCanteenProductTotalVo">
         select DATE_FORMAT(a.create_time, '%Y-%m-%d') as createTime,
         o.hour_type,
+        COUNT(0) as timeCount,
         SUM(a.product_count) as payCount,
         SUM(a.total_price) as totalPrice
         from hard_car a
diff --git a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
index 0541e2a3b..5fe8f9a63 100644
--- a/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
+++ b/pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeInvoiceServiceImpl.java
@@ -267,7 +267,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
             if (ObjectUtil.isEmpty(detail)) continue;
             if (ObjectUtil.isNotEmpty(detail.getStatus()) && ObjectUtil.notEqual(detail.getStatus(), WalletRechargeInvoiceStatusEnum.UNBIND.getCode())) {
                 UserInfo userInfo = remoteUserService.getByUserId(detail.getApplyUserId()).getData();
-                throw new RuntimeException("用户<" + userInfo.getSysUser().getName() + ">创建的发票已经" + WalletRechargeInvoiceStatusEnum.codeOf(detail.getStatus()).getDesc() + "不能删除");
+                throw new RuntimeException("用户<" + userInfo.getSysUser().getName() + ">创建的发票已经<" + WalletRechargeInvoiceStatusEnum.codeOf(detail.getStatus()).getDesc() + ">不能删除");
             }
             // 如果是审批中就取消审批
             if (ObjectUtil.equals(detail.getProcessStatus(), TaskCheckStatusEnum.PADDING.getCode())) {