Merge remote-tracking branch 'origin/pre' into pre

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

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=")">
@@ -13,5 +13,7 @@
         and o.status not in ('close','noPayment','refund')
         and o.order_type = 2 and o.relation_id = #{relationId}
         inner join goods_don_sku sku on sku.id = o.sku_id
+        order by sku.months desc,sku.gpt_limit_num desc
+        limit 1
     </select>
 </mapper>

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

@@ -1376,10 +1376,12 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
                     .eq(ChatgptUser::getRelationId, orderDon.getRelationId())
                     .last("limit 1"));
             Long presentRenewSkuId = chatgptUser.getRenewSkuId();
-            //存在不同升级套餐
-            GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
-            if (!ObjectUtil.equal(presentRenewSkuId, skuId)) {
-                throw BusinessRuntimeException.getInstance("请先退掉用户目前续费升级的{0}规格", presentRenewSku.getSpecVal());
+            if (presentRenewSkuId != null) {
+                //存在不同升级套餐
+                GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
+                if (!ObjectUtil.equal(presentRenewSkuId, skuId)) {
+                    throw BusinessRuntimeException.getInstance("请先退掉用户目前续费升级的{0}规格", presentRenewSku.getSpecVal());
+                }
             }
         }
     }

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

@@ -78,8 +78,9 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 					.eq(ChatgptUser::getRelationId, orderDon.getRelationId())
 					.last("limit 1"));
 			Long presentRenewSkuId = chatgptUser.getRenewSkuId();
-			//存在不同升级套餐
-			GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
+			if (presentRenewSkuId == null) {
+				return;
+			}
 			GroupsRelation relation = groupsRelationMapper.selectById(orderDon.getRelationId());
 			GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
 			GoodsDonSku finalSku = skuMapper.selectById(groupsTrips.getSkuId());

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

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

netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -49,6 +49,7 @@ import com.ejlchina.searcher.BeanSearcher;
 import com.ejlchina.searcher.SearchResult;
 import com.ejlchina.searcher.operator.LessEqual;
 import com.ejlchina.searcher.param.Operator;
+import com.ejlchina.searcher.util.MapBuilder;
 import com.ejlchina.searcher.util.MapUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -920,8 +921,14 @@ public class GroupRelationController {
         List<RenewUpgradePackageFrontView> renewUpgradePackageFrontViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.class, MapUtils.builder().field(RenewUpgradePackageFrontView::getSkuId, skuId).build());
         renewUpgradePackageFrontViews.forEach(renew -> {
             try {
-                List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, MapUtils.builder()
-                        .field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterThan)
+                //年付展示
+                MapBuilder builder = MapUtils.builder();
+                if (minMonths.get() == 12) {
+                    builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterEqual);
+                }else {
+                    builder.field(RenewUpgradePackageFrontView.RenewSkuView::getMonths, minMonths.get()).op(Operator.GreaterThan);
+                }
+                List<RenewUpgradePackageFrontView.RenewSkuView> renewSkuViews = beanSearcher.searchAll(RenewUpgradePackageFrontView.RenewSkuView.class, builder
                         .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitNum, minNum.get()).op(Operator.GreaterEqual)
                         .field(RenewUpgradePackageFrontView.RenewSkuView::getGptLimitTime, minTime.get()).op(LessEqual.class)
                         .field(RenewUpgradePackageFrontView.RenewSkuView::getSkuId, Jsons.parseList(renew.getUpgradeSkuIds(), Long.class)).op(Operator.InList)