fix

netflix-dao/src/main/java/com/cyksj/model/response/VipUserPageResp.java

@@ -17,6 +17,9 @@ import java.util.List;
 @Getter
 @Setter
 public class VipUserPageResp {
+
+	private Integer months;
+
 	/**
 	 * 可抵扣金额
 	 */

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

@@ -79,11 +79,16 @@ public class VipFrontServiceImpl implements VipFrontService {
 		Number count = beanSearcher.searchCount(GroupsRelationView.class, MapUtils.builder().field(GroupsRelationView::getUserId, userIdList).op(Operator.InList).field(GroupsRelationView::getGoodsId, goodsIds).op(Operator.InList).field(GroupsRelationView::getExpiryTime, now).op(Operator.GreaterThan).build());
 		//可抵扣车票
 		if (count.intValue() > 0) {
+			Integer months = vipUserPageResp.getMonths();
 			//处理vip抵扣金额
-			VipDeductDto vipDeductDto = commonHandleVipDeductMoney(userIdList, goodsIds, 12);
-			deductMoney = vipDeductDto.getDeductMoney();
+			VipDeductDto vipDeductDto = commonHandleVipDeductMoney(userIdList, goodsIds, months);
+			if (months != 12) {
+				//取出最大可抵扣info
+				vipDeductDto = commonHandleVipDeductMoney(userIdList, goodsIds, 12);
+			}
 			vipUserPageResp.setRelationUserViews(vipDeductDto.getRelationUserViews());
 			vipUserPageResp.setExtendsDays(vipDeductDto.getExtendDays());
+			deductMoney = vipDeductDto.getDeductMoney();
 		}
 		vipUserPageResp.setDeductMoney(deductMoney);
 	}

netflix-web/src/main/java/com/cyksj/web/controller/vip/VipController.java

@@ -12,6 +12,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
@@ -40,9 +41,10 @@ public class VipController {
 	 * 会员信息
 	 */
 	@GetMapping("/get/info")
-	public Result<VipUserPageResp> getVipInfo() {
+	public Result<VipUserPageResp> getVipInfo(@RequestParam(defaultValue = "1") Integer months) {
 		Long userId = StpUserUtil.getUserIdAfterLogin();
 		VipUserPageResp vipUserPageResp = new VipUserPageResp();
+		vipUserPageResp.setMonths(months);
 		//填充会员信息
 		vipFrontService.fillVipInfo(userId, vipUserPageResp);
 		List<VipGoodsSkuFrontView> vipGoodsSkuFrontViews = beanSearcher.searchAll(VipGoodsSkuFrontView.class, MapUtils.flatBuilder(request.getParameterMap()).orderBy(VipGoodsSkuFrontView::getGoodsId).build());