zoujiajian 1 год назад
Родитель
Сommit
e861ec56c9

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

@@ -338,10 +338,10 @@ public class VipOrderDonServiceImpl extends ServiceImpl<VipOrderDonMapper, VipOr
 		}
 		//发放会员车票
 		if (orderDon.getOrderType() == 1) {
-			sendVipTicketToUser(userId);
+			sendVipTicketToUser(vipUser.getUserId());
 		} else {
 			//续费订单
-			setTicketToVipExpiryTime(userId, vipUser.getExpiryTime());
+			setTicketToVipExpiryTime(vipUser.getUserId(), vipUser.getExpiryTime());
 		}
 		//是否存在抵扣 抵扣成功 清除车票
 		VipOrderDonDeductRelation vipOrderDonDeductRelation = vipOrderDonDeductRelationMapper.selectOne(Wrappers.lambdaQuery(VipOrderDonDeductRelation.class)

+ 1 - 0
netflix-web/src/main/java/com/cyksj/web/controller/user/UserController.java

@@ -161,6 +161,7 @@ public class UserController {
                 .field(RenewalView::getUserId, 0).op(Operator.GreaterThan)
                 .field(RenewalView::getUserId, userIdList).op(Operator.InList)
                 .field(RenewalView::getStatus, List.of("validity", "overdue", "outside")).op(Operator.InList)
+                .field(RenewalView::getIsVip, false)
                 .orderBy(RenewalView::getExpiryTime).asc()
                 .onlySelect(RenewalView::getExpiryTime)
                 .build());