Merge remote-tracking branch 'origin/master'

phpcjl

2024-12-04 bb66ef51805b58448af8edae8e6b04f153d80b5f

 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;
@@ -23,8 +25,8 @@
import com.ruoyi.account.api.model.AppUser;
import com.ruoyi.account.service.AppUserService;
import com.ruoyi.account.vo.*;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -46,7 +48,7 @@
@Api(tags = {"登录注册-小程序"})
@RestController
@RequestMapping("/app-user")
public class AppUserController {
public class AppUserController extends BaseController {



@@ -56,30 +58,71 @@
   private AppUserService appUserService;
   @Resource
   private StoreClient storeClient;
   @Resource
   private UserCouponService userCouponService;



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

   @PostMapping("getAppUserById")
   AppUser getAppUserById(@RequestParam("id") Long id){
      return appUserService.getById(id);
   }




   @ResponseBody
   @PostMapping("/appletLogin")
   @ApiOperation(value = "小程序一键登录")
   public R<LoginVo> appletLogin(@RequestBody AppletLogin appletLogin){
      return appUserService.appletLogin(appletLogin);
   }
   
	
   @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
   @PostMapping("/getSMSCode")
   @ApiOperation(value = "获取短信验证码")
   public AjaxResult getSMSCode(@RequestBody SMSCode smsCode){
   public R getSMSCode(@RequestBody SMSCode smsCode){
      return appUserService.getSMSCode(smsCode);
   }

@@ -88,7 +131,7 @@
   @ResponseBody
   @PostMapping("/registerAccount")
   @ApiOperation(value = "注册新账号")
   public AjaxResult<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
   public R<LoginVo> registerAccount(@RequestBody RegisterAccount registerAccount){
      return appUserService.registerAccount(registerAccount);
   }

@@ -99,11 +142,11 @@
   @ApiImplicitParams({
         @ApiImplicitParam(name = "id", value = "推荐人id", required = true, dataType = "long")
   })
   public AjaxResult<String> getReferrer(@PathVariable("id") Long id){
   public R<String> getReferrer(@PathVariable("id") Long id){
      AppUser appUser = appUserService.getById(id);
      String phone = appUser.getPhone();
      phone = phone.substring(0, 3) + "****" + phone.substring(7);
      return AjaxResult.success(appUser.getName() + "-" + phone);
      return R.ok(appUser.getName() + "-" + phone);
   }


@@ -147,6 +190,8 @@
   }




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

   }

   /**
    * 获取用户的祖籍列表
    */
   @GetMapping("/getUserAncestorList")
   public R<List<AppUser>> getUserAncestorList(Long id){
      List<AppUser> list = appUserService.getUserAncestorList(id,null);
      return R.ok(list);
   }



}