zoujiajian 1 rok temu
rodzic
commit
f10d680a04

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

@@ -3,6 +3,7 @@ package com.cyksj.model.views;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -29,4 +30,9 @@ public class UserSyncInfoView {
 	 * 会员过期时间
 	 */
 	private Date vipExpiryTime;
+
+	/**
+	 * 银河币
+	 */
+	private BigDecimal galaxyCoin;
 }

+ 2 - 0
netflix-service/src/main/java/com/cyksj/service/user/impl/UserServiceImpl.java

@@ -888,6 +888,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 			syncInfoView.setVipStartTime(vipUser.getStartTime());
 			syncInfoView.setVipExpiryTime(vipUser.getExpiryTime());
 		}
+		User user = userMapper.selectById(userId);
+		syncInfoView.setGalaxyCoin(user.getGalaxyCoin());
 		return syncInfoView;
 	}
 

+ 1 - 0
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -1300,6 +1300,7 @@ public class GroupRelationController {
         SearchResult<GalaxyCoinRenewTicketsView> search = beanSearcher.search(GalaxyCoinRenewTicketsView.class, MapUtils.flatBuilder(request.getParameterMap())
                 .field(GalaxyCoinRenewTicketsView::getUserId, userIdList).op(Operator.InList)
                 .put("condition", conditionSql)
+                .field(GalaxyCoinRenewTicketsView::getIsVip, Boolean.FALSE)
                 .orderBy(GalaxyCoinRenewTicketsView::getExpiryTime).asc()
                 .build());
         User user = userMapper.selectById(userId);