zoujiajian 2 ani în urmă
părinte
comite
3bb5c7d355

+ 5 - 0
netflix-dao/src/main/java/com/cyksj/model/views/ChatGptUserView.java

@@ -80,4 +80,9 @@ public class ChatGptUserView {
      * 续费升级规格id
      */
     private Long renewSkuId;
+
+    /**
+     * 续费升级订单id
+     */
+    private Long renewOrderId;
 }

+ 1 - 0
netflix-service/src/main/java/com/cyksj/service/chatgpt/impl/ChatGptAccountServiceImpl.java

@@ -844,6 +844,7 @@ public class ChatGptAccountServiceImpl implements ChatGptAccountService {
                     .packagePrice(packagePrice)
                     .isRenewPackage(chatgptUser.getRenewOrderId() != null ? true : false)
                     .renewSkuId(chatgptUser.getRenewSkuId())
+                    .renewOrderId(chatgptUser.getRenewOrderId())
                     .build();
         } else {
             throw BusinessRuntimeException.getInstance("您还未购买该车票");

+ 5 - 0
netflix-service/src/main/java/com/cyksj/service/relation/impl/GroupRelationFrontServiceImpl.java

@@ -150,6 +150,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 
 	private final UserDistributePosterRecordMapper userDistributePosterRecordMapper;
 
+	private final OrderDonRenewRecordMapper orderDonRenewRecordMapper;
+
 	@Override
 	public SearchResult<RenewalView> getMyTicket(long userId, Boolean isLoginPopularize, String customId, String account) {
 		User u = userMapper.selectById(userId);
@@ -312,6 +314,9 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 					Long renewSkuId = userInfo.getRenewSkuId();
 					if (renewSkuId != null) {
 						GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());
+						Optional.ofNullable(orderDonRenewRecordMapper.selectOne(Wrappers.lambdaQuery(OrderDonRenewRecord.class)
+								.eq(OrderDonRenewRecord::getOrderId, userInfo.getRenewOrderId())
+								.last("limit 1"))).ifPresent(e -> renewSku.setPackageId(e.getPackageId()));
 						ticket.setRenewSku(renewSku);
 					}
 				} catch (Exception e) {