Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

# Conflicts:
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderPileOccupyService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPileOccupyServiceImpl.java

jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyPayStatusEnum.java

@@ -0,0 +1,52 @@
+package com.jsowell.common.enums.uniapp;
+
+/**
+ * 占桩订单支付状态enum
+ *
+ * @author Lemon
+ * @Date 2023/8/18 9:49
+ */
+public enum OrderPileOccupyPayStatusEnum {
+    UN_PAY("0", "未支付"),
+    PAYMENT_COMPLETION("1", "未支付"),
+    NO_PAYMENT_REQUIRED("2", "无需支付"),
+    ;
+
+    private String code;
+    private String value;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    OrderPileOccupyPayStatusEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    /**
+     * 根据code获取value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(String code) {
+        for (OrderPileOccupyPayStatusEnum item : OrderPileOccupyPayStatusEnum.values()) {
+            if (item.getCode().equals(code)) {
+                return item.getValue();
+            }
+        }
+        return null;
+    }
+}

jsowell-common/src/main/java/com/jsowell/common/enums/uniapp/OrderPileOccupyStatusEnum.java

@@ -0,0 +1,52 @@
+package com.jsowell.common.enums.uniapp;
+
+/**
+ * 占桩订单enum
+ *
+ * @author Lemon
+ * @Date 2023/8/18 9:41
+ */
+public enum OrderPileOccupyStatusEnum {
+    OCCUPIED("0", "占桩中"),
+    ORDER_COMPLETE("1", "订单完成"),
+    ORDER_HANG_UP("2", "订单挂起"),
+    ;
+
+    private String code;
+    private String value;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    OrderPileOccupyStatusEnum(String code, String value) {
+        this.code = code;
+        this.value = value;
+    }
+
+    /**
+     * 根据code获取value
+     * @param code
+     * @return
+     */
+    public static String getValueByCode(String code) {
+        for (OrderPileOccupyStatusEnum item : OrderPileOccupyStatusEnum.values()) {
+            if (item.getCode().equals(code)) {
+                return item.getValue();
+            }
+        }
+        return null;
+    }
+}