Merge branch 'renew_upgrade' into pre

netflix-dao/src/main/java/com/cyksj/model/entity/OrderDonRenewRecord.java

@@ -23,4 +23,9 @@ public class OrderDonRenewRecord extends BaseEntity{
 	private Long packageId;
 
 	private BigDecimal discount;
+
+	/**
+	 * 是否过期，默认false
+	 */
+	private Boolean isValid;
 }

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

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

netflix-service/src/main/java/com/cyksj/service/mange/impl/MirrorUserCleatServiceImpl.java

@@ -127,6 +127,10 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			chatgptUser.setRenewExpiryTime(renewExpiryTime);
 			chatgptUserMapper.updateById(chatgptUser);
 			log.info("还原镜像gptuser套餐成功");
+
+			//将续费有效置为过期
+			orderDonRenewRecord.setIsValid(true);
+			orderDonRenewRecordMapper.updateById(orderDonRenewRecord);
 		}
 	}
 }