多环境

src/main/resources/mapper/DeviceMapper.xml

@@ -52,7 +52,7 @@
         delete from device where id = #{id}
     </delete>
     <select id="list" resultType="com.ycwl.basic.model.pc.device.resp.DeviceRespVO">
-        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at
+        select d.id, scenic_id, d.name, no, d.longitude, d.latitude, d.status, create_at, d.update_at, s.name scenic_name, d.keepalive_at, d.online
         from device d
         left join scenic s on d.scenic_id = s.id
         <where>

src/main/resources/mapper/OrderMapper.xml

@@ -50,6 +50,7 @@
         <result column="create_at" property="createAt"/>
         <result column="update_at" property="updateAt"/>
         <result column="coverUrl" property="coverUrl"/>
+        <result column="shootingTime" property="shootingTime"/>
         <collection property="orderItemList" select="getOrderItemList" column="id" ofType="com.ycwl.basic.model.pc.order.resp.OrderItemVO">
             <result column="oiId" property="id"/>
             <result column="orderId" property="orderId"/>
@@ -278,7 +279,7 @@
     </select>
     <select id="appList" resultMap="AppBaseResultMap">
         select DISTINCT  o.id, o.member_id,m.nickname ,m.real_name , o.openid, o.price, pay_price, remark, o.broker_id, o.promo_code,
-        refund_reason, refund_status, o.`status`, refund_at, pay_at, cancel_at, o.goods_type,
+        refund_reason, refund_status, o.`status`, o.create_at, refund_at, pay_at, cancel_at, o.goods_type, vd.create_time shootingTime,
         t.cover_url coverUrl
         from `order`  AS o
         left join member m on o.member_id = m.id

src/main/resources/mapper/SourceMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ycwl.basic.mapper.SourceMapper">
     <insert id="add">
-        insert into source(id, scenic_id, device_id, member_id, url, video_url, `type`, face_sample_id)
-        values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}, #{videoUrl}, #{type}, #{faceSampleId})
+        insert into source(id, scenic_id, device_id, member_id, url, video_url, `type`, face_sample_id, pos_json)
+        values (#{id}, #{scenicId}, #{deviceId}, #{memberId}, #{url}, #{videoUrl}, #{type}, #{faceSampleId}, #{posJson})
     </insert>
     <update id="update">
         update source
@@ -16,6 +16,7 @@
             <if test="isBuy!=null">is_buy = #{isBuy}, </if>
             <if test="type!=null">`type` = #{type}, </if>
             <if test="faceSampleId!= null">face_sample_id = #{faceSampleId}, </if>
+            <if test="posJson!= null">pos_json = #{posJson}, </if>
         </set>
             where id = #{id}
     </update>
@@ -80,4 +81,10 @@
         </foreach>
         and type = 1
     </select>
+    <select id="findBySampleId" resultType="com.ycwl.basic.model.pc.source.entity.SourceEntity">
+        select *
+        from source
+        where type = 2 and face_sample_id = #{faceSampleId}
+        limit 1
+    </select>
 </mapper>

src/main/resources/mapper/VideoMapper.xml

@@ -49,7 +49,7 @@
     </select>
     <select id="getById" resultType="com.ycwl.basic.model.pc.video.resp.VideoRespVO">
         select v.id, v.scenic_id, member_id, template_id, task_id, worker_id, video_url, v.create_time, v.update_time,
-        t.name templateName,t.price templatePrice,v.is_buy isBuy,
+        t.name templateName,t.price templatePrice,v.is_buy isBuy, t.cover_url templateCoverUrl,
         s.name scenicName
         from video v
         left join scenic s on v.scenic_id = s.id