From 1e49ee0b9e72cbf04f5b5f627f8692f2c042623a Mon Sep 17 00:00:00 2001 From: lujian Date: Tue, 12 Feb 2019 11:01:30 +0800 Subject: [PATCH 01/12] [fix] --- .../com/royalpay/payment/manage/mappers/payment/OrderMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml index 4c51f4555..5171d702a 100644 --- a/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml +++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/payment/OrderMapper.xml @@ -813,6 +813,7 @@ AND t.refund_id IS NULL AND t.transaction_type = 'Credit' AND t.channel != 'System' + AND t.system_generate = 0 WHERE t.order_id = #{order_id} AND p.client_id = #{client_id} From 644d112b943d5d40cef4398bd742ff7fc3b47331 Mon Sep 17 00:00:00 2001 From: "james.zhao" Date: Tue, 12 Feb 2019 12:02:47 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E8=BF=9B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/partner-manage.js | 12 ++++++++++++ .../partner/templates/partner_payment_info.html | 1 + 2 files changed, 13 insertions(+) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index f66840075..d9da711e5 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -1495,6 +1495,18 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}) }); }; + $scope.submitAlipaySubId = function () { + commonDialog.confirm({ + title: 'Warning', + content: '是否使用该商户的现有信息进件？' + }).then(function () { + $http.post('/sys/partners/' + $scope.partner.client_moniker + '/register/alipay_gms').then(function () { + commonDialog.alert({title: 'Success', content: 'Alipay进件成功', type: 'success'}); + }, function (resp) { + commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'}); + }) + }) + }; $scope.refreshCredential = function () { commonDialog.confirm({ title: 'Warning', diff --git a/src/main/ui/static/payment/partner/templates/partner_payment_info.html b/src/main/ui/static/payment/partner/templates/partner_payment_info.html index cd824b9da..d7edcf5da 100644 --- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html +++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html @@ -71,6 +71,7 @@

{{paymentInfo.ali_sub_merchant_id||'Not Configure'}} +

Date: Tue, 12 Feb 2019 13:32:20 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=BB=86=E8=8A=82=20&&=20=202015-2019=E7=89=88?= =?UTF-8?q?=E6=9D=83=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 3 ++- src/main/ui/static/menu/templates/home.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 2fb9b46a9..6e300133f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -54,7 +54,8 @@ app.attachment.source=03 app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499665073802_qV7fpEuS9rdbTnpa4po6rmbW9CSUfE.pdf ##聚合支付合同模板 #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/10/1510280089107_D7CMUz4S1iwBI9IPj5P6ItkiGClmPK.pdf -app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf +#app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf +app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549943852025_DdxT22jpvrdJRaJuQR1S6OGubCXEyW.pdf app.host.main=http://192.168.0.85:9002/ app.host.regions.cn=https://mpay-cn.royalpay.com.au/ diff --git a/src/main/ui/static/menu/templates/home.html b/src/main/ui/static/menu/templates/home.html index a16f87ba5..283fe4e14 100644 --- a/src/main/ui/static/menu/templates/home.html +++ b/src/main/ui/static/menu/templates/home.html @@ -165,7 +165,7 @@
- Copyright © 2015-2017 RoyalPay. All rights + Copyright © 2015-2019 RoyalPay. All rights reserved.
From 8d64f75ff501b3bb183ed13cb60d3e6311e65d11 Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 12 Feb 2019 13:52:23 +0800 Subject: [PATCH 04/12] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E5=90=88?= =?UTF-8?q?=E5=90=8C=E7=BB=86=E8=8A=82=20&&=20=202015-2019=E7=89=88?= =?UTF-8?q?=E6=9D=83=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 2 +- src/main/ui/application_index.html | 2 +- src/main/ui/index.html | 4 ++-- src/main/ui/manage.html | 2 +- src/main/ui/managev2.html | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 6e300133f..5f83d2252 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -55,7 +55,7 @@ app.agreetemplate.classic.path=https://file.royalpay.com.au/open/2017/07/10/1499 ##聚合支付合同模板 #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/10/1510280089107_D7CMUz4S1iwBI9IPj5P6ItkiGClmPK.pdf #app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2017/11/17/1510890355946_hQt6yGc0NJ8TYeK7XCuuSAnTI31M7v.pdf -app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549943852025_DdxT22jpvrdJRaJuQR1S6OGubCXEyW.pdf +app.agreetemplate.aggregate.path=https://file.royalpay.com.au/open/2019/02/12/1549950518019_vW4tU5t6D6yA0wMSDNBB9G195W3g99.pdf app.host.main=http://192.168.0.85:9002/ app.host.regions.cn=https://mpay-cn.royalpay.com.au/ diff --git a/src/main/ui/application_index.html b/src/main/ui/application_index.html index f80a9373e..d0be86c60 100644 --- a/src/main/ui/application_index.html +++ b/src/main/ui/application_index.html @@ -185,7 +185,7 @@ - Copyright © 2015-2016 RoyalPay. All rights + Copyright © 2015-2019 RoyalPay. All rights reserved.   
-

