优化行程列表

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

@@ -6,7 +6,7 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.Getter;
 
 
 /**
 /**
- * 付款状态，0-未付款，1-付款中，2-已付款，3-退款中，99-已退款
+ * 付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款
  **/
  **/
 @Getter
 @Getter
 @AllArgsConstructor
 @AllArgsConstructor

common/src/main/java/com/jumeirah/common/service/impl/StrokeServiceImpl.java

@@ -81,7 +81,8 @@ public class StrokeServiceImpl extends BaseServiceImpl<StrokeMapper, Stroke> imp
 
 
     @Override
     @Override
     public Paging<StrokeQueryVo> getStrokePageList(StrokePageParam strokePageParam) throws Exception {
     public Paging<StrokeQueryVo> getStrokePageList(StrokePageParam strokePageParam) throws Exception {
-        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
+//        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc(getLambdaColumn(Stroke::getCreateTime)));
+        Page<StrokeQueryVo> page = new PageInfo<>(strokePageParam, OrderItem.asc("s.create_time"));
 
 
         JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
         JwtToken jwtToken = (JwtToken) SecurityUtils.getSubject().getPrincipal();
 
 

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

@@ -46,7 +46,7 @@ public class StrokeQueryVo implements Serializable {
         @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
         @ApiModelProperty("行程类型，0-单程，1-往返行程，2-货运，3-医疗")
         private Integer type;
         private Integer type;
 
 
-        @ApiModelProperty("状态，0-审核中，1-进行中，2-已完成，99-取消")
+        @ApiModelProperty("付款状态，0-未付款，1-用户已付款,待审核，2-用户已付款,审核通过，3-退款中，99-已退款")
         private Integer status;
         private Integer status;
 
 
         @ApiModelProperty("价格")
         @ApiModelProperty("价格")

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

@@ -52,6 +52,7 @@
                 and s.`status` = #{param.status}
                 and s.`status` = #{param.status}
             </if>
             </if>
         </where>
         </where>
+
     </select>
     </select>
     <select id="getMcStrokePageList" parameterType="com.jumeirah.common.param.McStrokePageParam"
     <select id="getMcStrokePageList" parameterType="com.jumeirah.common.param.McStrokePageParam"
             resultType="com.jumeirah.common.vo.McStrokeQueryVo">
             resultType="com.jumeirah.common.vo.McStrokeQueryVo">