merge

zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -910,7 +910,7 @@
             AND o.user_id = #{userId}
             AND og.goods_id = #{goodsId}
             AND og.seven_year = #{sevenYear}
-            AND og.service_start_time <![CDATA[  >=  ]]> NOW()
-            AND og.service_end_time <![CDATA[   <=  ]]> NOW()
+            AND og.service_start_time <![CDATA[  <=  ]]> UNIX_TIMESTAMP()
+            AND og.service_end_time <![CDATA[   >=  ]]> UNIX_TIMESTAMP()
     </select>
 </mapper>