fix 端口

netflix-service/src/main/java/com/cyksj/common/EnvCommonService.java

@@ -26,6 +26,7 @@ public class EnvCommonService {
 
 	private static String port;
 
+	private static String api;
 	@Value(value = "${spring.profiles.active}")
 	private String env;
 
@@ -40,6 +41,9 @@ public class EnvCommonService {
 		return port = EnvCommonService.active_prd.equals(getEnv()) ? "8081" : "8083";
 	}
 
+	public String getApi() {
+		return api = EnvCommonService.active_prd.equals(getEnv()) ? "api" : "api2";
+	}
 	public String getDomain() {
 		return this.getHost().substring(0, this.getHost().indexOf(port));
 	}

netflix-service/src/main/java/com/cyksj/service/paypal/PayPalService.java

@@ -128,7 +128,7 @@ public class PayPalService{
         RedirectUrls redirectUrls = new RedirectUrls();
 
         redirectUrls.setCancelUrl(paypalPayConfig.getCancelUrl());
-        String returnUrl = "https://" + paypalPayConfig.getHost() + "/"+envCommonService.getPort()+"/api/applets/order/paypal/notify";
+        String returnUrl = "https://" + paypalPayConfig.getHost() + "/"+envCommonService.getPort()+"/"+envCommonService.getApi()+"/applets/order/paypal/notify";
         //成功回调地址(自己写的/pay/success)
         redirectUrls.setReturnUrl(returnUrl);
 
@@ -138,7 +138,7 @@ public class PayPalService{
 
         //订单价格
         Amount amount = new Amount();
-        amount.setCurrency("USD");
+        amount.setCurrency(orderDon.getCurrency());
         // 支付的总价，paypal会校验 total = subTotal + tax + ...
         BigDecimal totalMoney = orderDon.getMoney().divide(new BigDecimal(100), 2, RoundingMode.HALF_DOWN);
         amount.setTotal(totalMoney.toString());