From 1b657bab3d874ea2e3160d6018d7057a6e791a95 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 10 Jun 2025 15:23:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=80=82=E9=85=8D=E7=8E=B0=E9=87=91?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/service/impl/HardInvoiceServiceImpl.java        | 6 ++++--
 .../hard/service/impl/order/HardOrderServiceImpl.java    | 9 ++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java
index 4b3a2c2a3..01318a0b2 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/HardInvoiceServiceImpl.java
@@ -165,8 +165,10 @@ public class HardInvoiceServiceImpl extends ServiceImpl<HardInvoiceMapper, HardI
                 .drawingRowText("手机号", userPhone)
                 .drawingRowText("商户", mch.getName())
                 .drawingRowText("部门", mch.getDeptName())
-                .drawingRowText("下单时间", createTime)
-                .drawingRowText("支付时间", payTime);
+                .drawingRowText("下单时间", createTime);
+        if (ObjectUtil.isNotEmpty(payTime)) {
+            drawing.drawingRowText("支付时间", payTime);
+        }
         if (ObjectUtil.isNotEmpty(carList)) {
             drawing.drawingDottedLine();
             drawing.drawingRowText("商品", "数量", "总价");
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
index a6f1cba06..e983d182a 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/service/impl/order/HardOrderServiceImpl.java
@@ -205,6 +205,8 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("机器绑定的商户不存在");
         // 是否需要钱包支付
         boolean isWalletPay = isPay(dto.getOrderType(), dto.getOrderPayType());
+        // 是否需要现金支付
+        boolean isCashPay = ObjectUtil.equals(dto.getOrderPayType(), HardPayTypeEnum.CASH);
         // 是否需要核销
         boolean isVerify = isVerify(dto.getOrderPayType());
         // 是否微信支付
@@ -290,7 +292,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         }
         baseMapper.insert(orderObj);
         // 扣减库存
-        // getSelf().fastenerInventory(orderObj, YesNoEnum.YES);
+        getSelf().fastenerInventory(orderObj, YesNoEnum.YES);
         // 钱包支付或者核销
         if (isVerify || isWalletPay) {
             // 钱包扣款
@@ -298,6 +300,11 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
             // 核销二维码
             getSelf().cancelCode(orderObj, userDetail);
         }
+        // 现金支付
+        if (isCashPay) {
+            // 更改为支付成功
+            getSelf().orderSuccess(orderObj, Boolean.TRUE);
+        }
         // 微信支付
         if (isWeChatPay) {
             WechatMicropayDto wechatPayDto = WechatMicropayDto.builder().merId(orderObj.getMerchantId()).orderId(orderObj.getId()).price(payPrice).wechatQrCode(String.valueOf(dto.getOrderSourceTypeId())).build();