|
@@ -28,6 +28,7 @@ import org.slf4j.LoggerFactory;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.validation.annotation.Validated;
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
|
+import javax.servlet.http.HttpServlet;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletRequest;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpServletResponse;
|
|
import javax.servlet.http.HttpSession;
|
|
import javax.servlet.http.HttpSession;
|
|
@@ -46,7 +47,7 @@ import java.util.Map;
|
|
@Api(tags = "订单支付")
|
|
@Api(tags = "订单支付")
|
|
@Validated
|
|
@Validated
|
|
@AllArgsConstructor
|
|
@AllArgsConstructor
|
|
-public class PayController {
|
|
|
|
|
|
+public class PayController extends HttpServlet {
|
|
private OrderManager orderManager;
|
|
private OrderManager orderManager;
|
|
private AliPayService aliPayService;
|
|
private AliPayService aliPayService;
|
|
private WxPayServiceMy wxPayServiceMy;
|
|
private WxPayServiceMy wxPayServiceMy;
|
|
@@ -139,9 +140,9 @@ public class PayController {
|
|
String[] split = state.split("--");
|
|
String[] split = state.split("--");
|
|
String orderId = split[0];
|
|
String orderId = split[0];
|
|
String ip = split[1];
|
|
String ip = split[1];
|
|
-// if (!state.equals((String) session.getAttribute("WEIXIN_OAUTH_STATE"))) {
|
|
|
|
-// log.error("用户授权,state错误");
|
|
|
|
-// }
|
|
|
|
|
|
+ if (!state.equals((String) session.getAttribute("WEIXIN_OAUTH_STATE"))) {
|
|
|
|
+ log.error("用户授权,state错误");
|
|
|
|
+ }
|
|
OrderDO aDo = orderManager.getById(Long.valueOf(orderId));
|
|
OrderDO aDo = orderManager.getById(Long.valueOf(orderId));
|
|
if (ObjectUtil.isNull(aDo)) {
|
|
if (ObjectUtil.isNull(aDo)) {
|
|
log.error("用户授权完成后未找到订单信息:" + state);
|
|
log.error("用户授权完成后未找到订单信息:" + state);
|