Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-10 4ad0fc5f949708ee4dbd56c0db74673e8dc8040a

 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,9 @@
   public R<AppUser> info(){
      Long userId = tokenService.getLoginUserApplet().getUserid();
      AppUser user = appUserService.getById(userId);



      return R.ok(user);
   }
   @Resource
@@ -269,6 +278,13 @@
      user.setCount5(count5);
      user.setCount6(count6);
      user.setCount7(count7);

        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);


@@ -304,8 +320,16 @@
      AppUser superiorLeader = appUserService.getSuperiorLeader(id);
      return R.ok(superiorLeader);
   }


	
	
	
   @ResponseBody
   @PostMapping("/onlineRecord")
   @ApiOperation(value = "10分钟定时任务调用，记录用户在线时长", tags = {"小程序-个人中心首页"})
   public R onlineRecord(){
      appUserService.onlineRecord();
      return R.ok();
   }

}