bug修复

src/main/resources/mapper/FaceSampleMapper.xml

@@ -101,4 +101,9 @@
         from face_sample
         where id = #{id}
     </select>
+    <select id="listEntity" resultType="com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity">
+        select *
+        from face_sample
+        where scenic_id = #{scenicId} and create_at &lt;= #{endDate}
+    </select>
 </mapper>

src/main/resources/mapper/OrderMapper.xml

@@ -70,7 +70,7 @@
                      LEFT JOIN video v ON mv.video_id = v.id
         ),
              member_source_data AS (
-                 SELECT ms.member_id, ms.source_id, ms.face_id, f.face_url, s.video_url, s.url
+                 SELECT ms.member_id, ms.type, ms.source_id, ms.face_id, f.face_url, s.video_url, s.url
                  FROM member_source ms
                           LEFT JOIN face f ON ms.face_id = f.id
                           LEFT JOIN source s ON ms.source_id = s.id
@@ -79,6 +79,7 @@
             oi.id AS oiId,
             oi.order_id AS orderId,
             oi.goods_id,
+            msd.source_id,
             sc.id AS scenic_id,
             sc.name AS scenic_name,
             CASE oi.goods_type
@@ -113,7 +114,7 @@
                  LEFT JOIN `order` o ON oi.order_id = o.id
                  LEFT JOIN scenic sc ON o.scenic_id = sc.id
                  LEFT JOIN member_video_data mvd ON o.member_id = mvd.member_id AND oi.goods_id = mvd.video_id
-                 LEFT JOIN member_source_data msd ON o.member_id = msd.member_id AND oi.goods_id = msd.face_id
+                 LEFT JOIN member_source_data msd ON o.member_id = msd.member_id AND oi.goods_id = msd.face_id AND msd.type = oi.goods_type
         WHERE oi.order_id = #{id};
     </select>
 

src/main/resources/mapper/ScenicMapper.xml

@@ -92,7 +92,9 @@
             template_new_video_type=#{templateNewVideoType},
             anti_screen_record_type=#{antiScreenRecordType},
             disable_source_video=#{disableSourceVideo},
-            disable_source_image=#{disableSourceImage}
+            disable_source_image=#{disableSourceImage},
+            video_source_store_day=#{videoSourceStoreDay},
+            image_source_store_day=#{imageSourceStoreDay}
         </set>
         where id = #{id}
     </update>

src/main/resources/mapper/SourceMapper.xml

@@ -121,7 +121,7 @@
             <if test="isBuy!=null">and ms.is_buy = #{isBuy} </if>
             <if test="type!=null">and ms.type = #{type} </if>
             <if test="faceId!=null">and ms.face_id = #{faceId} </if>
-        order by so.create_time desc
+        order by so.create_time asc
     </select>
 
     <select id="listUserOne" resultType="com.ycwl.basic.model.pc.source.resp.SourceRespVO">

src/main/resources/mapper/StatisticsMapper.xml

@@ -40,7 +40,7 @@
         FROM (
             select count(1) as count
             from statistics
-            where type=0 and scenic_id = #{scenicId}
+            where type=10 and morph_id in (1047,1048,1049) and scenic_id = #{scenicId}
             <if test="startTime!= null">
                 and create_time >= #{startTime}
             </if>
@@ -169,7 +169,7 @@
         FROM (
             select count(1) as count
             from statistics
-            where type in (0,10) and scenic_id = #{scenicId}
+            where type in (10) and scenic_id = #{scenicId}
             <if test="startTime!= null">
                 and create_time >= #{startTime}
             </if>