联调bug和统计完善

jiangqs

2023-06-30 cbc564a7088503ad8cc7af4e1d2ba417d061e615

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java

@@ -2,21 +2,35 @@

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.security.annotation.InnerAuth;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.member.service.member.MemberSuggestService;
import com.ruoyi.member.service.member.MemberTotalService;
import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.system.api.domain.poji.member.Member;
import com.ruoyi.system.api.domain.vo.*;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

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

@RestController
@RequestMapping("/member")
public class MemberController extends BaseController {

    @Autowired
    @Resource
    private MemberService memberService;

    @Resource
    private MemberSuggestService memberSuggestService;

    @Resource
    private MemberTotalService memberTotalService;

    /**
    * @description: getMember
@@ -25,8 +39,8 @@
    * @author jqs34
    * @date: 2023/4/30 12:49
    */
    @InnerAuth
    @GetMapping("/getMember")

    @PostMapping("/getMember")
    public R<Member> getMember(@RequestBody Long userId)
    {
        Member member = memberService.getByUserId(userId);
@@ -39,7 +53,6 @@
    /**
     * 小程序登录
     */
    @InnerAuth
    @PostMapping("/miniLogin")
    @ApiOperation("小程序登录")
    public R<AppMiniLoginVo> getMemberByCode(@RequestBody AppMiniLoginDto appMiniLoginDto)
@@ -50,4 +63,191 @@
        }
        return R.ok(appMiniLoginVo);
    }

    @PostMapping(value = "/miniRegister")
    @ApiOperation(value = "小程序注册")
    public R<AppMiniRegisterVo> miniRegister(@RequestBody AppMiniRegisterDto appUserRegisterDto) {
        AppMiniRegisterVo appUserRegisterVo = memberService.miniRegister(appUserRegisterDto);
        if(appUserRegisterVo ==null){
            return R.fail("注册失败！");
        }
        return R.ok(appUserRegisterVo);
    }



    /**
     * 更新会员绑定商户
     * @param appMemberBindingDto
     * @return
     */
    @PostMapping("/updateMemberBinding")
    public R updateMemberBinding(@RequestBody AppMemberBindingDto appMemberBindingDto)
    {
        memberService.updateMemberBinding(appMemberBindingDto);
        return R.ok();
    }

    /**
     * 更新会员商品类型
     * @param appMemberGoodsTypeDto
     * @return
     */
    @PostMapping("/updateMemberGoodsType")
    public R updateMemberGoodsType(@RequestBody AppMemberGoodsTypeDto appMemberGoodsTypeDto)
    {
        memberService.updateMemberGoodsType(appMemberGoodsTypeDto);
        return R.ok();
    }

    /**
     * 通过手机号获取会员
     * @param mobile
     * @return
     */
    @PostMapping("/getMemberByMobile")
    public R<Member> getMemberByMobile(@RequestBody String mobile)
    {
        Member member = memberService.getByMobile(mobile);
        return R.ok(member);
    }

    /**
     * 订单创建新用户
     * @param member
     * @return
     */
    @PostMapping("/createNewMember")
    public R createNewMember(@RequestBody Member member)
    {
        memberService.createNewMember(member);
        return R.ok();
    }

    /**
     * @description  删除用户标签
     * @author  jqs
     * @date    2023/6/8 15:17
     * @param tag
     * @return  R
     */
    @PostMapping("/deleteMemberTag")
    public R deleteMemberTag(@RequestBody String tag)
    {
        memberService.deleteMemberTag(tag);
        return R.ok();
    }

    /**
     * @description  删除会员建议标签
     * @author  jqs
     * @date    2023/6/9 9:43
     * @param suggestTag
     * @return  R
     */
    @PostMapping("/deleteMemberSuggestTag")
    public R deleteMemberSuggestTag(@RequestBody String suggestTag)
    {
        memberSuggestService.deleteMemberSuggestTag(suggestTag);
        return R.ok();
    }


    /**
     * @description  通过ids获取用户简易返回
     * @author  jqs
     * @date    2023/6/16 11:05
     * @param mgtBaseBathDto
     * @return  R<List<MgtSimpleMemberVo>>
     */
    @PostMapping("/listSimpleVoByIds")
    public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody MgtBaseBathDto mgtBaseBathDto)
    {
        List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(mgtBaseBathDto.getIds());
        return R.ok(simpleMemberVoList);
    }

    /**
     * @description
     * @author  jqs
     * @date    2023/6/16 12:47
     * @param mgtUserIdByKeywordDto
     * @return  R<MgtUserIdByKeywordVo>
     */
    @PostMapping("/getUserIdByKeyword")
    public R<MgtUserIdByKeywordVo> getUserIdByKeyword(@RequestBody MgtUserIdByKeywordDto mgtUserIdByKeywordDto)
    {
        MgtUserIdByKeywordVo mgtUserIdByKeywordVo = memberService.getUserIdByKeyword(mgtUserIdByKeywordDto);
        return R.ok(mgtUserIdByKeywordVo);
    }

    /**
    * @description boardMemberTotal
    * @param
    * @return R<MgtBulletinBoardVo>
    * @author jqs34
    * @date 2023/6/18 16:45
    */
    @PostMapping("/boardMemberTotal")
    public R<MgtBulletinBoardVo> boardMemberTotal()
    {
        MgtBulletinBoardVo bulletinBoardVo = memberService.boardMemberTotal();
        return R.ok(bulletinBoardVo);
    }

    /**
     * @description  筛选userId年龄段
     * @author  jqs
     * @date    2023/6/20 14:31
     * @param mgtActivityAgeDto
     * @return  R<List<Long>>
     */
    @PostMapping("/listUserIdByAge")
    public R<List<Long>> listUserIdByAge(@RequestBody MgtActivityAgeDto mgtActivityAgeDto)
    {
        List<Long> userIdList = memberService.listUserIdByAge(mgtActivityAgeDto);
        return R.ok(userIdList);
    }

    /**
     * @description  通过shopId获取userId
     * @author  jqs
     * @date    2023/6/21 17:11
     * @param shopIdlist
     * @return  R<List<Long>>
     */
    @PostMapping("/listUserIdByShopId")
    public R<List<Long>> listUserIdByShopId(@RequestBody List<Long> shopIdlist)
    {
        List<Long> userIdList = memberService.listUserIdByShopId(shopIdlist);
        return R.ok(userIdList);
    }

    /**
     * @description  通过shopId获取user统计
     * @author  jqs
     * @date    2023/6/21 17:22
     * @param shopIdlist
     * @return  R<MgtShopTotalMemberVo>
     */
    @PostMapping("/getUserTotalByShopId")
    public R<MgtShopTotalMemberVo> getUserTotalByShopId(@RequestBody List<Long> shopIdlist)
    {
        MgtShopTotalMemberVo shopTotalMemberVo = memberService.getUserTotalByShopId(shopIdlist);
        return R.ok(shopTotalMemberVo);
    }

    /**
     * @description  更新会员统计
     * @author  jqs
     * @date    2023/6/28 17:52
     * @param memberTotalChangeDto
     * @return  R
     */
    @PostMapping("/changeMemberTotal")
    public R changeMemberTotal(@RequestBody MemberTotalChangeDto memberTotalChangeDto)
    {
        memberService.changeMemberTotal(memberTotalChangeDto);
        return R.ok();
    }
}