puzhibing
2025-01-07 eb5d7885fa9e4bd20c0827eec9b4cdd48c47b509
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -48,6 +48,7 @@
   @PostMapping("/getNowOrderActivityInfo")
   public R<OrderActivityInfo> getNowOrderActivityInfo(@RequestParam("vip") Integer vip){
      OrderActivityInfo one = orderActivityInfoService.getOne(new LambdaQueryWrapper<OrderActivityInfo>().eq(OrderActivityInfo::getDelFlag, 0)
            .eq(OrderActivityInfo::getIsShelf, 1).eq(OrderActivityInfo::getStatus, 1)
            .last(" and now() between start_time and end_time and FIND_IN_SET(" + vip + ", vip_ids) limit 0, 1"));
      return R.ok(one);
   }
@@ -115,7 +116,7 @@
         if (StringUtils.isNotEmpty(vipIds)){
            String[] vipIdArr = vipIds.split(",");
            if (vipIdArr.length == 7){
               item.setVipIds("全部");
               item.setVipName("全部");
            }else {
               List<String> vipNameList = new ArrayList<>();
               for (String vipId : vipIdArr) {