From c303814c0975fdde5d93409fbc71ea7d563e9a5b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 20 Oct 2025 17:37:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=88=9B=E5=BB=BA=E5=85=B1=E5=AF=8C?=
 =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java   | 4 ++--
 .../pjcloud/hard/controller/order/HardOrderController.java    | 1 -
 .../pjcloud/hard/service/impl/order/HardOrderServiceImpl.java | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java
index 018a7d5f1..386d94c74 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java
@@ -19,8 +19,8 @@ public class HardAppCreateFarmerOrderDto {
     @NotNull(message = "购物车id不能为空")
     private Long carParentId;
 
-    @NotNull(message = "钱包类型不能为空")
-    private WalletTypeEnum walletType;
+    @NotNull(message = "钱包类型id")
+    private Long walletTypeId;
 
     @NotNull(message = "自提点id不能为空")
     private Long pickUpId;
diff --git a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
index deb48ac45..c2a353b99 100644
--- a/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
+++ b/pjcloud-hardware/pjcloud-hardware-biz/src/main/java/com/bsd/pjcloud/hard/controller/order/HardOrderController.java
@@ -194,7 +194,6 @@ public class HardOrderController {
     @Idempotent(expireTime = 3, key = "'/app/hard-order/app/create-farmer-order' + #body.getCarParentId() ", info = "正在创建订单中，请勿重复操作")
     public R<Long> appCreateFarmerReserveOrder(@RequestBody HardAppCreateFarmerOrderDto body) {
         PjcloudUser user = SecurityUtils.getUser();
-        body.setWalletType(WalletTypeEnum.EAT);
         body.setHardType(HardTypeEnum.SUPERMARKET);
         body.setUserId(user.getId());
         body.setOrderType(HardOrderTypeEnum.FARMER);
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 97be87cfe..9637c7fb1 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
@@ -642,7 +642,7 @@ public class HardOrderServiceImpl extends ServiceImpl<HardOrderMapper, HardOrder
         UserInfo userDetail = userService.getInnerByUserId(dto.getUserId()).getData();
         if (ObjectUtil.isEmpty(userDetail)) throw new RuntimeException("用户不存在不存在");
         // 钱包
-        WalletManageEntity wallet = remoteWalletService.getWallet(dto.getUserId(), dto.getWalletType()).getData();
+        WalletManageEntity wallet = remoteWalletService.getWalletByWalletTypeId(dto.getUserId(), dto.getWalletTypeId()).getData();
         if (ObjectUtil.isEmpty(wallet)) throw new RuntimeException("用户钱包不存在");
         // 查询父订单
         HardParentCarEntity parentCar = hardCarService.getParentCarById(dto.getCarParentId());