|
|
@@ -664,7 +664,7 @@ public class OrderService {
|
|
|
}
|
|
|
Map<String, Object> expend = new HashMap<>();
|
|
|
paymentParams.put("expend", expend);
|
|
|
- if ("wx_pub".equals(payChannel)) {
|
|
|
+ if ("wx_pub" .equals(payChannel)) {
|
|
|
if (StringUtils.isBlank(openId)) {
|
|
|
throw new BusinessException("缺少openId");
|
|
|
}
|
|
|
@@ -673,7 +673,7 @@ public class OrderService {
|
|
|
}
|
|
|
|
|
|
Map<String, Object> response;
|
|
|
- if ("wx_lite".equals(payChannel)) {
|
|
|
+ if ("wx_lite" .equals(payChannel)) {
|
|
|
paymentParams.put("adapay_func_code", "wxpay.createOrder");
|
|
|
paymentParams.put("callback_url", generalProperties.getHost() + "/9th/orders");
|
|
|
response = AdapayCommon.requestAdapayUits(paymentParams);
|
|
|
@@ -844,10 +844,62 @@ public class OrderService {
|
|
|
|
|
|
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
String localDateTimeNowStr = order.getPayTime().format(formatter);
|
|
|
- String info = "<div style=\"line-height: 40px;background: #06c04f;border-radius: 4px;padding: 0 20px;margin-bottom: 12px;\">RAEX绿洲：RID元域名称交易监控</div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-32-07vINcTaZP.png\"alt=\"\"/><span> RID:" + collection
|
|
|
+// String info = "<div style=\"line-height: 40px;background: #06c04f;border-radius: 4px;padding: 0 20px;margin-bottom: 12px;\">RAEX绿洲：RID元域名称交易监控</div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-32-07vINcTaZP.png\"alt=\"\"/><span> RID:" + collection
|
|
|
+// .getName()
|
|
|
+// .substring(9) + "【已出售】</span></div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-28-32HcaKTDYb.png\"alt=\"\"/><span>分类:【RID元域名】</span></div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-31-49lldhGaqC.png\"alt=\"\"/><span>销售价格:【" + order
|
|
|
+// .getTotalPrice() + "】</span></div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-32-21ciilInpO.png\"alt=\"\"/><span>交易时间：<br/>【" + localDateTimeNowStr + "】</span></div>";
|
|
|
+
|
|
|
+ String info = "<div style=\"padding: 4px 0\">\n" +
|
|
|
+ " <div\n" +
|
|
|
+ " style=\"\n" +
|
|
|
+ " line-height: 40px;\n" +
|
|
|
+ " background: #06c04f;\n" +
|
|
|
+ " border-radius: 4px;\n" +
|
|
|
+ " padding: 0 12px;\n" +
|
|
|
+ " margin-bottom: 12px;\n" +
|
|
|
+ " font-weight: bold;\n" +
|
|
|
+ " \"\n" +
|
|
|
+ " >\n" +
|
|
|
+ " RAEX绿洲：RID元域名称交易监控\n" +
|
|
|
+ " </div>\n" +
|
|
|
+ " <div style=\"display: flex; margin-bottom: 8px\">\n" +
|
|
|
+ " <img\n" +
|
|
|
+ " style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"\n" +
|
|
|
+ " src=\"https://cdn.raex.vip/image/2023-04-06-14-32-07vINcTaZP.png\"\n" +
|
|
|
+ " alt=\"\"\n" +
|
|
|
+ " />\n" +
|
|
|
+ " <span> RID:"
|
|
|
+ + collection
|
|
|
.getName()
|
|
|
- .substring(9) + "【已出售】</span></div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-28-32HcaKTDYb.png\"alt=\"\"/><span>分类:【RID元域名】</span></div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-31-49lldhGaqC.png\"alt=\"\"/><span>销售价格:【" + order
|
|
|
- .getTotalPrice() + "】</span></div><div style=\"display: flex\"><img style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"src=\"https://cdn.raex.vip/image/2023-04-06-14-32-21ciilInpO.png\"alt=\"\"/><span>交易时间：<br/>【" + localDateTimeNowStr + "】</span></div>";
|
|
|
+ .substring(9)
|
|
|
+ + "【已出售】</span>\n" +
|
|
|
+ " </div>\n" +
|
|
|
+ " <div style=\"display: flex; margin-bottom: 8px\">\n" +
|
|
|
+ " <img\n" +
|
|
|
+ " style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"\n" +
|
|
|
+ " src=\"https://cdn.raex.vip/image/2023-04-06-14-28-32HcaKTDYb.png\"\n" +
|
|
|
+ " alt=\"\"\n" +
|
|
|
+ " />\n" +
|
|
|
+ " <span>分类: 【RID元域名】</span>\n" +
|
|
|
+ " </div>\n" +
|
|
|
+ " <div style=\"display: flex; margin-bottom: 8px\">\n" +
|
|
|
+ " <img\n" +
|
|
|
+ " style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"\n" +
|
|
|
+ " src=\"https://cdn.raex.vip/image/2023-04-06-14-31-49lldhGaqC.png\"\n" +
|
|
|
+ " alt=\"\"\n" +
|
|
|
+ " />\n" +
|
|
|
+ " <span>销售价格: 【" + order
|
|
|
+ .getTotalPrice() + " 】</span>\n" +
|
|
|
+ " </div>\n" +
|
|
|
+ " <div style=\"display: flex\">\n" +
|
|
|
+ " <img\n" +
|
|
|
+ " style=\"width: 18px; height: 18px; margin: 5px 10px 0 0\"\n" +
|
|
|
+ " src=\"https://cdn.raex.vip/image/2023-04-06-14-32-21ciilInpO.png\"\n" +
|
|
|
+ " alt=\"\"\n" +
|
|
|
+ " />\n" +
|
|
|
+ " <span>交易时间：<br />【" + localDateTimeNowStr + "】</span>\n" +
|
|
|
+ " </div>\n" +
|
|
|
+ " </div>";
|
|
|
// String info = "元域名:\"" + collection.getName().substring(9)
|
|
|
// .replace(".nft", "") + "\"\n" +
|
|
|
// "持有人:\"" + collection.getOwner() + "\"\n" +
|
