Merge remote-tracking branch 'origin/master'

luodangjia

2024-08-15 6f91919a81c92766cb6a119dfe099b83a22ef446

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

@@ -7,11 +7,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.api.dto.*;
import com.ruoyi.account.api.model.*;
import com.ruoyi.account.api.vo.CouponListVOVO;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.GiveVipUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.domain.BasePojo;
import com.ruoyi.common.core.web.page.PageInfo;
import com.ruoyi.common.security.annotation.RequiresPermissions;
import com.ruoyi.order.api.feignClient.ChargingOrderClient;
import com.ruoyi.order.api.feignClient.ExchangeOrderClient;
@@ -67,10 +70,11 @@
    @Resource
    private ExchangeOrderClient exchangeOrderClient;



    @ApiOperation(value = "管理后台-根据手机号查询用户ids", tags = {"管理后台-活动费用统计"})
    @PostMapping(value = "/user/getUserIdsByPhone")
    public R<List<Long>> getUserIdsByPhone(@RequestParam("phone") String phone) {

        return R.ok(appUserService.list(new QueryWrapper<TAppUser>().like("phone",phone)).stream().map(TAppUser::getId).collect(Collectors.toList()));
    }
    @Resource
@@ -302,6 +306,14 @@
        appUserService.updateById(appUser);
        return R.ok();
    }
//    @ApiOperation(value = "个人中心信息", tags = {"小程序-个人中心"})
//    @PostMapping(value = "/user/info")
//    public R info() {
//        Long userId = 1L;
//        TAppUser byId = appUserService.getById(userId);
//
//
//    }


    @ApiOperation(value = "赠送会员", tags = {"用户管理-用户列表"})
@@ -311,11 +323,11 @@

        int plusDay = 0;
        if (giveVipDto.getType() == 1) {
            plusDay = 31;
            plusDay = 1;
        } else if (giveVipDto.getType() == 2) {
            plusDay = 93;
            plusDay = 3;
        } else if (giveVipDto.getType() == 3) {
            plusDay = 365;
            plusDay = 12;
        }
        //增加vipDetail
        giveVipUtil.sendVip(nowUser, giveVipDto.getVipId(),plusDay);