From b5cdcaf2d3be7593c7385be976b74b177dc6f92e Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 3 Apr 2025 17:51:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=89=AB=E4=B8=80=E6=89=AB=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E9=92=B1=E5=8C=85=E8=BF=9B=E8=A1=8C=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hard/api/dto/app/HardAppCreateOrderScancode.java | 6 +++--- .../hard/api/dto/order/app/HardAppCreateOrderDto.java | 2 +- .../pjcloud/hard/controller/order/HardOrderController.java | 1 + .../hard/service/impl/order/HardOrderServiceImpl.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/app/HardAppCreateOrderScancode.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/app/HardAppCreateOrderScancode.java index bc1ef7273..2b6e594ce 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/app/HardAppCreateOrderScancode.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/app/HardAppCreateOrderScancode.java @@ -11,9 +11,9 @@ public class HardAppCreateOrderScancode { @NotNull(message = "商户id不能为空") private Long merchantId; - @Schema(description = "钱包类型id") - @NotNull(message = "钱包类型id不能为空") - private Long walletTypeId; + @Schema(description = "钱包id") + @NotNull(message = "钱包id不能为空") + private Long walletId; @Schema(description = "用户输入的价格") @NotNull(message = "自定义金额不能为空") diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java index 31433005a..dbfaf821a 100644 --- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java +++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateOrderDto.java @@ -22,7 +22,7 @@ public class HardAppCreateOrderDto { @NotNull(message = "用户id不能为空") private Long userId; - @NotNull(message = "钱包类型不能为空") + // @NotNull(message = "钱包类型不能为空") private WalletTypeEnum walletType; @NotNull(message = "订单类型不能为空") 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 3d9aec411..551027a4d 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 @@ -151,6 +151,7 @@ public class HardOrderController { HardAppCreateOrderDto dto = HardAppCreateOrderDto.builder() .customPrice(body.getCustomPrice()) .merchantId(body.getMerchantId()) + .walletId(body.getWalletId()) .userId(user.getId()) .hardType(HardTypeEnum.MERCHANT_QR_CODE) .orderType(HardOrderTypeEnum.BELOW) 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 8d6ee4141..bbcff44ac 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 @@ -366,7 +366,7 @@ public class HardOrderServiceImpl extends ServiceImpl