Custom

+

海关

  1. - Custom + 海关
    2. -
  2. Report Custom
    3. +
  3. 海关申报
@@ -35,52 +35,114 @@
-->
- +

All | + ng-click="params.report_status='ALL';loadList()">全部 | Saved | + ng-click="params.report_status='0';loadList()">暂存 | Submitted | + ng-click="params.report_status='1';loadList()">已提交 | Failed | + ng-click="params.report_status='2';loadList()">失败 | Success | + ng-click="params.report_status='3';loadList()">成功 |

- +
- +

+ 全部 | + 微信 | + 支付宝| + 支付宝线上 +

+
+
+
+ +
+ +
+ ~ +
+ +
+
+ 今日 +
+
+ 昨日 +
+
+ 过去7日 +
+
+ 本月 +
+
+ 上月 +
+
+ +
+
+
-
+ + + + + + + + + + +
-

- Custom Order List +

+ 报关订单列表 + 商户报关API

- - - - - - + + + + + + @@ -116,20 +178,20 @@
Order IdTimeOrder AmountCNY AmountReport StatusOperation订单号时间金额金额（CNY）报关状态操作
- - Submit + 提交 - - @@ -153,8 +215,7 @@ first-text="«" last-text="»">
-
Total Records:{{pagination.totalCount}};Total - Pages:{{pagination.totalPages}} +
总单数:{{pagination.totalCount}};总页数:{{pagination.totalPages}}
diff --git a/src/main/ui/static/payment/custom/templates/custom_add.html b/src/main/ui/static/payment/custom/templates/custom_add.html index decf68d7b..7fd6cfe75 100644 --- a/src/main/ui/static/payment/custom/templates/custom_add.html +++ b/src/main/ui/static/payment/custom/templates/custom_add.html @@ -1,6 +1,6 @@
-

Submit Declare Custom

-

Edit Declare Custom

+

海关申报

+

海关申报编辑

@@ -8,48 +8,48 @@
- +
- +
- +
-
- -
- -
-
+ + + + + + -
- -
- -
-
+ + + + + +
- +
@@ -62,11 +62,11 @@ - - + + - + @@ -76,7 +76,7 @@ @@ -86,20 +86,20 @@
- +
- +
- +
@@ -107,6 +107,6 @@
- - -
\ No newline at end of file + + + diff --git a/src/main/ui/static/payment/custom/templates/custom_detail.html b/src/main/ui/static/payment/custom/templates/custom_detail.html index 69c9aa71e..469b034bf 100644 --- a/src/main/ui/static/payment/custom/templates/custom_detail.html +++ b/src/main/ui/static/payment/custom/templates/custom_detail.html @@ -1,5 +1,5 @@
-

Add Declare Custom

+

报关详情

