Merge branch 'renew_upgrade' into pre

# Conflicts:
#	netflix-common/src/main/java/com/cyksj/common/constant/Constant.java
#	netflix-dao/src/main/resources/mapper/OrderDonRenewRecordMapper.xml
#	netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

netflix-common/src/main/java/com/cyksj/common/constant/Constant.java

@@ -359,9 +359,4 @@ public interface Constant {
 	String month = "month";
 
 	String week = "week";
-
-	/**
-	 * 镜像GPT cookie
-	 */
-	String MIRROR_GPT_COOKIE = "nf_ticket_info";
 }

netflix-dao/src/main/resources/mapper/OrderDonRenewRecordMapper.xml

@@ -4,7 +4,7 @@
 
 
     <select id="getOtherRenewSku" resultType="com.cyksj.model.entity.OrderDon">
-        select o.* from (select order_id from order_don_renew_record where id != #{orderId}
+        select o.* from (select order_id from order_don_renew_record where order_id != #{orderId}
         and is_valid = 0
         and user_id in
         <foreach collection="userIds" item="item" open="(" separator="," close=")">

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -3791,8 +3791,6 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		}
 	}
 
-
-
 	/**
 	 * 记录续费升级的规格
 	 */