登录过滤器

This commit is contained in:
2024-05-15 09:42:42 +08:00
parent 6de9614473
commit 0ebfa2795d
4 changed files with 72 additions and 61 deletions

View File

@@ -37,17 +37,25 @@ public class PayController {
* @return
*/
@RequestMapping("orderPay")
public Result pay(HttpServletRequest request, @RequestHeader String token, @RequestBody Map<String, String> map) {
public Result pay(HttpServletRequest request, @RequestHeader String environment,@RequestHeader String token, @RequestBody Map<String, String> map) {
if (ObjectUtil.isEmpty(map) || map.size() <= 0 || !map.containsKey("orderId") || ObjectUtil.isEmpty(map.get("orderId"))) {
return Result.fail("订单号不允许为空");
}
String orderId = map.get("orderId").toString();
String userId = TokenUtil.parseParamFromToken(token).getString("userId");
String orderType = map.get("orderType").toString();
String payType = map.get("payType").toString();
String userId="";
if(environment.equals("wx")){
userId = TokenUtil.parseParamFromToken(token).getString("openId");
}else {
userId = TokenUtil.parseParamFromToken(token).getString("userId");
}
log.info("订单支付 orderId:{},orderType:{},payType={},userId:{}",orderId,orderType,payType,userId);
try {
if(orderId.startsWith("GP")){
return payService.groupOrderPay(orderId, map.get("payType"), userId, IpUtil.getIpAddr(request));
if(StringUtils.isNotBlank(orderType) && orderType.equals("group")){
return payService.groupOrderPay(orderId, payType, userId, IpUtil.getIpAddr(request));
}else {
return payService.payOrder(userId, orderId, map.get("payType"), IpUtil.getIpAddr(request));
return payService.payOrder(userId, orderId, payType, IpUtil.getIpAddr(request));
}
} catch (Exception e) {
e.printStackTrace();