From 2f2eb2bb2c6a5a16b7081dbbe3b683acf18d04bc Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 11 六月 2024 18:18:05 +0800
Subject: [PATCH] 用户端商品
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
index b06eb0a..13d88d2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/forepart/ForepartMemberController.java
@@ -2,13 +2,11 @@
import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.security.annotation.InnerAuth;
-import com.ruoyi.member.dto.MemberDTO;
+import com.ruoyi.system.api.domain.dto.*;
import com.ruoyi.member.service.IMemberService;
import com.ruoyi.system.api.domain.AppMiniLoginVO;
import com.ruoyi.system.api.domain.Member;
-import com.ruoyi.system.api.domain.dto.AppMiniLoginDTO;
-import com.ruoyi.system.api.domain.dto.AppMiniRegisterDTO;
+import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.util.HuaWeiOBSUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -17,7 +15,6 @@
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.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -37,20 +34,24 @@
@Resource
private IMemberService iMemberService;
+ @Resource
+ private SysUserClient sysUserClient;
+
@PostMapping("/miniLogin")
@ApiOperation(value = "用户端-第三方登陸")
public R<AppMiniLoginVO> loginThird(@RequestBody AppMiniLoginDTO appMiniLoginDto) {
- return R.ok(iMemberService.loginThird(appMiniLoginDto));
- }
+ try {
+ return R.ok(iMemberService.loginThird(appMiniLoginDto));
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
- @PostMapping(value = "/miniRegister")
- @ApiOperation(value = "用户端-小程序注册")
- public R<AppMiniLoginVO> miniRegister(@RequestBody AppMiniRegisterDTO appMiniRegisterDTO) {
- AppMiniLoginVO appUserRegisterVo = iMemberService.miniRegister(appMiniRegisterDTO);
- if(appUserRegisterVo ==null){
- return R.fail("注册失败！");
- }
- return R.ok(appUserRegisterVo);
+ @PostMapping(value = "/mobile")
+ @ApiOperation(value = "用户端-小程序获取电话号码")
+ public R mobile(@RequestBody MobileDTO mobileDTO) {
+ iMemberService.mobile(mobileDTO);
+ return R.ok();
}
@PostMapping("/getMembeid")
@@ -89,4 +90,20 @@
iMemberService.authentificationMembe(memberDTO);
return R.ok();
}
+
+ @PostMapping("/customConfig")
+ @ApiOperation(value = "获取配置")
+ public R<String> customConfig(@RequestBody CustomConfigDTO customConfigDTO) {
+ String string="";
+ if(customConfigDTO.getType()==1){
+ string=sysUserClient.getconfig("PLATFORM_SERVICE_PHONE").getData().getConfigValue();
+ }
+ if(customConfigDTO.getType()==2){
+ string=sysUserClient.getconfig("MALL_ORDER_DESCRIPTION").getData().getConfigValue();
+ }
+ if(customConfigDTO.getType()==3){
+ string=sysUserClient.getconfig("RETURN_CYCLE").getData().getConfigValue();
+ }
+ return R.ok(string);
+ }
}
--
Gitblit v1.7.1