@@ -7,28 +7,28 @@
- +
- +
- +
- +
@@ -41,8 +41,8 @@
Order AmountTransport Fee金额手续费 Operation操作
- remove + 移除
- - + + @@ -61,4 +61,4 @@ - \ No newline at end of file + diff --git a/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java b/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java index 4e73e741f..66b0c559f 100644 --- a/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java +++ b/src/test/java/au/com/royalpay/payment/manage/process/custom/ManualReportCustom.java @@ -1,8 +1,8 @@ package au.com.royalpay.payment.manage.process.custom; import au.com.royalpay.payment.channels.alipay.runtime.impls.AlipayCustomDeclaringTaskProcessor; -import au.com.royalpay.payment.core.mappers.PmtCustomReportsDetailMapper; -import au.com.royalpay.payment.core.mappers.PmtCustomReportsMapper; +//import au.com.royalpay.payment.core.mappers.PmtCustomReportsDetailMapper; +//import au.com.royalpay.payment.core.mappers.PmtCustomReportsMapper; import au.com.royalpay.payment.core.mappers.PmtOrderMapper; import au.com.royalpay.payment.manage.mappers.custom.CustomReportDetailsMapper; import au.com.royalpay.payment.manage.mappers.custom.CustomReportsMapper; @@ -27,28 +27,28 @@ import java.util.List; @RunWith(SpringRunner.class) public class ManualReportCustom { - @Autowired - private AlipayCustomDeclaringTaskProcessor processor; - @Resource - private PmtCustomReportsMapper pmtCustomReportsMapper; - @Resource - private PmtOrderMapper pmtOrderMapper; - @Resource - private PmtCustomReportsDetailMapper pmtCustomReportsDetailMapper; - - @Test - public void test() { - String reportId = "05482201808142036430702208"; - List customs = pmtCustomReportsMapper.findReport(reportId); - List sub = pmtCustomReportsDetailMapper.listSubReports(reportId); - JSONObject order = pmtOrderMapper.find(reportId); - - JSONObject task = new JSONObject(); - task.put("channel", order.getString("channel")); - task.put("merchant_id", order.getString("merchant_id")); - task.put("sub_orders", sub); - task.put("report", customs.stream().filter(rep -> rep.getIntValue("report_status") == 2) - .findFirst().orElseThrow(() -> new RuntimeException("No Failure Reports"))); - processor.process(task); - } +// @Autowired +// private AlipayCustomDeclaringTaskProcessor processor; +// @Resource +// private PmtCustomReportsMapper pmtCustomReportsMapper; +// @Resource +// private PmtOrderMapper pmtOrderMapper; +// @Resource +// private PmtCustomReportsDetailMapper pmtCustomReportsDetailMapper; +// +// @Test +// public void test() { +// String reportId = "05482201808142036430702208"; +// List customs = pmtCustomReportsMapper.findReport(reportId); +// List sub = pmtCustomReportsDetailMapper.listSubReports(reportId); +// JSONObject order = pmtOrderMapper.find(reportId); +// +// JSONObject task = new JSONObject(); +// task.put("channel", order.getString("channel")); +// task.put("merchant_id", order.getString("merchant_id")); +// task.put("sub_orders", sub); +// task.put("report", customs.stream().filter(rep -> rep.getIntValue("report_status") == 2) +// .findFirst().orElseThrow(() -> new RuntimeException("No Failure Reports"))); +// processor.process(task); +// } } From 170677d696bc485ff60bb31d315d7fffe955083a Mon Sep 17 00:00:00 2001 From: "james.zhao" Date: Mon, 18 Feb 2019 21:57:32 +0800 Subject: [PATCH 11/12] api update --- src/document/cn/apidoc.json | 3 ++- src/document/cn/apis.js | 2 +- src/document/en/apidoc.json | 2 +- src/document/en/apis.js | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/document/cn/apidoc.json b/src/document/cn/apidoc.json index 5e0a9dc9b..efe6879d0 100644 --- a/src/document/cn/apidoc.json +++ b/src/document/cn/apidoc.json @@ -27,8 +27,9 @@ "JD_Online_Payment", "Alipay_Online_Payment", "HF_Online_Payment", + "CB_BankPay", "SDKPayment", - "CustomsDeclare", + "Custom", "CommonApi", "GetExchange", "OrderStatus", diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index 2998de1da..30ebafcbc 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -923,7 +923,7 @@ * */ /** - * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/query/{report_id} 查询报关单 + * @api {GET} /api/v1.0/customs/partners/{partner_code}/declare/query/{report_id} 查询报关单 * @apiName declare_query * @apiDescription * 用于商户查询报关单号的状态。 diff --git a/src/document/en/apidoc.json b/src/document/en/apidoc.json index 87ce1f722..2749f0203 100644 --- a/src/document/en/apidoc.json +++ b/src/document/en/apidoc.json @@ -29,7 +29,7 @@ "HF_Online_Payment", "CB_BankPay", "SDKPayment", - "CustomsDeclare", + "Custom", "CommonApi", "GetExchange", "OrderStatus", diff --git a/src/document/en/apis.js b/src/document/en/apis.js index c29a618b7..1f8c67d3b 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -940,7 +940,7 @@ * */ /** - * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/query/{report_id} Query Declare ID + * @api {GET} /api/v1.0/customs/partners/{partner_code}/declare/query/{report_id} Query Declare ID * @apiName declare_query * @apiDescription * Used by the merchant to check the status of the customs declaration number. From 00eabd51aa342740d4ceaa5511f89550ad89ae5e Mon Sep 17 00:00:00 2001 From: "james.zhao" Date: Mon, 18 Feb 2019 22:00:53 +0800 Subject: [PATCH 12/12] fix --- src/document/cn/apis.js | 4 ++-- src/document/en/apis.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index 30ebafcbc..4b2a60ff2 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -884,7 +884,7 @@ * 用于商户提交海关需要的订单附件信息。仅支持微信和支付宝，微信只支持一个月内的支付订单进行报关申请。 * * @apiVersion 1.0.0 - * @apiGroup CustomsDeclare + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成 @@ -929,7 +929,7 @@ * 用于商户查询报关单号的状态。 * * @apiVersion 1.0.0 - * @apiGroup CustomsDeclare + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成 diff --git a/src/document/en/apis.js b/src/document/en/apis.js index 1f8c67d3b..75ffdddbd 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -901,7 +901,7 @@ * Used to submit the attachment information of the order required by the merchant. WeChat and Alipay are only supported. WeChat only supports payment orders within one month for customs declaration. * * @apiVersion 1.0.0 - * @apiGroup CustomsDeclare + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json * @apiParam (PathVariable) {String} partner_code Required, Partner code @@ -946,7 +946,7 @@ * Used by the merchant to check the status of the customs declaration number. * * @apiVersion 1.0.0 - * @apiGroup CustomsDeclare + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json * @apiParam (PathVariable) {String} partner_code Required, Partner code
Order AmountTransport Fee金额手续费