autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-21 11:35:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

一键登录接口兼容支付宝

Browse Source
This commit is contained in:
Guoqs
2024-06-14 17:15:36 +08:00
parent 0c74b24210
commit 93706fab1d
9 changed files with 79 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jsowell-admin/src/main/java/com/jsowell/api/uniapp/AgentDevController.java
View File

@@ -2,6 +2,7 @@ package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.jsowell.common.UserAgentUtils;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.response.RestApiResponse;
@@ -15,6 +16,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
/**
@@ -305,10 +307,12 @@ public class AgentDevController extends BaseController {
* @return
*/
@PostMapping("/wechatLogin")
public RestApiResponse<?> wechatLogin(@RequestBody AgentWechatLoginDTO dto) {
public RestApiResponse<?> wechatLogin(HttpServletRequest request, @RequestBody AgentWechatLoginDTO dto) {
logger.info("第三方平台微信一键登录 params:{}", JSON.toJSONString(dto));
RestApiResponse<?> response = null;
try {
// 设置请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
String memberToken = agentDevService.wechatLogin(dto);
response = new RestApiResponse<>(ImmutableMap.of("memberToken", memberToken));
} catch (Exception e) {

22
jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java
View File

@@ -3,6 +3,7 @@ package com.jsowell.api.uniapp;
import com.alibaba.fastjson2.JSON;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.jsowell.common.UserAgentUtils;
import com.jsowell.common.annotation.Anonymous;
import com.jsowell.common.core.controller.BaseController;
import com.jsowell.common.core.page.PageResponse;
@@ -87,12 +88,15 @@ public class MemberController extends BaseController {
if (StringUtils.isNotBlank(appId)) {
String firstLevelMerchantId = pileMerchantInfoService.getFirstLevelMerchantIdByWxAppId(appId);
if (StringUtils.isNotBlank(firstLevelMerchantId)) {
dto.setMerchantId(firstLevelMerchantId);
dto.setFirstLevelMerchantId(firstLevelMerchantId);
}
}
// 设置请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
// 执行登录（查这个手机号在后台有没有数据，如果没有就静默注册）
String memberToken = memberService.memberRegisterAndLogin(dto);
String memberToken = memberService.memberRegisterAndLoginBySMS(dto);
// 返回前端成功
Map<String, String> map = Maps.newHashMap();
@@ -118,8 +122,11 @@ public class MemberController extends BaseController {
RestApiResponse<?> response = null;
try {
// 获取小程序appid
String appId = request.getHeader("appId");
dto.setAppId(appId);
dto.setAppId(request.getHeader("appId"));
// 设置请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
String memberToken = memberService.wechatLogin(dto);
response = new RestApiResponse<>(ImmutableMap.of("memberToken", memberToken));
} catch (Exception e) {
@@ -139,8 +146,11 @@ public class MemberController extends BaseController {
RestApiResponse<?> response = null;
try {
// 获取小程序appid
String appId = request.getHeader("appId");
dto.setAppId(appId);
dto.setAppId(request.getHeader("appId"));
// 设置请求来源
dto.setRequestSource(UserAgentUtils.determineRequestSource(request));
String memberToken = memberService.alipayLogin(dto);
response = new RestApiResponse<>(ImmutableMap.of("memberToken", memberToken));
} catch (Exception e) {

4
jsowell-admin/src/main/java/com/jsowell/api/uniapp/OrderController.java
View File

@@ -70,10 +70,10 @@ public class OrderController extends BaseController {
String orderCode = orderService.generateOrderV2(dto);
response = new RestApiResponse<>(ImmutableMap.of("orderCode", orderCode));
} catch (BusinessException e) {
logger.error("生成订单 warn", e);
logger.error("生成订单 warn, param:{}", JSON.toJSONString(dto), e);
response = new RestApiResponse<>(e.getCode(), e.getMessage());
} catch (Exception e) {
logger.error("生成订单 error", e);
logger.error("生成订单 error, param:{}", JSON.toJSONString(dto), e);
response = new RestApiResponse<>(ReturnCodeEnum.CODE_GENERATE_ORDER_ERROR);
}
logger.info("生成订单 result:{}", JSON.toJSONString(response));