|
@@ -12,6 +12,7 @@ import com.fdkankan.common.exception.BusinessException;
|
|
|
import com.fdkankan.common.util.MD5;
|
|
|
import com.fdkankan.redis.util.RedisUtil;
|
|
|
import com.fdkankan.ucenter.common.RedisKeyUtil;
|
|
|
+import com.fdkankan.ucenter.common.constants.NacosProperty;
|
|
|
import com.fdkankan.ucenter.constant.QrCodeFilePath;
|
|
|
import com.fdkankan.ucenter.pay.alipay.AlipayDefaultConfig;
|
|
|
import com.fdkankan.ucenter.pay.alipay.sdk.AlipayGoodsDetail;
|
|
@@ -51,8 +52,6 @@ public class PayOrderService {
|
|
|
@Autowired
|
|
|
private PaypalService paypalService;
|
|
|
|
|
|
- @Value("${main.url}")
|
|
|
- private String mainUrl;
|
|
|
@Autowired
|
|
|
RedisUtil redisUtil;
|
|
|
|
|
@@ -68,7 +67,7 @@ public class PayOrderService {
|
|
|
alipaymentEx.setGoodsDetailList(goodsDetailList);
|
|
|
String pngPath = QrCodeFilePath.ALI_QRCODE_FOLDER + orderSn + ".png";
|
|
|
try {
|
|
|
- Map<String, String> alipayMap = alipayService.tradePrecreate(alipaymentEx, mainUrl + alipayDefaultConfig.getNotifyUrl());
|
|
|
+ Map<String, String> alipayMap = alipayService.tradePrecreate(alipaymentEx, NacosProperty.getMainUrl() + alipayDefaultConfig.getNotifyUrl());
|
|
|
if ("0".equals(alipayMap.get("code"))){
|
|
|
BufferedImage image = AlipayUtil.getQRCodeImge(alipayMap.get("qr_code"));
|
|
|
File file = new File(pngPath);
|
|
@@ -124,9 +123,9 @@ public class PayOrderService {
|
|
|
//将参数传入到 BizModel中
|
|
|
alipayRequest.setBizModel(model);
|
|
|
//异步回调地址
|
|
|
- alipayRequest.setNotifyUrl(mainUrl + alipayDefaultConfig.getNotifyUrl());
|
|
|
+ alipayRequest.setNotifyUrl(NacosProperty.getMainUrl() + alipayDefaultConfig.getNotifyUrl());
|
|
|
//同步回调地址
|
|
|
- alipayRequest.setReturnUrl(mainUrl + alipayDefaultConfig.getReturnUrl());
|
|
|
+ alipayRequest.setReturnUrl(NacosProperty.getMainUrl() + alipayDefaultConfig.getReturnUrl());
|
|
|
|
|
|
String result = "";
|
|
|
try {
|
|
@@ -177,7 +176,7 @@ public class PayOrderService {
|
|
|
data.put("fee_type", "CNY");
|
|
|
data.put("total_fee", totalFee.stripTrailingZeros().toPlainString());
|
|
|
data.put("spbill_create_ip", config.getCreateIP());
|
|
|
- data.put("notify_url", mainUrl + config.getNotifyURL());
|
|
|
+ data.put("notify_url", NacosProperty.getMainUrl() + config.getNotifyURL());
|
|
|
data.put("trade_type", "NATIVE"); // 此处指定为扫码支付
|
|
|
data.put("product_id", orderSn); //多个商品,使用订单号
|
|
|
|
|
@@ -219,7 +218,7 @@ public class PayOrderService {
|
|
|
data.put("fee_type", "CNY");
|
|
|
data.put("total_fee", totalFee.stripTrailingZeros().toPlainString());
|
|
|
data.put("spbill_create_ip", ipAddress);
|
|
|
- data.put("notify_url", mainUrl + config.getNotifyURL());
|
|
|
+ data.put("notify_url", NacosProperty.getMainUrl() + config.getNotifyURL());
|
|
|
data.put("trade_type", "MWEB"); // 此处指定为扫码支付
|
|
|
data.put("product_id", orderSn); //多个商品,使用订单号
|
|
|
data.put("nonce_str", MD5.getMessageDigest(String.valueOf(new Random().nextInt(10000)).getBytes()));
|
|
@@ -231,7 +230,7 @@ public class PayOrderService {
|
|
|
String return_msg = resp.get("return_msg");
|
|
|
if ("SUCCESS".equals(return_code) && "OK".equals(return_msg)) {
|
|
|
mweb_url = resp.get("mweb_url");//调微信支付接口地址
|
|
|
- mweb_url += "&redirect_url=" + URLEncoder.encode(mainUrl + config.getH5RedirectURL(), "UTF-8");
|
|
|
+ mweb_url += "&redirect_url=" + URLEncoder.encode(NacosProperty.getMainUrl() + config.getH5RedirectURL(), "UTF-8");
|
|
|
log.warn("mweb_url=" + mweb_url);
|
|
|
} else {
|
|
|
log.error("微信统一支付接口获取预支付订单出错");
|
|
@@ -253,7 +252,7 @@ public class PayOrderService {
|
|
|
data.put("fee_type", "CNY");
|
|
|
data.put("total_fee", totalFee.stripTrailingZeros().toPlainString());
|
|
|
data.put("spbill_create_ip", ipAddress);
|
|
|
- data.put("notify_url", mainUrl + config.getNotifyURL());
|
|
|
+ data.put("notify_url", NacosProperty.getMainUrl() + config.getNotifyURL());
|
|
|
data.put("trade_type", "JSAPI");
|
|
|
data.put("product_id", orderSn);
|
|
|
data.put("openid", openid);
|