feat:钱包记账扣款记录

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

@@ -19,12 +19,16 @@ public enum HardTypeEnum {
     CANTEEN("2", "食堂"),
     READ_CARD("3", "读卡器"),
     DOOR("4", "生鲜柜"),
+    MERCHANT_QR_CODE("5", "商户二维码扣款牌"),
     ;
     private final String type;
     private final String description;
 
     // 是否能预定
-    private static final List<HardTypeEnum> isReserveList = List.of(SUPERMARKET, CANTEEN);
+    public static final List<HardTypeEnum> isReserveList = List.of(SUPERMARKET, CANTEEN);
+
+    // 不需要创建购物车
+    public static final List<HardTypeEnum> isNoneCar = List.of(MERCHANT_QR_CODE);
 
     public static Boolean isReserve(HardTypeEnum type) {
         return isReserveList.contains(type);

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

@@ -15,6 +15,7 @@ import java.util.Arrays;
 public enum HardPayTypeEnum {
     WALLET_DEFAULT("1", "普通钱包支付"),
     WALLET_QR_CODE("2", "钱包二维码支付"),
+    WALLET_QR_CODE_SCAN("22", "钱包扫一扫支付"),
     WALLET_CARD("3", "钱包饭卡支付"),
     FACE("4", "人脸识别支付"),
     STRIDE_DEPT_QR_CODE("5", "跨单位二维码支付"),

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

@@ -0,0 +1,18 @@
+package com.bsd.pjcloud.hard.api.dto.app;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Data
+public class HardAppCreateOrderScancode {
+
+    @Schema(description = "商户id")
+    @NotNull(message = "商户id不能为空")
+    private Long merchantId;
+
+    @Schema(description = "用户输入的价格")
+    @NotNull(message = "自定义金额不能为空")
+    private Integer customPrice;
+
+}

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

@@ -4,6 +4,7 @@ import com.bsd.pjcloud.hard.api.constant.HardTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardOrderTypeEnum;
 import com.bsd.pjcloud.hard.api.constant.order.HardPayTypeEnum;
 import com.bsd.pjcloud.wallet.api.constant.WalletTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -16,7 +17,6 @@ import lombok.NoArgsConstructor;
 @Data
 public class HardAppCreateOrderDto {
 
-    @NotNull(message = "父订单id不能为空")
     private Long carParentId;
 
     @NotNull(message = "用户id不能为空")
@@ -36,4 +36,10 @@ public class HardAppCreateOrderDto {
 
     private Long orderSourceTypeId;
 
+    // 用户自定义的价格(分)不是通过计算购物车总价得来的
+    private Integer customPrice;
+
+    // 商户id
+    private Long merchantId;
+
 }