Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-18 3f8e43bb394301b7018a03d2d38e70e1232443d6

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -34,6 +34,7 @@

import javax.annotation.Resource;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;

@@ -564,6 +565,32 @@
      //消费总金额
      return R.ok(byId);
   }

   @Resource
   private UserChangeLogService userChangeLogService;
   @GetMapping("/change/vip")
   @ApiOperation(value = "用户列表-修改会员等级", tags = {"管理后台"})
   public R<Page<AppUser>> changevip(Long id,Integer vipId)
   {
      AppUser byId = appUserService.getById(id);

      UserChangeLog userChangeLog = new UserChangeLog();
      userChangeLog.setCreateTime(LocalDateTime.now());
      userChangeLog.setAppUserId(byId.getId());
      userChangeLog.setBeforeVipId(byId.getVipId());
      userChangeLog.setAfterVipId(vipId);
      if (userChangeLog.getBeforeVipId()>userChangeLog.getAfterVipId()) {
         userChangeLog.setChangeType(0);
      }else {
         userChangeLog.setChangeType(1);
      }
      userChangeLogService.save(userChangeLog);
      byId.setVipId(vipId);
      appUserService.updateById(byId);
      return R.ok();

   }

   @GetMapping("/bottom")
   @ApiOperation(value = "用户列表-绑定下级列表", tags = {"管理后台"})
   public R<Page<AppUser>> bottom(Long id,Integer pageNum,Integer pageSize)