mirage
/
edu
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix 订单详细报错的bug 

feat 公众号登录的时候指定终端为2
feat 获取openid 的时候忽略终端条件
This commit is contained in:
damonyuan 2024-11-15 14:18:29 +08:00
parent 68fc947d81
commit e72b661ed7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/like-front/src/main/java/com/mdd/front/controller/LoginController.java
View File

@ -91,9 +91,9 @@ public class LoginController {
public AjaxResult<LoginTokenVo> oaLogin(@Validated @RequestBody LoginCodeValidate loginCodeValidate) { public AjaxResult<LoginTokenVo> oaLogin(@Validated @RequestBody LoginCodeValidate loginCodeValidate) {
Integer terminal = ClientEnum.OA.getCode(); Integer terminal = ClientEnum.OA.getCode();
String code = loginCodeValidate.getCode(); String code = loginCodeValidate.getCode();
if (StringUtils.isNull(loginCodeValidate.getTerminal())) { // if (StringUtils.isNull(loginCodeValidate.getTerminal())) {
terminal = LikeFrontThreadLocal.getTerminal(); // terminal = LikeFrontThreadLocal.getTerminal();
} // }
LoginTokenVo vo = iLoginService.officeLogin(code, terminal); LoginTokenVo vo = iLoginService.officeLogin(code, terminal);
return AjaxResult.success(vo); return AjaxResult.success(vo);
} }

4
server/like-front/src/main/java/com/mdd/front/controller/PayController.java
View File

@ -52,8 +52,8 @@ public class PayController {
@GetMapping("/payStatus") @GetMapping("/payStatus")
@ApiOperation(("支付状态")) @ApiOperation(("支付状态"))
public AjaxResult<PayStatusVo> payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from, public AjaxResult<PayStatusVo> payStatus(@Validated @NotNull(message = "from参数丢失") @RequestParam String from,
@Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer orderId) { @Validated @NotNull(message = "orderId参数丢失") @RequestParam Integer order_id) {
PayStatusVo vo = iPayService.payStatus(from, orderId); PayStatusVo vo = iPayService.payStatus(from, order_id);
return AjaxResult.success(vo); return AjaxResult.success(vo);
} }

2
server/like-front/src/main/java/com/mdd/front/service/impl/LoginServiceImpl.java
View File

@ -420,7 +420,7 @@ public class LoginServiceImpl implements ILoginService {
UserAuth auth = userAuthMapper.selectOne( UserAuth auth = userAuthMapper.selectOne(
new QueryWrapper<UserAuth>() new QueryWrapper<UserAuth>()
.eq("openid", openId) .eq("openid", openId)
.eq("terminal", terminal) //.eq("terminal", terminal)
.last("limit 1")); .last("limit 1"));
// 创建授权 // 创建授权