|
@@ -149,8 +149,14 @@ public class PayServiceImpl implements PayService {
|
|
// 时间戳
|
|
// 时间戳
|
|
long time = System.currentTimeMillis() / 1000;
|
|
long time = System.currentTimeMillis() / 1000;
|
|
JSONObject json = getPayParameter(payment, request, time);
|
|
JSONObject json = getPayParameter(payment, request, time);
|
|
|
|
+ String environment = "";
|
|
|
|
+ if (payment.getNotifyUrl().contains("8008")) {
|
|
|
|
+ environment = "DEV";
|
|
|
|
+ } else if (payment.getNotifyUrl().contains("spi-b")) {
|
|
|
|
+ environment = "BETA";
|
|
|
|
+ }
|
|
// 商户订单号
|
|
// 商户订单号
|
|
- String orderId = order.getOrderNo() + "T" + time;
|
|
|
|
|
|
+ String orderId = order.getOrderNo() + "T" + time + environment;
|
|
json.put("orderId", orderId);
|
|
json.put("orderId", orderId);
|
|
//商品名称
|
|
//商品名称
|
|
String product = "采美订单" + order.getOrderNo();
|
|
String product = "采美订单" + order.getOrderNo();
|
|
@@ -712,8 +718,14 @@ public class PayServiceImpl implements PayService {
|
|
// 时间戳
|
|
// 时间戳
|
|
long time = System.currentTimeMillis() / 1000;
|
|
long time = System.currentTimeMillis() / 1000;
|
|
JSONObject json = getPayParameter(payment, request, time);
|
|
JSONObject json = getPayParameter(payment, request, time);
|
|
|
|
+ String environment = "";
|
|
|
|
+ if (payment.getNotifyUrl().contains("8008")) {
|
|
|
|
+ environment = "DEV";
|
|
|
|
+ } else if (payment.getNotifyUrl().contains("spi-b")) {
|
|
|
|
+ environment = "BETA";
|
|
|
|
+ }
|
|
// 商户订单号
|
|
// 商户订单号
|
|
- String orderId = payment.getProductId() + "T" + time;
|
|
|
|
|
|
+ String orderId = payment.getProductId() + "T" + time + environment;
|
|
json.put("orderId", orderId);
|
|
json.put("orderId", orderId);
|
|
//商品名称
|
|
//商品名称
|
|
String product = "采美订单" + orderId;
|
|
String product = "采美订单" + orderId;
|