lyhzzz 4 mesiacov pred
rodič
commit
2209a2dba5

+ 1 - 10
src/main/java/com/fdkankan/pay/controller/PayController.java

@@ -59,16 +59,7 @@ public class PayController extends BaseController {
 
     @RequestMapping(value = "/callBack/{orderSn}/{payType}/{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;
-            }
-            log.info("callBack--无效req:{}",request.getMethod());
-        }
+        payOrderService.callBack(orderSn,payType, result,request, response);
         return "redirect:" + CacheUtil.mainUrl +  "/payment/?id="+orderSn;
     }
 

+ 3 - 1
src/main/java/com/fdkankan/pay/controller/StripeController.java

@@ -30,8 +30,10 @@ public class StripeController {
 
     @PostMapping("/webhook")
     public ResultData webhook(@RequestBody JSONObject webhookObj){
-
         StripeWebhookLog stripeWebhookLog = new StripeWebhookLog();
+        String type = webhookObj.getString("type");
+
+        stripeWebhookLog.setEventType(type);
         stripeWebhookLog.setMsg(webhookObj.toJSONString());
 
 

+ 21 - 1
src/main/java/com/fdkankan/pay/util/stripe/StripeService.java

@@ -10,6 +10,7 @@ import com.fdkankan.pay.response.OpenPayResponse;
 import com.fdkankan.pay.service.IStripePriceService;
 import com.fdkankan.pay.service.IStripeProductService;
 import com.fdkankan.pay.util.CacheUtil;
+import com.paypal.api.payments.Payment;
 import com.stripe.model.Price;
 import com.stripe.model.Product;
 import com.stripe.model.checkout.Session;
@@ -103,6 +104,25 @@ public class StripeService {
 
     public Boolean callBack(HttpServletRequest request, HttpServletResponse response, Order order, String result) {
         log.info("stripe-callback:{},{}",order,request);
-        return false;
+        Boolean payFlag = false;
+        String trade_no = null;
+        String openId = null;
+        if("cancel".equals(result)){
+            return false;
+        }
+        try {
+            Map<String, String[]> parameterMap = request.getParameterMap();
+            for (String key : parameterMap.keySet()) {
+                log.info("stripe-callBack--request:{},{}",key,request.getParameter(key));
+            }
+
+
+        }catch (Exception e) {
+            log.error("paypal支付回调异常,errorMsg:{}", e.getMessage());
+            return false;
+        }finally {
+            //orderService.payResult(order,payFlag,trade_no,openId);
+        }
+        return  true;
     }
 }