feat:核销活动

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/HardTypeEnum.java

@@ -28,7 +28,7 @@ public enum HardTypeEnum {
     private final String description;
 
     // 是否能预定
-    public static final List<HardTypeEnum> isReserveList = List.of(SUPERMARKET, CANTEEN);
+    public static final List<HardTypeEnum> isReserveList = List.of(SUPERMARKET, CANTEEN, FARMER);
 
     // 不需要创建购物车
     public static final List<HardTypeEnum> isNoneCar = List.of(MERCHANT_QR_CODE);

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/constant/order/HardOrderTypeEnum.java

@@ -29,7 +29,7 @@ public enum HardOrderTypeEnum {
         return Arrays.stream(values()).filter(v -> ObjectUtil.equals(type, v.getType())).findFirst().get();
     }
 
-    public static final List<HardOrderTypeEnum> refundList = List.of(BELOW, RESERVE, FOREIGN_TICKET, ZY, LB);
+    public static final List<HardOrderTypeEnum> refundList = List.of(BELOW, RESERVE, FOREIGN_TICKET, ZY, LB, FARMER);
 
     public static final List<HardOrderTypeEnum> payList = List.of(BELOW, RESERVE);
 

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/dto/order/app/HardAppCreateFarmerOrderDto.java

@@ -19,7 +19,7 @@ public class HardAppCreateFarmerOrderDto {
     @NotNull(message = "购物车id不能为空")
     private Long carParentId;
 
-    @NotNull(message = "钱包类型id")
+    // @NotNull(message = "钱包类型id")
     private Long walletTypeId;
 
     @NotNull(message = "自提点id不能为空")