合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/OrderActivityInfoController.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.other.api.domain.OrderActivityInfo;
import com.ruoyi.other.service.OrderActivityInfoService;
import com.ruoyi.other.service.VipSettingService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -34,6 +35,8 @@

   @Resource
   private OrderActivityInfoService orderActivityInfoService;
   @Resource
   private VipSettingService vipSettingService;
   
   
   /**
@@ -55,6 +58,7 @@
   @PostMapping("/save")
   @ApiOperation(value = "订单优惠活动-添加活动", tags = {"管理后台-活动管理"})
   public R<Void> saveActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
      orderActivityInfo.setIsShelf(0);
      orderActivityInfoService.save(orderActivityInfo);
      return R.ok();
   }
@@ -73,8 +77,9 @@
    * 修改活动
    */
   @PostMapping("/update")
   @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理-订单优惠活动"})
   @ApiOperation(value = "修改活动", tags = {"管理后台-活动管理"})
   public R<Void> updateActivityConfig(@RequestBody OrderActivityInfo orderActivityInfo){
      orderActivityInfo.setId(Long.valueOf(orderActivityInfo.getIdStr()));
      orderActivityInfoService.updateById(orderActivityInfo);
      return R.ok();
   }
@@ -96,6 +101,31 @@
            .eq(orderActivityInfo.getIsShelf() != null, OrderActivityInfo::getIsShelf, orderActivityInfo.getIsShelf()));
      page.getRecords().forEach(item -> {
         LocalDateTime startTime = item.getStartTime();
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime endTime = item.getEndTime();
         if (endTime.isBefore(now)){
            item.setStatus(2); //已结束
         }else if (startTime.isBefore(now)){
            item.setStatus(1); // 已开始
         }else {
            item.setStatus(0); // 未开始
         }

         String vipIds = item.getVipIds();
         if (StringUtils.isNotEmpty(vipIds)){
            String[] vipIdArr = vipIds.split(",");
            if (vipIdArr.length == 7){
               item.setVipName("全部");
            }else {
               List<String> vipNameList = new ArrayList<>();
               for (String vipId : vipIdArr) {
                  String vipName = vipSettingService.getById(Long.parseLong(vipId)).getVipName();
                  vipNameList.add(vipName);
               }
               item.setVipName(String.join(",", vipNameList));
            }

         }
      });
      return R.ok(page);
   }
@@ -105,8 +135,8 @@
    */
   @GetMapping("/getDetailById")
   @ApiOperation(value = "订单优惠活动-获取活动详情", tags = {"管理后台-活动管理"})
   public R<OrderActivityInfo> getDetailById(@RequestParam("id") Long id){
      return R.ok(orderActivityInfoService.getById(id));
   public R<OrderActivityInfo> getDetailById(@RequestParam("id") String id){
      return R.ok(orderActivityInfoService.getById(Long.parseLong(id)));
   }