Merge remote-tracking branch 'origin/dev/dev' into dev/dev
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package com.ai.da.controller;
|
||||
|
||||
import com.ai.da.common.response.Response;
|
||||
import com.ai.da.service.CallBackService;
|
||||
import com.ai.da.service.PayPalCheckoutService;
|
||||
import com.paypal.http.HttpResponse;
|
||||
import com.paypal.http.exceptions.SerializeException;
|
||||
@@ -61,7 +60,6 @@ public class PayPalCheckoutController {
|
||||
}else {
|
||||
return Response.fail("Request for refund failed.");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ApiOperation("执行扣款")
|
||||
@@ -70,8 +68,5 @@ public class PayPalCheckoutController {
|
||||
Order response = payPalCheckoutService.captureOrder(orderNo);
|
||||
return Response.success(response);
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user