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

@@ -3,7 +3,7 @@
 
 <mapper namespace="com.xxfc.platform.tour.mapper.TourGoodVerificationMapper">
 
-	<!-- 可根据自己的需求，是否要使用 -->
+    <!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.xxfc.platform.tour.entity.TourGoodVerification" id="tourGoodVerificationMap">
         <result property="id" column="id"/>
         <result property="speId" column="spe_id"/>
@@ -16,7 +16,7 @@
     </resultMap>
 
     <update id="delVerification">
-        update  tour_good_verification set  is_del=1
+        update tour_good_verification set is_del=1
         where total_person=0 and verification_person=0
         and good_id=#{goodId}
         <if test="list!=null ">
@@ -31,61 +31,63 @@
     </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 <![CDATA[`total_person`<>0]]>
         <if test='companyId !=null'>
-           and s.company_id=#{companyId}
+            and s.company_id=#{companyId}
         </if>
         <if test="orderStatus!=null">
             and v.status=#{orderStatus}
         </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">
-             SELECT
+    <select id="getGoodList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+        SELECT
         v.good_id as goodId,
         g.`name` as goodName
-    FROM
+        FROM
         tour_good_verification v
-    LEFT JOIN tour_good g ON v.good_id = g.id
-    WHERE
+        LEFT JOIN tour_good g ON v.good_id = g.id
+        WHERE
         v.is_del = 0
-    <if test="list!=null and list.size != 0">
-             and v.site_id  in (
-             <trim suffixOverrides=",">
-                 <foreach collection="list" item="item">
-                     #{item.siteId},
-                 </foreach>
-             </trim>
-             )
-     </if>
-    GROUP BY
+        <if test="list!=null and list.size != 0">
+            and v.site_id in (
+            <trim suffixOverrides=",">
+                <foreach collection="list" item="item">
+                    #{item.siteId},
+                </foreach>
+            </trim>
+            )
+        </if>
+        GROUP BY
         v.good_id
-     </select>
+    </select>
     <!--获取路线id-->
     <select id="getSiteList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
         SELECT
         id as siteId,
         name as siteName,
         company_id as companyId
-         FROM tour_good_site
-        WHERE  is_del=0
+        FROM tour_good_site
+        WHERE is_del=0
         and type=0
         <if test="goodId!=null and goodId!='' ">
             and good_id=#{goodId}
         </if>
         <if test="companyId!=null and companyId!='' ">
-        and company_id=#{companyId}
+            and company_id=#{companyId}
         </if>
         <if test="companyList!=null and companyList.size != 0">
-            and company_id  in (
+            and company_id in (
             <trim suffixOverrides=",">
                 <foreach collection="companyList" item="id">
                     #{id},
@@ -93,33 +95,33 @@
             </trim>
             )
         </if>
-        order by  rank desc
+        order by rank desc
     </select>
     <!--获取时间-->
-     <select id="getSpeList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
+    <select id="getSpeList" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
         SELECT
-         DISTINCT
-         v.id as verificationId,
-         v.spe_id as speId,
-         p.start_time as startTime,
-         p.end_time as endTime,
-         CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time
-         FROM
-         tour_good_verification v
-         LEFT JOIN  tour_good_site s   on v.site_id=s.id
-         LEFT JOIN  tour_good_spe_price p ON v.spe_id=p.id
-         WHERE
-         v.is_del = 0 and v.good_id=#{goodId} <!--and DATEDIFF(p.start_time,NOW())>0-->
-         <if test="siteId!=null and siteId!='' ">
-             and v.site_id=#{siteId}
-         </if>
-         <if test="companyId!=null and companyId!='' ">
-             and s.company_id=#{companyId}
-         </if>
-          ORDER BY
-            p.start_time
+        DISTINCT
+        v.id as verificationId,
+        v.spe_id as speId,
+        p.start_time as startTime,
+        p.end_time as endTime,
+        CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time
+        FROM
+        tour_good_verification v
+        LEFT JOIN tour_good_site s on v.site_id=s.id
+        LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
+        WHERE
+        v.is_del = 0 and v.good_id=#{goodId} <!--and DATEDIFF(p.start_time,NOW())>0-->
+        <if test="siteId!=null and siteId!='' ">
+            and v.site_id=#{siteId}
+        </if>
+        <if test="companyId!=null and companyId!='' ">
+            and s.company_id=#{companyId}
+        </if>
+        ORDER BY
+        p.start_time
 
-     </select>
+    </select>
     <!--获取核销信息-->
     <select id="getVerification" resultType="com.xxfc.platform.tour.vo.TourVerificationInfoVo">
         SELECT
@@ -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