From fe79a9069efce027a4eadd0de5252752ff3719b9 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 30 May 2025 10:32:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=97=A0=E7=94=A8=E6=88=B7=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/order/HardOrderServiceImpl.java      | 34 ++++++++++++++-----
 .../java/com/bsd/pjcloud/admin/PayTest.java   |  8 ++---
 2 files changed, 29 insertions(+), 13 deletions(-)

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 dfe832a2c..cb0059252 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
@@ -196,17 +196,24 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
     public Long createOrder(HardCreateOrderDto dto) {
         MchManageVo mch = validateCreateOrderDto(dto);
         if (ObjectUtil.isEmpty(mch)) throw new RuntimeException("机器绑定的商户不存在");
-        // 查询用户
-        UserInfo userDetail = userService.getInnerByUserId(dto.getUserId()).getData();
-        if (ObjectUtil.isEmpty(userDetail)) throw new RuntimeException("用户不存在不存在");
         // 是否需要支付
         boolean isPay = isPay(dto.getOrderType(), dto.getOrderPayType());
+        // 是否需要核销
+        boolean isVerify = isVerify(dto.getOrderPayType());
+        // 查询用户
+        UserInfo userDetail = null;
+        SysUser sysUser = null;
+        if (isPay) {
+            userDetail = userService.getInnerByUserId(dto.getUserId()).getData();
+            if (ObjectUtil.isEmpty(userDetail)) throw new RuntimeException("用户不存在不存在");
+            sysUser = userDetail.getSysUser();
+        }
         // 是否需要支付额外金额
         boolean isExtraPrice = isExtraPrice(dto.getSysType());
         // 默认使用该商户的钱包如果没有就用饭卡钱包
         WalletManageEntity wallet = null;
         if (isPay) {
-            if (ObjectUtil.isNotEmpty(mch.getDefaultWalletTypeId())) {
+            if (ObjectUtil.isEmpty(mch.getDefaultWalletTypeId())) {
                 R<WalletManageEntity> walletResult = remoteWalletService.getWallet(dto.getUserId(), WalletTypeEnum.EAT);
                 wallet = Optional.of(walletResult).map(R::getData).orElseThrow(() -> new RuntimeException("用户钱包不存在"));
             } else {
@@ -216,14 +223,14 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
             if (ObjectUtil.isEmpty(wallet)) {
                 throw new RuntimeException("用户钱包不存在");
             }
-        } else {
+        } else if (isVerify) {
             // 判断该二维码有没有被核销
             boolean isCancel = validateCodeIsCancel(dto.getOrderType(), dto.getOrderSourceTypeId());
             if (isCancel) throw new RuntimeException("该二维码已被核销");
         }
         int totalPrice = 0, extraPrice = 0, payPrice = 0;
         totalPrice = hardCarService.computerCarTotalPrice(dto.getSysType(), dto.getOrderType(), dto.getList());
-        if (isExtraPrice) extraPrice = computeExtraPrice(totalPrice, mch, userDetail.getSysUser());
+        if (isExtraPrice) extraPrice = computeExtraPrice(totalPrice, mch, sysUser);
         payPrice = totalPrice + extraPrice;
         if (isPay) {
             // 如果是支付的话,不能小于等于0
@@ -238,8 +245,6 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         // 添加硬件订单
         HardOrderEntity orderObj = HardOrderEntity.builder()
                 .androidOrderCode(dto.getAndroidOrderCode())
-                .userId(dto.getUserId())
-                .userDeptId(userDetail.getSysUser().getDeptId())
                 .sysType(dto.getSysType().getType())
                 .hourType(String.valueOf(dto.getHourType()))
                 .parentCarId(parentCarId)
@@ -258,6 +263,12 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
                 .isOfflineOrder(YesNoEnum.NO.getCode())
                 .productDesc(subject)
                 .build();
+        if (ObjectUtil.isNotEmpty(sysUser)) {
+            orderObj.setUserId(sysUser.getUserId());
+            orderObj.setUserDeptId(sysUser.getDeptId());
+        } else {
+            orderObj.setUserId(-1L);
+        }
         if (isPay) {
             orderObj.setWalletId(wallet.getId());
         }
@@ -266,7 +277,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         getSelf().fastenerInventory(orderObj, YesNoEnum.YES);
         // 钱包扣款
         getSelf().fastReduceBalance(orderObj);
-        if (!isPay) {
+        if (isVerify) {
             // 核销二维码
             getSelf().cancelCode(orderObj, userDetail);
         }
@@ -837,6 +848,11 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         return true;
     }
 
+    // 是否需要核销
+    private boolean isVerify(HardPayTypeEnum payType) {
+        return HardPayTypeEnum.isNotPay.contains(payType);
+    }
+
     // 是否需要额外支付(目前只有食堂需要)
     private boolean isExtraPrice(HardTypeEnum hardType) {
         return ObjectUtil.equals(hardType, HardTypeEnum.CANTEEN);
diff --git a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
index 365686a20..d90252169 100644
--- a/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
+++ b/pjcloud-thirdparty/pjcloud-thirdparty-biz/src/test/java/com/bsd/pjcloud/admin/PayTest.java
@@ -29,8 +29,8 @@ import java.util.Map;
 @SpringBootTest(classes = ThirdPartyApp.class)
 public class PayTest {
 
-    //    private final String baseUrl = "http://123.156.230.15:8089/api";
-    private final String baseUrl = "http://127.0.0.1:9999";
+    private final String baseUrl = "http://123.156.230.15:8089/api";
+    // private final String baseUrl = "http://127.0.0.1:9999";
 
     private final String walletInfoUrl = "/third/third-pay-api/user-wallet";
 
@@ -80,7 +80,7 @@ public class PayTest {
         Map<String, Object> paramsMap = new HashMap<>();
         paramsMap.put("userId", 1875049673022279681L);
         paramsMap.put("thirdOrderId", System.currentTimeMillis());
-        paramsMap.put("price", 1000);
+        paramsMap.put("price", 800);
         paramsMap.put("products", null);
         String body = JSONUtil.toJsonStr(paramsMap);
         // 发送请求
@@ -119,7 +119,7 @@ public class PayTest {
     public void walletRefund() throws Exception {
         ThirdKeyManageEntity config = getLbConfig();
         Map<String, Object> paramsMap = new HashMap<>();
-        paramsMap.put("platformOrderId", "1928019909587054593");
+        paramsMap.put("platformOrderId", "1928048358927982594");
         paramsMap.put("thirdRefundId", System.currentTimeMillis());
         paramsMap.put("price", "300");
         String body = JSONUtil.toJsonStr(paramsMap);