1

src/main/java/com/fdkankan/pay/controller/PayController.java

@@ -57,17 +57,17 @@ public class PayController extends BaseController {
 
 
     @RequestMapping(value = "/callBack/{orderSn}/{payType}/{result}")
-    public void callback(@PathVariable String orderSn,@PathVariable Integer payType,@PathVariable String result) {
+    public String callback(@PathVariable String orderSn,@PathVariable Integer payType,@PathVariable String result) {
         if(request.getMethod().equals("POST")){
             payOrderService.callBack(orderSn,payType, result,request, response);
         }else {
             if(payType == 5){ // paypal支付
                 payOrderService.callBack(orderSn,payType,result, request, response);
-                //return "redirect:" + CacheUtil.mainUrl +  "/payment/?id="+orderSn;
+                return "redirect:" + CacheUtil.mainUrl +  "/payment/?id="+orderSn;
             }
             log.info("wx-callBack--无效req:{}",request.getMethod());
         }
-       // return "redirect:" + CacheUtil.mainUrl +  "/payment/?id="+orderSn;
+        return "redirect:" + CacheUtil.mainUrl +  "/payment/?id="+orderSn;
     }