+ *
+ * 返回值包括二维码字符串，二维码图片，支付地址，商户可以自行决定直接展示二维码或跳转支付页，跳转支付页需要带上签名信息。 + * 货币类型如果是CNY，注意通过汇率转换后不得低于0.01AUD，否则订单可以创建成功，但支付时会报金额不合法错误 + * @apiHeader Accept application/json + * @apiHeader Content-Type application/json + * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4-6位大写字母或数字构成 + * @apiParam (PathVariable) {String} order_id 必填，商户支付订单号，要求同一商户唯一 + * @apiUse Sign + * @apiParam (JSON) {String} description 必填，订单标题（最大长度128字符，超出自动截取） + * @apiParam (JSON) {int} price 必填，金额，单位为货币最小单位，例如使用100表示1.00 AUD + * @apiParam (JSON) {String=AUD,CNY} currency=AUD 币种代码 + * @apiParam (JSON) {String=Alipay,Wechat} channel 支付渠道，大小写敏感 + * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知 + * @apiParam (JSON) {String} operator 操作人员标识 + * + * @apiSuccess {String} return_code 执行结果 + * @apiSuccess {String} result_code SUCCESS表示创建订单成功，EXISTS表示订单已存在 + * @apiSuccess {String} channel 支付渠道 + * @apiSuccess {String} partner_code 商户编码 + * @apiSuccess {String} full_name 商户注册全名 + * @apiSuccess {String} partner_name 商户名称 + * @apiSuccess {String} order_id GlobalFreePay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} partner_order_id 商户订单ID + * @apiSuccess {String} code_url 支付码字符串，商户可以据此自行生产二维码 + * @apiSuccess {String} qrcode_img Base64封装的二维码图片，可直接作为img的src属性 + * @apiSuccess {String} pay_url 跳转URL + * + * @apiUse GlobalError + * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配 + * @apiError (ERROR_CODE) ORDER_PAID 订单已支付 + * + */ /** * @api {GET} /api/v1.0/gateway/partners/{partner_code}/orders/{order_id}/pay QRCode支付跳转页 * @apiName QRCodePay @@ -541,7 +580,7 @@ *
-
*
- Credit: 入账 @@ -603,7 +642,7 @@ *
- 7: RoyalPay 商户静态码(已停用) *
- 8: H5网关 *
-
*
- Credit: 入账 @@ -643,7 +682,7 @@ * @apiParam (JSON) {int} real_fee 支付金额，单位是最小货币单位 * @apiParam (JSON) {Double} rate 交易时使用的汇率，1AUD=?CNY * @apiParam (JSON) {String} currency 币种，AUD - * @apiParam (JSON) {String} channel 支付渠道 Alipay|支付宝、Wechat|微信、Bestpay|翼支付 + * @apiParam (JSON) {String} channel 支付渠道 Alipay|支付宝、AlipayOnline|支付宝线上、Wechat|微信、Bestpay|翼支付 * @apiParam (JSON) {String} create_time 订单创建时间，格式为'yyyy-MM-dd HH:mm:ss'，GMT+10 * @apiParam (JSON) {String} pay_time 订单支付时间，格式为'yyyy-MM-dd HH:mm:ss'，GMT+10 * diff --git a/src/document/en/apidoc.json b/src/document/en/apidoc.json index 3ae8f4594..b8c3e6bc4 100644 --- a/src/document/en/apidoc.json +++ b/src/document/en/apidoc.json @@ -12,6 +12,7 @@ "Overview", "QRCode", "NewQRCode", + "NativeQRCode", "QRCodePay", "JSApi", "NewJSAPI", diff --git a/src/document/en/apis.js b/src/document/en/apis.js index b759a76ea..0f370f2df 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -95,6 +95,46 @@ * @apiError (ERROR_CODE) ORDER_PAID Order has already been paid * */ +/** + * @api {PUT} /api/v1.0/gateway/partners/{partner_code}/native_orders/{order_id} Create QR Code Payment + * @apiName NativeQRCode + * @apiGroup QRCode + * @apiVersion 1.0.0 + * @apiDescription + * QR Code Payment is used for webpage/application on PC. Customers use WeChat or Alipay app to scan QR Code generated when creating order and finish the payment.
- 7: RoyalPay Static Merchant QRCode(deprecated) *
- 8: H5 Payment Gateway *
+ *
+ * Return value contains QR Code string, QR Ccode image and payment page address. Partners can decide how to finish the payment. + * If the currency is CNY, equivalent AUD amount shall never less than 0.01 AUD, + * otherwise user will get Invalid Amount Error from WeChat when making the payment. + * @apiHeader Accept application/json + * @apiHeader Content-Type application/json + * @apiParam (PathVariable) {String} partner_code Required, Partner Code + * @apiParam (PathVariable) {String} order_id Required, Partner order id. Shall be unique for the same partner. If repeated, order will be recognized as an existing order. + * @apiUse Sign + * @apiParam (JSON) {String} description Required, Description of an order. + * @apiParam (JSON) {int} price Required, Price of the order. Use the base unit of the currency. + * @apiParam (JSON) {String=AUD,CNY} currency=AUD Currency + * @apiParam (JSON) {String=Alipay,Wechat} channel Payment channel, case sensitive + * @apiParam (JSON) {String} notify_url System will call the notify url if provided when the payment succeeds + * @apiParam (JSON) {String} operator Note for the operator who created this order. + * + * @apiSuccess {String} return_code Execution result + * @apiSuccess {String} result_code SUCCESS means order created successfully, EXISTS means order has already existed. + * @apiSuccess {String} channel Payment channel + * @apiSuccess {String} partner_code Partner code + * @apiSuccess {String} full_name Partner's full company name when registered + * @apiSuccess {String} partner_name Partner's name + * @apiSuccess {String} order_id Order id in GlobalFreePay, which is also WeChat order id. The final order id which is paid may be different from this one. + * @apiSuccess {String} partner_order_id Partner order id + * @apiSuccess {String} code_url QR Code string. Partners can create the payment QR Code according to this value. + * @apiSuccess {String} qrcode_img QR Code image formatted in Base64. Can be used as the src attribute on img element + * @apiSuccess {String} pay_url Payment page in GlobalFreePay + * + * @apiUse GlobalError + * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner. + * @apiError (ERROR_CODE) ORDER_PAID Order has already been paid + * + */ /** * @api {GET} /api/v1.0/gateway/partners/{partner_code}/orders/{order_id}/pay QR Code Payment Page in RoyalPay * @apiName QRCodePay @@ -550,7 +590,7 @@ *
-
*
- Credit: Income @@ -613,7 +653,7 @@ *
- 7: RoyalPay Static Merchant QRCode(deprecated) *
- 8: H5 Payment Gateway *
-
*
- Credit: Income @@ -653,7 +693,7 @@ * @apiParam (JSON) {int} real_fee Actual paid amount * @apiParam (JSON) {Double} rate Exchange Rate used while trading. 1AUD=?CNY * @apiParam (JSON) {String} currency Currency,AUD - * @apiParam (JSON) {String} channel Payment Channel Alipay、Wechat、Bestpay + * @apiParam (JSON) {String} channel Payment Channel Alipay、AlipayOnline、Wechat、Bestpay * @apiParam (JSON) {String} create_time Time when order is created, which is formatted in 'yyyy-MM-dd HH:mm:ss', UTC+10 * @apiParam (JSON) {String} pay_time Time when order is paid, which is formatted in 'yyyy-MM-dd HH:mm:ss', UTC+10. * diff --git a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java index d48b72cbc..cd462889d 100644 --- a/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java +++ b/src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java @@ -2,9 +2,12 @@ package au.com.royalpay.payment.manage.analysis.core.impls; import au.com.royalpay.payment.manage.analysis.core.DailyReport; import au.com.royalpay.payment.manage.mappers.cashback.CashbackRecordsMapper; +import au.com.royalpay.payment.manage.mappers.financial.FinancialBDCommissionConfigMapper; +import au.com.royalpay.payment.manage.mappers.financial.FinancialBDPrizeLogMapper; import au.com.royalpay.payment.manage.mappers.log.ClearingLogMapper; import au.com.royalpay.payment.manage.mappers.log.DailyReportMapper; import au.com.royalpay.payment.manage.mappers.redpack.ActPartnerLMLogMapper; +import au.com.royalpay.payment.manage.mappers.system.ClientMapper; import au.com.royalpay.payment.manage.mappers.system.ManagerMapper; import au.com.royalpay.payment.tools.permission.enums.ManagerRole; import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApi; @@ -20,13 +23,13 @@ import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.math.BigDecimal; import java.text.ParseException; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.List; @@ -38,6 +41,8 @@ public class DailyReportImp implements DailyReport { @Resource private ManagerMapper managerMapper; @Resource + private ClientMapper clientMapper; + @Resource private DailyReportMapper dailyReportMapper; @Resource private CashbackRecordsMapper cashbackRecordsMapper; @@ -47,6 +52,10 @@ public class DailyReportImp implements DailyReport { private ClearingLogMapper clearingLogMapper; @Resource private MpWechatApiProvider mpWechatApiProvider; + @Resource + private FinancialBDPrizeLogMapper financialBDPrizeLogMapper; + @Resource + private FinancialBDCommissionConfigMapper financialBDCommissionConfigMapper; private Logger logger = LoggerFactory.getLogger(getClass()); @@ -71,6 +80,9 @@ public class DailyReportImp implements DailyReport { JSONObject debitReport = getDebitReport(dt); report.put("debit", JSON.toJSONString(debitReport)); + JSONObject kpiReport = getKPI(dt); + report.put("kpi", JSON.toJSONString(kpiReport)); + dailyReportMapper.save(report); if (sendMsg) { List
- The password can be changed any time when you login. 您登陆后可以任意修改密码 -
- It's recommended to change your password as soon as first login. 建议首次登陆后就修改您的密码 -
- You can set up different accounts for the staff. (At the category:"Accounts") - 您可以为您的员工配置其他账号（在Accounts菜单内） - -
- The password can be changed any time when you login. 您登陆后可以任意修改密码 +
- It's recommended to change your password as soon as first login. 建议首次登陆后就修改您的密码 +
- You can set up different accounts for the staff. (At the category:"Accounts") + 您可以为您的员工配置其他账号（在Accounts菜单内） + +
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/mail/account_reset_email.html b/src/main/resources/templates/mail/account_reset_email.html index 3e390651e..0ef170f16 100644 --- a/src/main/resources/templates/mail/account_reset_email.html +++ b/src/main/resources/templates/mail/account_reset_email.html @@ -22,7 +22,7 @@ 1300 10 77 50
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/mail/new_client_notice.html b/src/main/resources/templates/mail/new_client_notice.html index ee7cd24d6..750855542 100644 --- a/src/main/resources/templates/mail/new_client_notice.html +++ b/src/main/resources/templates/mail/new_client_notice.html @@ -1,110 +1,182 @@ -
Dear :
-I'm happy to let you know that your RoyalPay Cross-border Payment account has been set up.
- 很高兴通知您，贵司RoyalPay跨境全支付已经开通
Please kindly log on the website below to manage your accounts and transactions:
- 请登录这个网站查询管理所有交易
| - Log on website:https://mpay.royalpay.com.au/ - | -||
| - | Account Name | -p/w | -
|---|---|---|
| Manager Account | -- | - |
-
-
Please find the User Guide here :User - Guide for PC or - User - Guide for APP -
-您可以点击链接下载用户手册:PC用户手册 、 - APP用户手册 -
- -(If you cannot open the link above, you can copy and paste this url to your browser. - 如果您无法点击上面的链接，可以复制当前url到浏览器地址栏 - https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf)
--
You can search "RoyalPay" in APP - Store to download APP for IOS，which helps check your payment receiving records.
-您可以在APP Store里搜索"RoyalPay"下载royalpay的app，来进行收款和接收到账提醒等。
-
-
Online RoyalPay Cross-border Payment is also available! The development of the document (API) is - here.
-如需接入网站支付系统，可将下方API链接及授权信息发给IT团队
-
- Chinse version:
- https://mpay.royalpay.com.au/docs/cn/
-
- English version:
- https://mpay.royalpay.com.au/docs/en/
-
-
-
-
- Please contact us via any way displaying below if you have any questions. Thank you for choosing
- RoyalPay.
- 十分感谢您对RoyalPay皇家支付的信任和支持。如果您有任何问题，随时可以按以下方式与我们联系。谢谢！
-
-
- Your dedicated account manager
-
-
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html index 7fb29931e..c4466e71e 100644 --- a/src/main/resources/templates/mail/risk_upload_mail.html +++ b/src/main/resources/templates/mail/risk_upload_mail.html @@ -163,7 +163,7 @@ 1300 10 77 50
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/mail/risk_urge_mail.html b/src/main/resources/templates/mail/risk_urge_mail.html index af9561d35..482cb7858 100644 --- a/src/main/resources/templates/mail/risk_urge_mail.html +++ b/src/main/resources/templates/mail/risk_urge_mail.html @@ -13,7 +13,7 @@ 1300 10 77 50
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/reports/daily_report.html b/src/main/resources/templates/reports/daily_report.html index bc05c2037..1cbb05e2c 100644 --- a/src/main/resources/templates/reports/daily_report.html +++ b/src/main/resources/templates/reports/daily_report.html @@ -31,6 +31,7 @@
+
+
+
- Your dedicated account manager
- 您的专属客户经理
-
-
+
-Dear :
+I'm happy to let you know
+ that your RoyalPay Cross-border Payment account has been set up.
+ 很高兴通知您，贵司RoyalPay跨境全支付已经开通
Please kindly log on the
+ website below to manage your accounts and transactions:
+ 请登录这个网站查询管理所有交易
+
+
+ Manager Account
+
+
+
+
+
+
+
+ p/w:
+
+
+
+
+ attention
+
+ -
+
+
+
+
+ (If
+ you
+ cannot open the link above, you can copy and paste this url to your
+ browser.如果您无法点击上面的链接，可以复制当前url到浏览器地址栏
+
+ https://www.royalpay.com.au/downloads/royalpay_user_guide.pdf
+
+ )
+ You can search "RoyalPay" in APP + Store to download APP for IOS，which helps check your payment receiving records.
++ 您可以在APP Store里搜索"RoyalPay"下载royalpay的app，来进行收款和接收到账提醒等。
+
+
Online RoyalPay + Cross-border + Payment is also available! The development of the document (API) is + here.
++ 如需接入网站支付系统，可将下方API链接及授权信息发给IT团队
+ +
+
+
+
+ Chinse version:
+
+
+
+ English version:
+
+
+
+
+
+
+
+
+
+
+ Please
+ contact us via any
+ way displaying below if you have any questions. Thank you for choosing
+ RoyalPay.
+
+
+ 十分感谢您对RoyalPay皇家支付的信任和支持。如果您有任何问题，随时可以按以下方式与我们联系。谢谢！
+
+
+
+
+ Best Regards
+ + +
+ 
+
+
+
+
+
+
+
+
+
+
+
+
+ Email:
info@royalpay.com.au
+ info@royalpay.com.au
Tel:
1300 10 77 50
+ 1300 10 77 50
Level 14, 383 Kent Street, Sydney NSW 2000
+ Tunnel Show Pty Ltd trading as RoyalPay
+
+
+
+
+
+
+
+ Service WeChat Account:
+ +
+ Level 11, 15 William Street, Melbourne VIC 3000
+ Representative of AFSL licensee 448066
+ -
Best Regards
-
- 
- Contact Us
- Email:
- info@royalpay.com.au
- Tel:
- 1300 10 77 50
-
- Service WeChat Account:
-
- Level 14, 383 Kent Street, Sydney NSW 2000
-
- Level 11, 15 William Street, Melbourne VIC 3000
-
Tunnel Show Pty Ltd trading as RoyalPay
- Representative of AFSL licensee 448066
-
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/mail/risk_upload_mail.html b/src/main/resources/templates/mail/risk_upload_mail.html index 7fb29931e..c4466e71e 100644 --- a/src/main/resources/templates/mail/risk_upload_mail.html +++ b/src/main/resources/templates/mail/risk_upload_mail.html @@ -163,7 +163,7 @@ 1300 10 77 50
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/mail/risk_urge_mail.html b/src/main/resources/templates/mail/risk_urge_mail.html index af9561d35..482cb7858 100644 --- a/src/main/resources/templates/mail/risk_urge_mail.html +++ b/src/main/resources/templates/mail/risk_urge_mail.html @@ -13,7 +13,7 @@ 1300 10 77 50
Service WeChat Account:
-
Level 14, 383 Kent Street, Sydney NSW 2000
diff --git a/src/main/resources/templates/reports/daily_report.html b/src/main/resources/templates/reports/daily_report.html index bc05c2037..1cbb05e2c 100644 --- a/src/main/resources/templates/reports/daily_report.html +++ b/src/main/resources/templates/reports/daily_report.html @@ -31,6 +31,7 @@
@@ -132,9 +133,83 @@