zoujiajian vor 1 Jahr
Ursprung
Commit
574091860d

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/dto/VipDeductDto.java

@@ -34,7 +34,7 @@ public class VipDeductDto {
 	/**
 	 * 超过抵扣金额可换延长会员多少天
 	 */
-	private Integer extendDays = 0;
+	private Integer extendsDays = 0;
 
 	/**
 	 * 抵扣车票

+ 1 - 1
netflix-dao/src/main/java/com/cyksj/model/entity/VipOrderDon.java

@@ -71,7 +71,7 @@ public class VipOrderDon extends BaseEntity{
 	/**
 	 * 超出抵扣会员可延长多少天
 	 */
-	private Integer extendDays;
+	private Integer extendsDays;
 
 	/**
 	 * 海外支付金额

+ 3 - 3
netflix-service/src/main/java/com/cyksj/service/order/impl/VipOrderDonServiceImpl.java

@@ -169,7 +169,7 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 		orderDon.setNum(payRequest.getNum());
 		orderDon.setDeductMoney(vipMoneyIfDeduct.getDeductMoney());
 		orderDon.setActuallyDeductMoney(vipMoneyIfDeduct.getActuallyDeDuctMoney());
-		orderDon.setExtendDays(vipMoneyIfDeduct.getExtendDays());
+		orderDon.setExtendsDays(vipMoneyIfDeduct.getExtendsDays());
 
 		this.saveOrUpdate(orderDon);
 
@@ -377,8 +377,8 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 			vipUser.setStartTime(DateTime.now());
 			vipUser.setExpiryTime(DateUtil.offsetMonth(vipUser.getStartTime(), offsetMonths));
 			//延长用户会员时长
-			if (orderDon.getExtendDays() > 0) {
-				vipUser.setExpiryTime(DateUtil.offsetDay(vipUser.getExpiryTime(), orderDon.getExtendDays()));
+			if (orderDon.getExtendsDays() > 0) {
+				vipUser.setExpiryTime(DateUtil.offsetDay(vipUser.getExpiryTime(), orderDon.getExtendsDays()));
 			}
 			if (vipUser.getId() == null) {
 				try {

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

@@ -83,7 +83,7 @@ public class VipFrontServiceImpl implements VipFrontService {
 			//处理vip抵扣金额
 			VipDeductDto vipDeductDto = commonHandleVipDeductMoney(userIdList, goodsIds, months);
 			vipUserPageResp.setRelationUserViews(vipDeductDto.getRelationUserViews());
-			vipUserPageResp.setExtendsDays(vipDeductDto.getExtendDays());
+			vipUserPageResp.setExtendsDays(vipDeductDto.getExtendsDays());
 			if (months != 12) {
 				//取出最大可抵扣info
 				vipDeductDto = commonHandleVipDeductMoney(userIdList, goodsIds, 12);
@@ -195,8 +195,8 @@ public class VipFrontServiceImpl implements VipFrontService {
 			//每天单价
 			BigDecimal daySingle = vipMoney.divide(BigDecimal.valueOf(30), 0, RoundingMode.DOWN);
 			//超出部分可换取多少天 低于每天单价为0天
-			BigDecimal extendDays = overMoney.divide(daySingle, 0, RoundingMode.UP);
-			vipDeductDto.setExtendDays(extendDays.intValue());
+			BigDecimal extendsDays = overMoney.divide(daySingle, 0, RoundingMode.UP);
+			vipDeductDto.setExtendsDays(extendsDays.intValue());
 			vipDeductDto.setDeductMoney(vipMoney);
 		}
 		vipDeductDto.setDeductRelationIds(deductRelationIds);