Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java

@@ -130,7 +130,7 @@ public class OrderTourVerificationBiz{
         tourDetail = tourDetailBiz.updateSelectiveByIdReT(tourDetail);
         tourFeign.updateTourGoodPersonNum(verificationId,"verification_person",total_number);
         baseOrderBiz.sendOrderMq(null,tourDetail,null, baseOrder, OrderMQDTO.ORDER_FINISH);
-        return  ObjectRestResponse.succ(tourDetail.getGoodId());
+        return  ObjectRestResponse.succ(tourDetail.getVerificationId());
     }
 
     //确定上车

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

@@ -130,5 +130,8 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
         return  ObjectRestResponse.succ(mapper.getVerification(verificationId));
     }
 
+    public TourGoodOrderVo findDetailById(Integer id){
+        return mapper.findById(id);
+    }
 
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java

@@ -68,4 +68,6 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
 
     //获取核销路线信息
     TourVerificationInfoVo  getVerification(@Param("verificationId")Integer verificationId);
+
+    TourGoodOrderVo findById(@Param("id") Integer id);
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourGoodVerificationController.java

@@ -70,4 +70,10 @@ public class TourGoodVerificationController extends BaseController<TourGoodVerif
         return baseBiz.selectDepartureStatusByVerificationId(verificationId);
     }
 
+    @GetMapping("/app/unauth/detail/{id}")
+    public ObjectRestResponse<TourGoodOrderVo> findTourGoodOrderDetail(@PathVariable(value = "id") Integer id){
+        TourGoodOrderVo tourGoodOrderVo = baseBiz.findDetailById(id);
+        return ObjectRestResponse.succ(tourGoodOrderVo);
+    }
+
 }
\ No newline at end of file

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

@@ -31,7 +31,8 @@
     </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
@@ -45,7 +46,8 @@
         </if>
         <if test="travelDate!=null">
             and p.start_time=#{travelDate}
-        </if> ORDER BY p.start_time DESC ) as `goodOrder`
+        </if>
+        ORDER BY p.start_time DESC ) as `goodOrder`
     </select>
     <!-- 获取旅游路线id-->
     <select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
@@ -142,4 +144,22 @@
         WHERE v.id=#{verificationId}
     </select>
 
+    <select id="findById" resultType="com.xxfc.platform.tour.vo.TourGoodOrderVo">
+       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
+	v.id = #{id}
+    </select>
 </mapper>
\ No newline at end of file