phpcjl
2024-12-13 d5865358dc32443bac629190bb18741d8af5093b
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java
@@ -61,7 +61,7 @@
   /**
    * 删除活动
    */
   @PostMapping("/delete")
   @DeleteMapping("/delete")
   @ApiOperation(value = "订单优惠活动-删除活动", tags = {"管理后台-活动管理"})
   public R<Void> deleteActivityConfig(@RequestParam("id") Long id){
      orderActivityInfoService.removeById(id);
@@ -90,8 +90,8 @@
      return R.ok(orderActivityInfoService.page(Page.of(pageNum, pageSize), new LambdaQueryWrapper<OrderActivityInfo>()
            .eq(orderActivityInfo.getId() != null, OrderActivityInfo::getId, orderActivityInfo.getId())
            .eq(StringUtils.isNotEmpty(orderActivityInfo.getActivityName()), OrderActivityInfo::getActivityName, orderActivityInfo.getActivityName())
            .lt(orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())
            .ge(orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime())
            .lt(orderActivityInfo.getStatus() !=null && orderActivityInfo.getStatus() == 0, OrderActivityInfo::getStartTime, orderActivityInfo.getStartTime())
            .ge(orderActivityInfo.getStatus() !=null && orderActivityInfo.getStatus() == 1, OrderActivityInfo::getEndTime, orderActivityInfo.getStartTime())
            .eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf())));
   }