|
@@ -388,8 +388,8 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
if (ticket.getGoodsId() == 1 || ticket.getGoodsId() == 18 || ticket.getGoodsId() == 33l) {
|
|
if (ticket.getGoodsId() == 1 || ticket.getGoodsId() == 18 || ticket.getGoodsId() == 33l) {
|
|
|
ticket.setEmail(null);
|
|
ticket.setEmail(null);
|
|
|
}
|
|
}
|
|
|
-// //设置镜像车票信息
|
|
|
|
|
-// setMirrorTicketInfo(ticket);
|
|
|
|
|
|
|
+ //设置镜像车票信息
|
|
|
|
|
+ setMirrorTicketInfo(ticket);
|
|
|
|
|
|
|
|
// List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
// List<GroupsRelationUserView> relationUserViews = groupsRelationMapper.getUserRelationUserViews(ticket.getGroupId(), ticket.getRelationId(), ticket.getUserId(), List.of(GroupsRelation.Status.validity, GroupsRelation.Status.outside));
|
|
|
// ticket.setRelationViews(relationUserViews);
|
|
// ticket.setRelationViews(relationUserViews);
|
|
@@ -1942,14 +1942,14 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void setMirrorTicketInfo(RenewalView ticket) {
|
|
private void setMirrorTicketInfo(RenewalView ticket) {
|
|
|
- //设置MJ镜像信息
|
|
|
|
|
- setMjMirrorInfo(ticket);
|
|
|
|
|
|
|
+//// //设置MJ镜像信息
|
|
|
|
|
+// setMjMirrorInfo(ticket);
|
|
|
//设置GPT镜像信息
|
|
//设置GPT镜像信息
|
|
|
setGptMirrorInfo(ticket);
|
|
setGptMirrorInfo(ticket);
|
|
|
- //clause pro
|
|
|
|
|
- setClaudeProInfo(ticket);
|
|
|
|
|
- //luma
|
|
|
|
|
- setLumaInfo(ticket);
|
|
|
|
|
|
|
+//// //clause pro
|
|
|
|
|
+// setClaudeProInfo(ticket);
|
|
|
|
|
+//// //luma
|
|
|
|
|
+// setLumaInfo(ticket);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
private void setMjMirrorInfo(RenewalView ticket) {
|
|
private void setMjMirrorInfo(RenewalView ticket) {
|
|
@@ -1995,34 +1995,34 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
|
|
|
ticket.setUserToken(userInfo.getUserToken());
|
|
ticket.setUserToken(userInfo.getUserToken());
|
|
|
ticket.setUse(userInfo.getUse());
|
|
ticket.setUse(userInfo.getUse());
|
|
|
ticket.setModel(userInfo.getModel());
|
|
ticket.setModel(userInfo.getModel());
|
|
|
- Integer count = upgradePackageMapper.selectCount(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\"" + ticket.getSkuId() + "\"')")
|
|
|
|
|
- .gt(UpgradePackage::getNum, userInfo.getLimitNum())
|
|
|
|
|
- .eq(UpgradePackage::getStatus, Boolean.TRUE)
|
|
|
|
|
- .eq(UpgradePackage::getGptType, 0)
|
|
|
|
|
- .eq(UpgradePackage::getDeleted, Boolean.TRUE));
|
|
|
|
|
- ticket.setUpgrade(count > 0 ? true : false);
|
|
|
|
|
- ticket.setPackageId(userInfo.getPackageId());
|
|
|
|
|
- if (userInfo.getPackageId() != 0) {
|
|
|
|
|
- UpgradePackage upgradePackage = upgradePackageMapper.selectById(userInfo.getPackageId());
|
|
|
|
|
- ticket.setPackagePrice(upgradePackage.getPrice());
|
|
|
|
|
- Long upgradeOrderDonSkuId = upgradePackage.getUpgradeSkuId();
|
|
|
|
|
- GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, upgradeOrderDonSkuId).build());
|
|
|
|
|
- renewSku.setPackageId(userInfo.getPackageId());
|
|
|
|
|
- ticket.setRenewSku(renewSku);
|
|
|
|
|
- }
|
|
|
|
|
- ticket.setIsRenewPackage(userInfo.getIsRenewPackage());
|
|
|
|
|
- Long renewSkuId = userInfo.getRenewSkuId();
|
|
|
|
|
- if (renewSkuId != null) {
|
|
|
|
|
- GoodsDonSkuRenewView upgradeSkuRenewView = ticket.getRenewSku();
|
|
|
|
|
- GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());
|
|
|
|
|
- //续费升级是更高级规格
|
|
|
|
|
- if (upgradeSkuRenewView == null || (renewSku.getGptUserLimitNum() >= upgradeSkuRenewView.getGptUserLimitNum() && renewSku.getMonths() >= userInfo.getMonths())) {
|
|
|
|
|
- Optional.ofNullable(orderDonRenewRecordMapper.selectOne(Wrappers.lambdaQuery(OrderDonRenewRecord.class)
|
|
|
|
|
- .eq(OrderDonRenewRecord::getOrderId, userInfo.getRenewOrderId())
|
|
|
|
|
- .last("limit 1"))).ifPresent(e -> renewSku.setOriginalOrderId(e.getOrderId()));
|
|
|
|
|
- ticket.setRenewSku(renewSku);
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+// Integer count = upgradePackageMapper.selectCount(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\"" + ticket.getSkuId() + "\"')")
|
|
|
|
|
+// .gt(UpgradePackage::getNum, userInfo.getLimitNum())
|
|
|
|
|
+// .eq(UpgradePackage::getStatus, Boolean.TRUE)
|
|
|
|
|
+// .eq(UpgradePackage::getGptType, 0)
|
|
|
|
|
+// .eq(UpgradePackage::getDeleted, Boolean.TRUE));
|
|
|
|
|
+// ticket.setUpgrade(count > 0 ? true : false);
|
|
|
|
|
+// ticket.setPackageId(userInfo.getPackageId());
|
|
|
|
|
+// if (userInfo.getPackageId() != 0) {
|
|
|
|
|
+// UpgradePackage upgradePackage = upgradePackageMapper.selectById(userInfo.getPackageId());
|
|
|
|
|
+// ticket.setPackagePrice(upgradePackage.getPrice());
|
|
|
|
|
+// Long upgradeOrderDonSkuId = upgradePackage.getUpgradeSkuId();
|
|
|
|
|
+// GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, upgradeOrderDonSkuId).build());
|
|
|
|
|
+// renewSku.setPackageId(userInfo.getPackageId());
|
|
|
|
|
+// ticket.setRenewSku(renewSku);
|
|
|
|
|
+// }
|
|
|
|
|
+// ticket.setIsRenewPackage(userInfo.getIsRenewPackage());
|
|
|
|
|
+// Long renewSkuId = userInfo.getRenewSkuId();
|
|
|
|
|
+// if (renewSkuId != null) {
|
|
|
|
|
+// GoodsDonSkuRenewView upgradeSkuRenewView = ticket.getRenewSku();
|
|
|
|
|
+// GoodsDonSkuRenewView renewSku = beanSearcher.searchFirst(GoodsDonSkuRenewView.class, MapUtils.builder().field(GoodsDonSkuRenewView::getSkuId, renewSkuId).build());
|
|
|
|
|
+// //续费升级是更高级规格
|
|
|
|
|
+// if (upgradeSkuRenewView == null || (renewSku.getGptUserLimitNum() >= upgradeSkuRenewView.getGptUserLimitNum() && renewSku.getMonths() >= userInfo.getMonths())) {
|
|
|
|
|
+// Optional.ofNullable(orderDonRenewRecordMapper.selectOne(Wrappers.lambdaQuery(OrderDonRenewRecord.class)
|
|
|
|
|
+// .eq(OrderDonRenewRecord::getOrderId, userInfo.getRenewOrderId())
|
|
|
|
|
+// .last("limit 1"))).ifPresent(e -> renewSku.setOriginalOrderId(e.getOrderId()));
|
|
|
|
|
+// ticket.setRenewSku(renewSku);
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|