Merge branch 'renew_upgrade' into pre

netflix-dao/src/main/java/com/cyksj/mapper/OrderDonRenewRecordMapper.java

@@ -1,7 +1,7 @@
 package com.cyksj.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.cyksj.model.entity.GoodsDonSku;
+import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.OrderDonRenewRecord;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,5 +15,5 @@ import java.util.List;
  */
 public interface OrderDonRenewRecordMapper extends BaseMapper<OrderDonRenewRecord> {
 
-	GoodsDonSku getOtherRenewSku(@Param("orderId") Long orderId, @Param("months") Integer months, @Param("userIds") List<Long> userIds);
+	OrderDon getOtherRenewSku(@Param("orderId") Long orderId, @Param("months") Integer months, @Param("userIds") List<Long> userIds);
 }

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

@@ -3,6 +3,7 @@ package com.cyksj.model.entity;
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.cyksj.model.BaseEntity;
 import com.ejlchina.searcher.bean.SearchBean;
 import lombok.Data;
 
@@ -88,6 +89,11 @@ public class ChatgptUser extends BaseEntity {
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date clearPackageTime;
 
+    /**
+     * 续费升级订单id
+     */
+    private Long renewOrderId;
+
     /**
      * 目前续费规格id
      */
@@ -98,4 +104,4 @@ public class ChatgptUser extends BaseEntity {
      */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
     private Date renewExpiryTime;
-}
+}

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

@@ -1,7 +1,5 @@
 package com.cyksj.model.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -26,34 +24,13 @@ public class RenewUpgradePackage extends BaseEntity{
     /**
      * 商品规格id
      */
-    private String skuId;
+    private Long skuId;
 
     /**
      * 续费升级规格
      */
     private String upgradeSkuIds;
 
-    /**
-     * gpt类型,0.车票套餐
-     */
-    private Integer gptType;
-
-    /**
-     * 套餐价格
-     */
-    private BigDecimal price;
-
-    /**
-     * 时间限制
-     */
-    @TableField(updateStrategy = FieldStrategy.IGNORED)
-    private Long time;
-
-    /**
-     * 数量
-     */
-    private Integer num;
-
     /**
      * 备注
      */

netflix-dao/src/main/java/com/cyksj/model/views/RenewUpgradePackageView.java

@@ -40,8 +40,8 @@ public class RenewUpgradePackageView {
     /**
      * 商品规格id
      */
-    @DbField("up.sku_ids")
-    private String skuIds;
+    @DbField("up.sku_id")
+    private Long skuId;
 
     /**
      * 升级规格

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

@@ -3,8 +3,8 @@
 <mapper namespace="com.cyksj.mapper.OrderDonRenewRecordMapper">
 
 
-    <select id="getOtherRenewSku" resultType="com.cyksj.model.entity.GoodsDonSku">
-        select sku.* from (select order_id from order_don_renew_record where id != #{id}
+    <select id="getOtherRenewSku" resultType="com.cyksj.model.entity.OrderDon">
+        select o.* from (select order_id from order_don_renew_record where id != #{id}
         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

@@ -80,6 +80,8 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 			ChatgptUser chatgptUser = chatgptUserMapper.selectOne(Wrappers.lambdaQuery(ChatgptUser.class)
 					.eq(ChatgptUser::getRelationId, orderDon.getRelationId())
 					.last("limit 1"));
+			chatgptUser.setRenewSkuId(null);
+			chatgptUser.setRenewOrderId(null);
 			Long presentRenewSkuId = chatgptUser.getRenewSkuId();
 			//存在不同升级套餐
 			GoodsDonSku presentRenewSku = skuMapper.selectById(presentRenewSkuId);
@@ -91,7 +93,8 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 				GroupsTrips groupsTrips = groupsMapper.selectById(relation.getGroupsId());
 				GoodsDonSku finalSku = skuMapper.selectById(groupsTrips.getSkuId());
 				//是否存在其他续费升级
-				GoodsDonSku otherRenewSku = orderDonRenewRecordMapper.getOtherRenewSku(orderDon.getId(), presentRenewSku.getMonths(), userIdList);
+				OrderDon otherRenewOrderDon = orderDonRenewRecordMapper.getOtherRenewSku(orderDon.getId(), presentRenewSku.getMonths(), userIdList);
+				GoodsDonSku otherRenewSku = skuMapper.selectById(otherRenewOrderDon.getSkuId());
 				GoodsDonSku upgradeOrderDonSku = null;
 				Date renewExpiryTime = null;
 				//是否存在套餐升级包
@@ -122,8 +125,10 @@ public class MirrorUserCleatServiceImpl implements MirrorUserCleatService {
 							finalSku = upgradeOrderDonSku;
 						}
 					}
-					Date payTime = Optional.ofNullable(orderDon.getPayTime()).orElse(orderDon.getCreatedTime());
+					Date payTime = Optional.ofNullable(otherRenewOrderDon.getPayTime()).orElse(otherRenewOrderDon.getCreatedTime());
 					renewExpiryTime = DateUtil.offsetMonth(payTime, otherRenewSku.getMonths());
+					chatgptUser.setRenewOrderId(otherRenewOrderDon.getId());
+					chatgptUser.setRenewSkuId(otherRenewOrderDon.getSkuId());
 				}
 				//还原镜像user
 				chatgptUser.setLimitTime(finalSku.getGptLimitTime());