Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-10 a17335c7cddc86ffe70d423e7e6e7456b1d6c93a

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

@@ -4,9 +4,11 @@
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.api.model.UserCancellationLog;
import com.ruoyi.account.api.model.UserCoupon;
import com.ruoyi.account.api.model.UserSignRecord;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.account.service.UserSignRecordService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
@@ -19,6 +21,7 @@
import org.springframework.web.bind.annotation.RestController;

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

import com.ruoyi.account.vo.*;
@@ -49,6 +52,9 @@
   private StoreClient storeClient;
   @Resource
   private UserCouponService userCouponService;

   @Resource
   private UserSignRecordService userSignRecordService;


   @ResponseBody
@@ -150,6 +156,14 @@
   public R<AppUser> info(){
      Long userId = tokenService.getLoginUserApplet().getUserid();
      AppUser user = appUserService.getById(userId);

      List<UserSignRecord> list = userSignRecordService.lambdaQuery().eq(UserSignRecord::getSignDay, LocalDate.now()).list();
      if (!list.isEmpty()){
         user.setIsSign(1);
      }else {
         user.setIsSign(0);
      }

      return R.ok(user);
   }
   @Resource
@@ -294,6 +308,17 @@
      return R.ok(list);
   }

   /**
    * 获取用户的直帮上级用户
    */
   @ResponseBody
   @PostMapping("/getSuperiorLeader")
   @ApiOperation(value = "获取用户的直帮上级用户")
   public R<AppUser> getSuperiorLeader(@RequestParam("id") Long id) {
      AppUser superiorLeader = appUserService.getSuperiorLeader(id);
      return R.ok(superiorLeader);
   }



}