加个普通水印、推送订单纠正、水印预览和下载

src/main/resources/mapper/SourceMapper.xml

@@ -16,6 +16,10 @@
             (#{item.scenicId}, #{item.faceId}, #{item.memberId}, #{item.sourceId}, #{item.isBuy}, #{item.type}, #{item.orderId}, #{item.isFree})
         </foreach>
     </insert>
+    <insert id="addSourceWatermark">
+        insert source_watermark(source_id, face_id, watermark_type, watermark_url)
+        values (#{sourceId}, #{faceId}, #{type}, #{url})
+    </insert>
     <update id="update">
         update source
         <set>
@@ -38,11 +42,6 @@
         </set>
         where member_id = #{memberId} and face_id = #{faceId} and `type` = #{type}
     </update>
-    <update id="updateWaterUrl">
-        update member_source
-        set water_url = #{waterUrl}
-        where member_id = #{memberId} and source_id = #{sourceId} and `type` = #{type}
-    </update>
     <delete id="deleteById">
         delete from source where id = #{id}
     </delete>
@@ -130,7 +129,7 @@
         limit 1
     </select>
     <select id="listUser" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO">
-        select so.id, ms.scenic_id, device_id, url, ms.is_free, ms.water_url, so.create_time, so.update_time,sc.`name` as scenicName, ms.is_buy, video_url
+        select so.id, ms.scenic_id, device_id, url, ms.is_free, so.create_time, so.update_time,sc.`name` as scenicName, ms.is_buy, video_url
         from member_source ms
                  left join source so on ms.source_id = so.id
                  left join scenic sc on sc.id = so.scenic_id
@@ -200,4 +199,19 @@
         from source
         where id = #{id}
     </select>
+    <select id="listSourceWatermark" resultType="com.ycwl.basic.model.pc.source.entity.SourceWatermarkEntity">
+        select *
+        from source_watermark
+        where source_id in
+            <foreach collection="sourceIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            <if test="faceId == null">
+                and face_id is null
+            </if>
+            <if test="faceId != null">
+                and face_id = #{faceId}
+            </if>
+            and watermark_type = #{watermarkType}
+    </select>
 </mapper>

src/main/resources/mapper/StatisticsMapper.xml

@@ -263,4 +263,14 @@
              ) a
         order by createTime desc
     </select>
+    <select id="getUserRecentEnterType" resultType="java.lang.Long">
+        select morph_id
+        from statistics
+        where type = 10 and member_id = #{memberId}
+        <if test="endTime!= null">
+            and create_time &lt;= #{endTime}
+        </if>
+        order by create_time desc
+        limit 1
+    </select>
 </mapper>