zoujiajian 2 лет назад
Родитель
Сommit
4e1a0e9160

+ 6 - 0
netflix-dao/src/main/java/com/cyksj/model/views/RenewalView.java

@@ -216,6 +216,12 @@ public class RenewalView {
     @DbIgnore
     private BigDecimal mjPackagePrice;
 
+    /**
+     * luma 套餐包最低单价
+     */
+    @DbIgnore
+    private BigDecimal lumaPackagePrice;
+
     /**
      * 用户 mj fast次数
      */

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

@@ -302,6 +302,10 @@ public class GroupRelationFrontServiceImpl implements GroupRelationFrontService
 			}
 			if (ticket.getGoodsId() == Constant.LUMA_GOODS_ID && ticket.getExpiryTime() != null) {
 				try {
+					List<UpgradePackage> upgradePackages = upgradePackageMapper.selectList(Wrappers.lambdaQuery(UpgradePackage.class).apply("JSON_CONTAINS(sku_ids,'\"" + ticket.getSkuId() + "\"')").eq(UpgradePackage::getStatus, Boolean.TRUE).eq(UpgradePackage::getDeleted, Boolean.TRUE));
+					if (CollectionUtil.isNotEmpty(upgradePackages)){
+						upgradePackages.stream().map(e -> e.getPrice().divide(BigDecimal.valueOf(e.getNum()), 2, RoundingMode.HALF_UP)).min(BigDecimal::compareTo).ifPresent(ticket::setLumaPackagePrice);
+					}
 					LumaUser lumaUser = lumaService.getLumaUser(userId, ticket.getRelationId());
 					ticket.setLumaUserNum(lumaUser.getNum());
 				} catch (Exception e) {