Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-order/xx-order-server/src/main/resources/mapper/OrderTourVerificationMapper.xml

@@ -10,7 +10,7 @@
         d.total_number as totalNumber,d.adult_num as adultNum,d.child_num as childNum
         FROM base_order o LEFT JOIN
         order_tour_detail d ON o.id=d.order_id
-        WHERE o.`type`=2 and o.`status`>2 and d.verification_id=#{verificationId}
+        WHERE o.`type`=2 and o.`status`>3 and d.verification_id=#{verificationId}
         ORDER BY  o.status
     </select>
 </mapper>
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderFindVo.java

@@ -33,7 +33,7 @@ public class TourGoodOrderFindVo extends PageParam {
      */
     @NotNull(message = "出发时间不断能空")
     @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-    private Date trvaelTime;
+    private Date travelTime;
 
     private String travelDate;
 

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/vo/TourGoodOrderVo.java

@@ -54,7 +54,7 @@ public class TourGoodOrderVo implements Serializable {
      * 总人数
      */
     @ApiModelProperty("总人数")
-    private int  headcount;
+    private int  headCount;
 
     /**
      * 已上车人数
@@ -66,7 +66,7 @@ public class TourGoodOrderVo implements Serializable {
      * 未上车人数
      */
     @ApiModelProperty("未上车人数")
-    private  int  leaveOfnum;
+    private  int  leaveOfNum;
 
     /**
      * 是否出行  '状态：0-未出行；1-已出行'

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java

@@ -42,13 +42,13 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
      */
     public PageDataVO<TourGoodOrderVo> findTourGoodOrdersPage(TourGoodOrderFindVo tourGoodOrderFindVo) {
 
-         Date trvaelTime = tourGoodOrderFindVo.getTrvaelTime();
+         Date trvaelTime = tourGoodOrderFindVo.getTravelTime();
         String dateStr = DateUtil.format(trvaelTime, "YYYY-MM-dd");
         tourGoodOrderFindVo.setTravelDate(dateStr);
         PageDataVO<TourGoodOrderVo>  tourGoodOrderVoPageDataVO= PageDataVO.pageInfo(tourGoodOrderFindVo.getPage(), tourGoodOrderFindVo.getLimit(), () -> mapper.findVerificationAll(tourGoodOrderFindVo));
         List<TourGoodOrderVo> tourGoodOrderVos = tourGoodOrderVoPageDataVO.getData();
          tourGoodOrderVos.stream().peek(tourGoodOrderVo -> {
-            tourGoodOrderVo.setLeaveOfnum(tourGoodOrderVo.getHeadcount()-tourGoodOrderVo.getTripOfNum());
+            tourGoodOrderVo.setLeaveOfNum(tourGoodOrderVo.getHeadCount()-tourGoodOrderVo.getTripOfNum());
             String startDateStr = DateUtil.format(tourGoodOrderVo.getStartDate(),"YYYY.MM.dd");
              tourGoodOrderVo.setTravelTime(startDateStr);
 

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml

@@ -31,11 +31,11 @@
     </update>
 
     <select id="findVerificationAll" resultType="com.xxfc.platform.tour.vo.TourGoodOrderVo">
-       select * from (SELECT v.id as `id`,v.total_person as `headcount`,v.status as `travelStatus`,v.verification_person as `tripOfNum`,g.name as `name`,
+       select * from (SELECT v.id as `id`,v.total_person as `headCount`,v.status as `travelStatus`,v.verification_person as `tripOfNum`,g.name as `name`,
         g.cover as `coverUrl`,p.start_time as `startDate`,s.depart_time as `startTime`FROM tour_good_verification v
         LEFT JOIN tour_good_site s ON v.site_id=s.id
         LEFT JOIN tour_good g ON v.good_id=g.id
         LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
-        WHERE s.company_id=#{companyId} and v.status=#{orderStatus} and p.start_time=#{travelDate}  ) as `goodOrder`
+        WHERE s.company_id=#{companyId} and v.status=#{orderStatus} and p.start_time=#{travelDate} ORDER BY s.depart_time ) as `goodOrder`
     </select>
 </mapper>
\ No newline at end of file