From 30cc11c44e8d11a8dafbd8462cff5e8e418f027e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 20 Oct 2025 18:14:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=B4=AD=E7=89=A9=E8=BD=A6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java   | 3 ++-
 .../bsd/pjcloud/hard/controller/order/HardOrderController.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java
index 7f0f61974..3e73af2fe 100644
--- a/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java
+++ b/pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java
@@ -20,8 +20,9 @@ public enum HardTypeEnum {
     READ_CARD("3", "读卡器"),
     DOOR("4", "生鲜柜"),
     MERCHANT_QR_CODE("5", "商户二维码扣款牌"),
-    OTHER("6","其他支付方式(第三方接口对接)"),
+    OTHER("6", "其他支付方式(第三方接口对接)"),
     MERCHANT_ACT("7", "商户活动"),
+    FARMER("8", "共富商城(助农)"),
     ;
     private final String type;
     private final String description;
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 c2a353b99..7b4a4af52 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,7 @@ 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.setHardType(HardTypeEnum.SUPERMARKET);
+        body.setHardType(HardTypeEnum.FARMER);
         body.setUserId(user.getId());
         body.setOrderType(HardOrderTypeEnum.FARMER);
         body.setPayType(HardPayTypeEnum.WALLET_DEFAULT);