fix

netflix-service/src/main/java/com/cyksj/service/vip/impl/VipFrontServiceImpl.java

@@ -219,7 +219,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 				}
 			} else if (goodsId == Constant.LUMA_GOODS_ID || goodsId == Constant.NANO_GOODS_ID) {
 				//luma、nano
-				deductMoney = deductMoney.add(getGeneralRemainNumDeductMoney(relationId, goodsId, skuId, userIdList));
+				deductMoney = deductMoney.add(getGeneralRemainNumDeductMoney(relationId, goodsId, skuId, userIdList, relation.getStartTime()));
 			} else if (goodsId == Constant.MIDJOURNEY_GOODS_ID) {
 				//mj
 				deductMoney = deductMoney.add(getMjRemainNumDeductMoney(relationId, skuId, userIdList, relation.getStartTime()));
@@ -425,7 +425,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 	/**
 	 * 获取普通剩余次数可抵扣金额
 	 */
-	private BigDecimal getGeneralRemainNumDeductMoney(Long relationId, Long goodsId, Long skuId, List<Long> userIdList) {
+	private BigDecimal getGeneralRemainNumDeductMoney(Long relationId, Long goodsId, Long skuId, List<Long> userIdList, Date relationStartTime) {
 		BigDecimal deductMoney = BigDecimal.ZERO;
 		BigDecimal orderTotalMoney = BigDecimal.ZERO;
 		//总次数
@@ -461,7 +461,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 			}
 		}
 		//加量包订单
-		List<UpgradeOrderDon> upgradeOrderDons = upgradeOrderDonMapper.selectList(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getRelationId, relationId).in(UpgradeOrderDon::getUserId, userIdList).notIn(UpgradeOrderDon::getStatus, Constant.noOrderAllStatus));
+		List<UpgradeOrderDon> upgradeOrderDons = upgradeOrderDonMapper.selectList(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getRelationId, relationId).in(UpgradeOrderDon::getUserId, userIdList).notIn(UpgradeOrderDon::getStatus, Constant.noOrderAllStatus).gt(UpgradeOrderDon::getCreatedTime, relationStartTime));
 		for (UpgradeOrderDon upgradeOrderDon : upgradeOrderDons) {
 			orderTotalMoney = orderTotalMoney.add(upgradeOrderDon.getMoney().add(Optional.ofNullable(upgradeOrderDon.getBalance()).orElse(BigDecimal.ZERO)));
 			totalNum = totalNum + upgradeOrderDon.getNum();
@@ -472,7 +472,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 			if (lumaUser != null) {
 				remainNum = lumaUser.getNum();
 			}
-		}else {
+		} else {
 			NanoUserQuota nanoUserQuota = nanoUserQuotaMapper.selectOne(Wrappers.lambdaQuery(NanoUserQuota.class).eq(NanoUserQuota::getRelationId, relationId).last("limit 1"));
 			if (nanoUserQuota != null) {
 				remainNum = nanoUserQuota.getRemainingQuota();
@@ -532,7 +532,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 		Integer upgradeNum = 0;
 		BigDecimal upgradeOrderMoney = BigDecimal.ZERO;
 		//加量包订单
-		List<UpgradeOrderDon> upgradeOrderDons = upgradeOrderDonMapper.selectList(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getRelationId, relationId).in(UpgradeOrderDon::getUserId, userIdList).notIn(UpgradeOrderDon::getStatus, Constant.noOrderAllStatus));
+		List<UpgradeOrderDon> upgradeOrderDons = upgradeOrderDonMapper.selectList(Wrappers.lambdaQuery(UpgradeOrderDon.class).eq(UpgradeOrderDon::getRelationId, relationId).in(UpgradeOrderDon::getUserId, userIdList).notIn(UpgradeOrderDon::getStatus, Constant.noOrderAllStatus).gt(UpgradeOrderDon::getCreatedTime, relationStartTime));
 		for (UpgradeOrderDon upgradeOrderDon : upgradeOrderDons) {
 			upgradeNum += upgradeOrderDon.getNum();
 			upgradeOrderMoney = upgradeOrderMoney.add(upgradeOrderDon.getMoney().add(Optional.ofNullable(upgradeOrderDon.getBalance()).orElse(BigDecimal.ZERO)));