1.添加付款状态;

2.审核状态

common/src/main/java/com/jumeirah/common/entity/Stroke.java

@@ -142,4 +142,12 @@ public class Stroke extends BaseEntity {
     @ApiModelProperty("用户选择机型")
     @ApiModelProperty("用户选择机型")
     private Long choosePlainType;
     private Long choosePlainType;
 
 
+    @NotNull(message = "付款状态不能为空")
+    @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+
+    @NotNull(message = "审核状态不能为空")
+    @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
+    private Integer auditStatus;
+
 }
 }

common/src/main/java/com/jumeirah/common/enums/StateAuditStatusEnum.java

+
+package com.jumeirah.common.enums;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 审核状态,0审核中,1审核通过,2审核未通过
+ **/
+@Getter
+@AllArgsConstructor
+public enum StateAuditStatusEnum implements BaseEnum {
+
+
+    /**
+     * 0审核中
+     **/
+    UNDER_REVIEW(0, "0审核中"),
+    /**
+     * 1审核通过
+     **/
+    PASSED(1, "1审核通过"),
+    /**
+     * 2审核未通过
+     **/
+    FAILED_THE_AUDIT(2, "2审核未通过");
+
+    private final Integer code;
+    private final String desc;
+
+}

common/src/main/java/com/jumeirah/common/enums/StatePaymentStatusEnum.java

+
+package com.jumeirah.common.enums;
+
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款
+ **/
+@Getter
+@AllArgsConstructor
+public enum StatePaymentStatusEnum implements BaseEnum {
+
+//    0-UNPAID, 1-PAYING, 2-PAID, 3-REFUNDING, 99-REFUNDED
+
+    /**
+     * 未付款
+     **/
+    UNPAID(0, "未付款"),
+    /**
+     * 付款中
+     **/
+    PAYING(1, "付款中"),
+    /**
+     * 已付款
+     **/
+    PAID(2, "已付款"),
+    /**
+     * 退款中
+     **/
+    REFUNDING(3, "退款中"),
+    /**
+     * 已退款
+     **/
+    REFUNDED(99, "已退款");
+
+    private final Integer code;
+    private final String desc;
+
+}

common/src/main/java/com/jumeirah/common/enums/StrokeStatusEnum.java

 package com.jumeirah.common.enums;
 package com.jumeirah.common.enums;
 
 
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
 /**
  * 状态，0-审核中，1-进行中，2-已完成，99-取消
  * 状态，0-审核中，1-进行中，2-已完成，99-取消
  */
  */
-public enum StrokeStatusEnum {
+@Getter
+@AllArgsConstructor
+public enum StrokeStatusEnum implements BaseEnum {
 
 
     UNDER_REVIEW(0, "审核中"),
     UNDER_REVIEW(0, "审核中"),
     PROCESSING(1, "进行中"),
     PROCESSING(1, "进行中"),
@@ -13,16 +19,11 @@ public enum StrokeStatusEnum {
     /**
     /**
      * 编号
      * 编号
      */
      */
-    private final Integer id;
+    private final Integer code;
     /**
     /**
      * 名称
      * 名称
      */
      */
-    private final String name;
-
-    StrokeStatusEnum(Integer id, String name) {
+    private final String desc;
 
 
-        this.id = id;
-        this.name = name;
 
 
-    }
 }
 }

common/src/main/java/com/jumeirah/common/enums/StrokeTypeEnum.java

 package com.jumeirah.common.enums;
 package com.jumeirah.common.enums;
 
 
+import io.geekidea.springbootplus.framework.common.enums.BaseEnum;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
 /**
 /**
  * 行程类型，0-单程，1-往返行程，2-货运，3-医疗
  * 行程类型，0-单程，1-往返行程，2-货运，3-医疗
  */
  */
-public enum StrokeTypeEnum {
+@Getter
+@AllArgsConstructor
+public enum StrokeTypeEnum implements BaseEnum {
 
 
     ONE_WAY(0, "单程"),
     ONE_WAY(0, "单程"),
     ROUND_TRIP(1, "往返"),
     ROUND_TRIP(1, "往返"),
@@ -13,16 +19,10 @@ public enum StrokeTypeEnum {
     /**
     /**
      * 编号
      * 编号
      */
      */
-    private final Integer id;
+    private final Integer code;
     /**
     /**
      * 名称
      * 名称
      */
      */
-    private final String name;
-
-    StrokeTypeEnum(Integer id, String name) {
-
-        this.id = id;
-        this.name = name;
+    private final String desc;
 
 
-    }
 }
 }

common/src/main/java/com/jumeirah/common/param/StrokePageParam.java

@@ -22,7 +22,7 @@ import lombok.experimental.Accessors;
 public class StrokePageParam extends BasePageOrderParam {
 public class StrokePageParam extends BasePageOrderParam {
         private static final long serialVersionUID = 1L;
         private static final long serialVersionUID = 1L;
 
 
-        @ApiModelProperty("行程状态，-1=全部, 0-审核中，1-进行中，2-已完成")//99-取消
+        @ApiModelProperty(value = "行程状态，-1=全部, 0-审核中，1-进行中，2-已完成", required = true)//99-取消
         private Integer status;
         private Integer status;
 
 
 }
 }

common/src/main/java/com/jumeirah/common/vo/StrokeDetailVo.java

@@ -147,4 +147,12 @@ public class StrokeDetailVo implements Serializable {
     @ApiModelProperty("商家名称")
     @ApiModelProperty("商家名称")
     private String merchantName;
     private String merchantName;
 
 
+    @NotNull(message = "付款状态不能为空")
+    @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+    private Integer paymentStatus;
+
+    @NotNull(message = "审核状态不能为空")
+    @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
+    private Integer auditStatus;
+
 }
 }
\ No newline at end of file

common/src/main/java/com/jumeirah/common/vo/StrokeQueryVo.java

@@ -74,4 +74,12 @@ public class StrokeQueryVo implements Serializable {
         @NotBlank(message = "返程到达机场名称不能为空")
         @NotBlank(message = "返程到达机场名称不能为空")
         @ApiModelProperty("返程到达机场名称")
         @ApiModelProperty("返程到达机场名称")
         private String backArriveAirportName;
         private String backArriveAirportName;
+
+        @NotNull(message = "付款状态不能为空")
+        @ApiModelProperty("付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款")
+        private Integer paymentStatus;
+
+        @NotNull(message = "审核状态不能为空")
+        @ApiModelProperty("审核状态,0审核中,1审核通过,2审核未通过")
+        private Integer auditStatus;
 }
 }
\ No newline at end of file

common/src/main/resources/mapper/StrokeMapper.xml

@@ -17,15 +17,15 @@
         STATUS,
         STATUS,
         money,
         money,
         user_id,
         user_id,
-        mu.username AS merchantName
-        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
+        mu.username AS merchantName,
+        outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
 
 
    </sql>
    </sql>
 
 
     <!-- 通用查询结果列 -->
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
     <sql id="Base_Column_List">
         id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
         id, city_outset_id, deleted, city_outset_name, city_arrive_id, city_arrive_name, people_mun, plain_type_id, outset_time, return_time, type, status, create_time, update_time, goods_name, goods_size, goods_weight, disease_name, instruments, medical_persons, remarks, money, user_id
-        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name
+        ,outset_airport_name,arrive_airport_name,arrive_plain_type_id,back_outset_airport_name,back_arrive_airport_name,payment_status,audit_status
     </sql>
     </sql>
 
 
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">
     <select id="getStrokeById" resultType="com.jumeirah.common.vo.StrokeDetailVo">