Merge remote-tracking branch 'origin/master'

luodangjia

2024-12-04 a981c07d34edd0975b9d556d97c1f851ce79974c

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

@@ -4,8 +4,10 @@

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.service.AppUserService;
import com.ruoyi.account.service.UserCancellationLogService;
import com.ruoyi.account.service.UserCouponService;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.other.api.domain.Shop;
@@ -56,7 +58,16 @@
   private AppUserService appUserService;
   @Resource
   private StoreClient storeClient;
   @Resource
   private UserCouponService userCouponService;


   @ResponseBody
   @PostMapping("/mobileLogin")
   @ApiOperation(value = "手机号登录")
   public AjaxResult<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
      return appUserService.mobileLogin(mobileLogin);
   }

   @PostMapping("getAppUserById")
   AppUser getAppUserById(@RequestParam("id") Long id){
@@ -75,12 +86,37 @@
   
   
   @ResponseBody
   @PostMapping("/getAppUserById")
   public AppUser getAppUserById(@RequestParam("id") Long id){
      return appUserService.getById(id);
   }

   @ResponseBody
   @PostMapping("/editAppUserById")
   public R<Void> editAppUserById(@RequestParam("appUser") AppUser appUser){
      appUserService.updateById(appUser);
      return R.ok();
   @PostMapping("/mobileLogin")
   @ApiOperation(value = "手机号登录")
   public R<LoginVo> mobileLogin(@RequestBody MobileLogin mobileLogin){
      return appUserService.mobileLogin(mobileLogin);
   }
	

   @ResponseBody
   @PostMapping("/getCouponCount")
   public R<Long> getCouponCount(@RequestParam("userId")Long userId, @RequestParam("couponId") Integer couponId ){
      Long count = userCouponService.lambdaQuery().eq(UserCoupon::getAppUserId, userId).eq(UserCoupon::getCouponId, couponId).count();
      return R.ok(count);
   }

   @ResponseBody
   @PostMapping("/getVipCount")
   public R<Long> getVipCount(@RequestParam("userId")Long userId, @RequestParam("vipId") Integer vipId ){
      appUserService.lambdaQuery().eq(AppUser::getInviteUserId, userId).eq(AppUser::getVipId, vipId).count()
      return R.ok(count);
   }


   
   
   @ResponseBody
@@ -154,6 +190,8 @@
   }




    @PostMapping("/index")
   @ApiOperation(value = "个人中心首页", tags = {"小程序-个人中心首页"})
   public R<AppUser> index(){