From ae41759bafec1c2a1e8858fcdcda4272ed4eb84c Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 16 六月 2023 17:43:47 +0800
Subject: [PATCH] 联调bug和订单管理
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java | 142 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 129 insertions(+), 13 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
index 77e818e..e911272 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java
@@ -2,30 +2,42 @@
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.MemberCouponService;
import com.ruoyi.member.service.member.MemberService;
-import com.ruoyi.member.service.member.UserCouponService;
+import com.ruoyi.member.service.member.MemberSuggestService;
import com.ruoyi.system.api.domain.dto.AppMemberBindingDto;
+import com.ruoyi.system.api.domain.dto.AppMemberGoodsTypeDto;
+import com.ruoyi.system.api.domain.dto.AppMiniRegisterDto;
+import com.ruoyi.system.api.domain.dto.MgtUserIdByKeywordDto;
import com.ruoyi.system.api.domain.poji.member.Member;
-import com.ruoyi.system.api.domain.vo.AppUserCouponVo;
-import com.ruoyi.system.api.domain.vo.MerHomeShopTotalVo;
+import com.ruoyi.system.api.domain.vo.AppMemberCouponVo;
+import com.ruoyi.system.api.domain.vo.AppMiniRegisterVo;
+import com.ruoyi.system.api.domain.vo.MgtSimpleMemberVo;
+import com.ruoyi.system.api.domain.vo.MgtUserIdByKeywordVo;
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;
- @Autowired
- private UserCouponService userCouponService;
+ @Resource
+ private MemberCouponService memberCouponService;
+
+ @Resource
+ private MemberSuggestService memberSuggestService;
+
/**
* @description: getMember
@@ -59,16 +71,26 @@
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);
+ }
+
/**
* @description: 获取用户优惠券
* @author jqs34
* @date 2023/5/3 1:45
* @version 1.0
*/
- @PostMapping("/listVoUserCouponByUserId")
- public R<List<AppUserCouponVo>> listVoUserCouponByUserId(@RequestBody Long userId){
- List<AppUserCouponVo> appUserCouponVoList = userCouponService.listVoUserCouponByUserId(userId);
- return R.ok(appUserCouponVoList);
+ @PostMapping("/listVoMemberCouponByUserId")
+ public R<List<AppMemberCouponVo>> listVoMemberCouponByUserId(@RequestBody Long userId){
+ List<AppMemberCouponVo> appMemberCouponVoList = memberCouponService.listVoMemberCouponByUserId(userId);
+ return R.ok(appMemberCouponVoList);
}
/**
@@ -82,4 +104,98 @@
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 userIds
+ * @return R<List<MgtSimpleMemberVo>>
+ */
+ @PostMapping("/listSimpleVoByIds")
+ public R<List<MgtSimpleMemberVo>> listSimpleVoByIds(@RequestBody String userIds)
+ {
+ List<MgtSimpleMemberVo> simpleMemberVoList = memberService.listSimpleVoByIds(userIds);
+ 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);
+ }
+
}
--
Gitblit v1.7.1