|
@@ -252,22 +252,28 @@ public class SandPayService {
|
|
|
UUID uuid = UUID.randomUUID();
|
|
UUID uuid = UUID.randomUUID();
|
|
|
String mer_order_no = uuid.toString().replaceAll("-", "");
|
|
String mer_order_no = uuid.toString().replaceAll("-", "");
|
|
|
String notify_url = sandPayProperties.getNotifyUrl();
|
|
String notify_url = sandPayProperties.getNotifyUrl();
|
|
|
|
|
+ String order_amt = amount.toPlainString();
|
|
|
//"userId":"用户在商户下唯一标识 1-10位","userName":"证件姓名","idCard":"18位身份证号码"
|
|
//"userId":"用户在商户下唯一标识 1-10位","userName":"证件姓名","idCard":"18位身份证号码"
|
|
|
String pay_extra = "{\"userId\":\"" + userId + "\",\"userName\":\"" + name + "\",\"idCard\":\"" + idNo + "\"}";
|
|
String pay_extra = "{\"userId\":\"" + userId + "\",\"userName\":\"" + name + "\",\"idCard\":\"" + idNo + "\"}";
|
|
|
//md5key
|
|
//md5key
|
|
|
String key = "KvKQYXhwvkoQRAiQN2IzVSaecqYFP8emDHJrLettbShZsd8k/V2OU/myAV6My/qeotZ8K0WG8ifDzgelCexY7517gmF7SqFUcyuKgSC+HFNmn14C4iy9JRy0NvsSJRjgMzZWAhrwNL5ixuz+UKFTiw==";
|
|
String key = "KvKQYXhwvkoQRAiQN2IzVSaecqYFP8emDHJrLettbShZsd8k/V2OU/myAV6My/qeotZ8K0WG8ifDzgelCexY7517gmF7SqFUcyuKgSC+HFNmn14C4iy9JRy0NvsSJRjgMzZWAhrwNL5ixuz+UKFTiw==";
|
|
|
|
|
|
|
|
|
|
+ JSONObject extend = new JSONObject();
|
|
|
|
|
+ extend.put("type", type);
|
|
|
|
|
+ extend.put("orderId", pOrderId);
|
|
|
|
|
+ extend.put("id", pOrderId);
|
|
|
|
|
|
|
|
Map<String, String> map = new LinkedHashMap<>();
|
|
Map<String, String> map = new LinkedHashMap<>();
|
|
|
map.put("accsplit_flag", "NO");
|
|
map.put("accsplit_flag", "NO");
|
|
|
map.put("create_ip", "127_0_0_1");
|
|
map.put("create_ip", "127_0_0_1");
|
|
|
map.put("create_time", createTime);
|
|
map.put("create_time", createTime);
|
|
|
|
|
+ map.put("extend", extend.toJSONString());
|
|
|
// if(!(gh_static_url==null||"".equals(gh_static_url)))map.put("gh_static_url",gh_static_url);;
|
|
// if(!(gh_static_url==null||"".equals(gh_static_url)))map.put("gh_static_url",gh_static_url);;
|
|
|
map.put("mer_key", mer_key);
|
|
map.put("mer_key", mer_key);
|
|
|
map.put("mer_no", mer_no);
|
|
map.put("mer_no", mer_no);
|
|
|
map.put("mer_order_no", mer_order_no);
|
|
map.put("mer_order_no", mer_order_no);
|
|
|
map.put("notify_url", notify_url);
|
|
map.put("notify_url", notify_url);
|
|
|
- map.put("order_amt", amount.toPlainString());
|
|
|
|
|
|
|
+ map.put("order_amt", order_amt);
|
|
|
map.put("pay_extra", pay_extra);
|
|
map.put("pay_extra", pay_extra);
|
|
|
map.put("return_url", returnUrl);
|
|
map.put("return_url", returnUrl);
|
|
|
map.put("sign_type", "MD5");
|
|
map.put("sign_type", "MD5");
|
|
@@ -275,11 +281,8 @@ public class SandPayService {
|
|
|
map.put("version", version);
|
|
map.put("version", version);
|
|
|
map.put("key", key);
|
|
map.put("key", key);
|
|
|
|
|
|
|
|
- JSONObject extend = new JSONObject();
|
|
|
|
|
- extend.put("type", type);
|
|
|
|
|
- extend.put("orderId", pOrderId);
|
|
|
|
|
- extend.put("id", pOrderId);
|
|
|
|
|
- map.put("extend", extend.toJSONString());
|
|
|
|
|
|
|
+
|
|
|
|
|
+// map.put("extend", "aaa");
|
|
|
// map.put("expire_time",endTime);
|
|
// map.put("expire_time",endTime);
|
|
|
// map.put("goods_name",goods_name);
|
|
// map.put("goods_name",goods_name);
|
|
|
// map.put("product_code","02010006");
|
|
// map.put("product_code","02010006");
|
|
@@ -305,7 +308,8 @@ public class SandPayService {
|
|
|
"&mer_order_no=" + mer_order_no +
|
|
"&mer_order_no=" + mer_order_no +
|
|
|
"&create_time=" + createTime +
|
|
"&create_time=" + createTime +
|
|
|
"&expire_time=" + getTimeout(expireAt, 0) +
|
|
"&expire_time=" + getTimeout(expireAt, 0) +
|
|
|
- "&order_amt=1" +
|
|
|
|
|
|
|
+ "&extend=" + URLEncoder.encode(extend.toJSONString(), StandardCharsets.UTF_8) +
|
|
|
|
|
+ "&order_amt=" + order_amt +
|
|
|
"¬ify_url=" + URLEncoder.encode(notify_url, StandardCharsets.UTF_8) +
|
|
"¬ify_url=" + URLEncoder.encode(notify_url, StandardCharsets.UTF_8) +
|
|
|
"&return_url=" + URLEncoder.encode(returnUrl, StandardCharsets.UTF_8) +
|
|
"&return_url=" + URLEncoder.encode(returnUrl, StandardCharsets.UTF_8) +
|
|
|
"&create_ip=127_0_0_1" +
|
|
"&create_ip=127_0_0_1" +
|