zoujiajian 1 an în urmă
părinte
comite
56d9fd526c

+ 3 - 4
netflix-web/src/main/java/com/cyksj/web/controller/group/GroupRelationController.java

@@ -1293,16 +1293,15 @@ public class GroupRelationController {
      */
     @GetMapping("/get/galaxyCoin/tickets")
     public Result<SearchResult<GalaxyCoinRenewTicketsView>> getGalaxyCoinTickets() throws Exception {
-        long userId = StpUserUtil.getLoginIdAsLong();
+        long userId = 234191;
         List<Long> userIdList = userBindRelationService.getRelationUserIdList(userId, null);
         DateTime now = DateTime.now();
-        String conditionSql = String.format("(gr.expiry_time is null or gr.expiry_time > '%s' or (sku.is_mirror and gr.expiry_time > '%s'))", now, DateUtil.offsetDay(now, -7));
+        //非独立账号
+        String conditionSql = String.format("(gr.expiry_time is null or gr.expiry_time > '%s' or (sku.is_mirror and gr.expiry_time > '%s')) and (sku.months is null or sku.months != 300)", now, DateUtil.offsetDay(now, -7));
         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)
-                //非独立账号
-                .field(GalaxyCoinRenewTicketsView::getMonths, 300).op(Operator.NotEqual)
                 //购买
                 .field(GalaxyCoinRenewTicketsView::getAqType, 1)
                 //非代充