zoujiajian hace 11 meses
padre
commit
466d8544b0
Se han modificado 1 ficheros con 17 adiciones y 2 borrados
  1. 17 2
      netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

+ 17 - 2
netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -416,7 +416,21 @@
     </select>
 
     <select id="selectUserTickets" resultType="com.cyksj.model.views.UserTicketView">
-        select gr.id as relation_id,gr.user_id,g.id as goods_id,gt.sku_id,g.title,gdk.spec_val,gr.expiry_time,gdk.is_mirror,gdk.gpt_limit_num as gptUserLimitNum,gdk.gpt_limit_time as gptUserLimitTime,gdk.num as skuNum from groups_relation gr left join groups_trips gt on gt.id = gr.groups_id
+        select gr.id as relation_id,
+        gr.user_id,
+        g.id as goods_id,
+        gt.sku_id,
+        g.title,
+        gdk.spec_val,
+        gr.expiry_time,
+        gdk.is_mirror,
+        gdk.gpt_limit_num as gptUserLimitNum,
+        gdk.gpt_limit_time as gptUserLimitTime,
+        gdk.num as skuNum,
+        gr.is_frozen,
+        gr.unfrozen_time,
+        gr.reserved_days
+        from groups_relation gr left join groups_trips gt on gt.id = gr.groups_id
         left join goods_don_sku gdk on gdk.id = gt.sku_id left join goods_don g on g.id = gdk.goods_id
         where gr.user_id in
         <foreach collection="userIds" item="item" open="(" separator="," close=")">
@@ -425,7 +439,8 @@
         and gr.status in ('validity','outside')
         and gr.cmt != 2
         and gr.is_vip = 0
-        and (gr.expiry_time is null or gr.expiry_time > now() or (gdk.is_mirror and gr.expiry_time > DATE_ADD(now(),interval -7 day)))
+        and (gr.expiry_time is null or gr.expiry_time > now() or (gdk.is_mirror and gr.expiry_time >
+        DATE_ADD(now(),interval -7 day)))
         <if test="goodsId != null">
             and g.id = #{goodsId}
         </if>