Merge branch 'dev-zza' into dev

jsowell-common/src/main/java/com/jsowell/common/core/domain/ykc/YKCFrameTypeCode.java

@@ -104,6 +104,12 @@ public enum YKCFrameTypeCode {
 
 	UPLOAD_PILE_FAULT_RECORD_CODE(0xDB, "上传桩端故障记录"),
 
+	PILE_APPLY_MERGE_CHARGE_CODE(0xA1, "充电桩主动申请并充充电"),
+	CONFIRM_MERGE_CHARGE_CODE(0xA2, "运营平台确认并充启动充电"),
+
+	PLATFORM_START_MERGE_CHARGE_CODE(0xA4, "运营平台远程控制并充启机"),
+	ANSWER_PLATFORM_START_MERGE_CODE(0xA3, "远程并充启机命令回复"),
+
 	// 自定义FrameType
 	PILE_LOG_OUT(9999, "充电桩退出"),
 
@@ -160,6 +166,8 @@ public enum YKCFrameTypeCode {
 		// 充电桩请求开始充电
 		START_CHARGING(REQUEST_START_CHARGING_CODE.getCode(), CONFIRM_START_CHARGING_CODE.getCode()),
 
+		START_MERGE_CHARGE(PILE_APPLY_MERGE_CHARGE_CODE.getCode(), CONFIRM_MERGE_CHARGE_CODE.getCode()),
+
 		// 交易记录
 		TRANSACTION_RECORDS(TRANSACTION_RECORDS_CODE.getCode(), TRANSACTION_RECORDS_CONFIRM_CODE.getCode()),
 		TRANSACTION_RECORDS_V13(TRANSACTION_RECORDS_OLD_VERSION_CODE.getCode(), TRANSACTION_RECORDS_CONFIRM_CODE.getCode()),
@@ -263,6 +271,8 @@ public enum YKCFrameTypeCode {
 		// 下发二维码
 		REMOTE_ISSUE_QRCODE(REMOTE_ISSUE_QRCODE_CODE.getCode(), REMOTE_ISSUE_QRCODE_ANSWER_CODE.getCode()),
 
+		START_MERGE_CHARGE_CODE(PLATFORM_START_MERGE_CHARGE_CODE.getCode(), ANSWER_PLATFORM_START_MERGE_CODE.getCode()),
+
 		// 查询工作参数
 		QUERY_PILE_WORK_PARAMS(QUERY_PILE_WORK_PARAMS_CODE.getCode(), QUERY_PILE_WORK_PARAMS_ANSWER_CODE.getCode()),
 

jsowell-common/src/main/java/com/jsowell/common/enums/ykc/OrderTypeEnum.java

@@ -0,0 +1,37 @@
+package com.jsowell.common.enums.ykc;
+
+/**
+ * 订单类型enum
+ *
+ * @author Lemon
+ * @Date 2025/6/16 13:59:20
+ */
+public enum OrderTypeEnum {
+    NORMAL_ORDER("1", "普通订单"),
+    MERGE_CHARGE_ORDER("2", "并充订单"),
+    ;
+    private String value;
+
+   private String lable;
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getLable() {
+        return lable;
+    }
+
+    public void setLable(String lable) {
+        this.lable = lable;
+    }
+
+    OrderTypeEnum(String value, String lable) {
+        this.value = value;
+        this.lable = lable;
+    }
+}

jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java

@@ -226,6 +226,8 @@ public enum ReturnCodeEnum {
 	CODE_SELECT_INFO_IS_NULL("00700001", "查询信息为空！"),
 
 	CODE_THIS_VIN_HAS_BEEN_BINDING("00700002", "该vin已被绑定，请检查!"),
+
+	CODE_THIS_VIN_INFO_IS_NULL("007000003", "未查到该vin信息！"),
     ;
 
 	private String value;