diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index 5fbbf7c6e..b00da0de6 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -843,7 +843,7 @@ * */ /** - * @api {PUT} /api/v1.0/yeepay/partners/{partner_code}/orders/{order_id} 创建网银快捷支付订单 + * @api {PUT} /api/v1.0/cb_bankpay/partners/{partner_code}/orders/{order_id} 创建网银快捷支付订单 * @apiName cbbankpayapi * @apiDescription * 用于PC端网银快捷支付，创建订单后跳转到返回的pay_url，随后进入网银快捷支付页面完成支付 @@ -858,7 +858,8 @@ * @apiParam (JSON) {String} description 必填，订单标题（最大长度128字符，超出自动截取） * @apiParam (JSON) {int} price 必填，金额，单位为货币最小单位，例如使用100表示AUD1.00 * @apiParam (JSON) {String} product_name 必填 商品名称 - * @apiParam (JSON) {String=AUD} currency=AUD 币种代码(当前仅支持AUD) + * @apiParam (JSON) {int} gateway_type 必填，8：跳转H5网关，9：跳转PC网关 + * @apiParam (JSON) {String=AUD,CNY} currency=AUD 币种代码(若商户选择的通道为拉卡拉则只支持AUD) * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知 * @apiParam (JSON) {String} operator 操作人员标识 * @@ -884,17 +885,17 @@ * 用于商户提交海关需要的订单附件信息。仅支持微信和支付宝，微信只支持一个月内的支付订单进行报关申请。 * * @apiVersion 1.0.0 - * @apiGroup Customs_Declaration + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json - * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成 + * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4-6位大写字母或数字构成 * @apiParam (PathVariable) {String} client_report_id 必填，商户申请报关单号，要求同一商户唯一 * @apiUse Sign * @apiParam (JSON) {String} order_id 必填，商户支付订单号，要求同一商户唯一 * @apiParam (JSON) {String} custom 必填，海关编号 * 渠道海关编号 * @apiParam (JSON) {String} mch_custom_id 必填，商户在海关备案的编号 * @apiParam (JSON) {String} mch_custom_name 必填，商户海关备案名称 - * @apiParam (JSON) {JSONArray} sub_order 子订单(拆单) + * @apiParam (JSON) {JSON[]} sub_order 子订单(拆单) * * @apiParam (SUB_JSON) {String} sub_order_no 商户子订单号 * @apiParam (SUB_JSON) {String=CNY} fee_type=CNY 币种代码 @@ -903,12 +904,12 @@ * * @apiSuccess {String} report_id RoyalPay海关单号 * @apiSuccess {String} client_report_id 商户申请报关单号 - * @apiSuccess {int} report_status 0:暂存,1:提交,2:提交失败,3:提交成功 + * @apiSuccess {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS * @apiSuccess {String} channel 支付渠道 * @apiSuccess {String} custom 海关编号 * @apiSuccess {String} mch_custom_no 商户在海关备案的编号 * @apiSuccess {String} mch_custom_name 商户海关备案名称 - * @apiSuccess {String} order_id Royalpay订单号 + * @apiSuccess {String} order_id RoyalPay订单号 * @apiSuccess {String} transaction_id 支付渠道订单号 * @apiSuccess {String} order_currency 币种 * @apiSuccess {Double} order_amount 订单金额 @@ -923,24 +924,61 @@ * */ /** - * @api {GET} /api/v1.0/customs/partners/{partner_code}/declare/query/{report_id} 查询报关单 + * @api {PUT} /api/v1.0/customs/partners/{partner_code}/redeclare/report/{client_report_id} 重新提交报关单 + * @apiName redeclare_report + * @apiDescription + * 用于重新提交未报关成功的报关单 + * + * @apiVersion 1.0.0 + * @apiGroup Custom + * @apiHeader Accept application/json + * @apiHeader Content-Type application/json + * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4-6位大写字母或数字构成 + * @apiParam (PathVariable) {String} client_report_id 必填，商户申请报关单号，要求同一商户唯一 + * @apiUse Sign + * + * @apiSuccess {String} report_id RoyalPay海关单号 + * @apiSuccess {String} client_report_id 商户申请报关单号 + * @apiSuccess {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS + * @apiSuccess {String} channel 支付渠道 + * @apiSuccess {String} custom 海关编号 + * @apiSuccess {String} mch_custom_no 商户在海关备案的编号 + * @apiSuccess {String} mch_custom_name 商户海关备案名称 + * @apiSuccess {String} order_id RoyalPay订单号 + * @apiSuccess {String} transaction_id 支付渠道订单号 + * @apiSuccess {String} order_currency 币种 + * @apiSuccess {Double} order_amount 订单金额 + * @apiSuccess {String} report_time 报关时间 + * @apiSuccess {String} creation_date 报关单创建时间 + * @apiSuccess {String} last_update_date 更新时间 + * @apiSuccess {String} error_code 错误代码 + * @apiSuccess {String} error_msg 错误返回的信息描述 + * + * @apiUse GlobalError + * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配 + * + */ +/** + * @api {GET} /api/v1.0/customs/partners/{partner_code}/declare/query/{client_report_id} 查询报关单 * @apiName declare_query * @apiDescription * 用于商户查询报关单号的状态。 * * @apiVersion 1.0.0 - * @apiGroup Customs_Declaration + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json - * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成 - * @apiParam (PathVariable) {String} report_id 必填，RoyalPay海关单号 + * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4-6位大写字母或数字构成 + * @apiParam (PathVariable) {String} client_report_id 必填，商户申请报关单号，要求同一商户唯一 * @apiUse Sign * * @apiSuccess {String} return_code 执行结果 - * @apiSuccess {String} report_status 报关单状态 - * @apiSuccess {String} report_id 商户申请报关单号 + * @apiSuccess {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS + * @apiSuccess {String} report_id RoyalPay海关单号 + * @apiSuccess {String} client_report_id 商户申请报关单号 * @apiSuccess {String} return_msg 错误描述，仅在执行结果不为SUCCESS情况下出现 * @apiSuccess {String} order_id RoyalPay订单号 + * @apiSuccess {String} partner_order_id 商户订单ID * * @apiUse GlobalError * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配 diff --git a/src/document/en/apis.js b/src/document/en/apis.js index 383aa3bcf..f89c12af4 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -861,7 +861,7 @@ * */ /** - * @api {PUT} /api/v1.0/yeepay/partners/{partner_code}/orders/{order_id} Create CB BankPay Order + * @api {PUT} /api/v1.0/cb_bankpay/partners/{partner_code}/orders/{order_id} Create CB BankPay Order * @apiName cbbankpayapi * @apiDescription * Use for CB BankPay in PC Website. After create order, jump to the pay_url returned and attach sign params and redirect param. @@ -876,7 +876,8 @@ * @apiParam (JSON) {String} description Required, Order description * @apiParam (JSON) {int} price Required, Price of the order. Use the base unit of the currency. * @apiParam (JSON) {String} product_name Product name Required - * @apiParam (JSON) {String=AUD} currency=AUD Currency (only AUD) + * @apiParam (JSON) {int} gateway_type Gateway Require 8: H5 gateway,9: PC gateway + * @apiParam (JSON) {String=AUD,CNY} currency=AUD Currency (Only AUD When Merchants Choose LakalaPay) * @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. * @@ -895,13 +896,13 @@ * */ /** - * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/query/{client_report_id} Create Declare No. + * @api {PUT} /api/v1.0/customs/partners/{partner_code}/declare/report/{client_report_id} Create Declare ID * @apiName declare_report * @apiDescription * 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 Customs_Declaration + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json * @apiParam (PathVariable) {String} partner_code Required, Partner code @@ -911,7 +912,7 @@ * @apiParam (JSON) {String} custom Required, Customs No. * Customs No. * @apiParam (JSON) {String} mch_custom_id Required, Customs record id * @apiParam (JSON) {String} mch_custom_name Required, Customs record name - * @apiParam (JSON) {JSONArray} sub_order Child orders + * @apiParam (JSON) {JSON[]} sub_order Child orders * * @apiParam (SUB_JSON) {String} sub_order_no Child order ID * @apiParam (SUB_JSON) {String=CNY} fee_type=CNY Currency @@ -920,12 +921,47 @@ * * @apiSuccess {String} report_id RoyalPay declare ID * @apiSuccess {String} client_report_id Client declare ID - * @apiSuccess {int} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS + * @apiSuccess {String} report_status Result status: PROCCESSING,SUBMITED,FAILED,SUCCESS + * @apiSuccess {String} channel Channel + * @apiSuccess {String} custom Customs No. + * @apiSuccess {String} mch_custom_no Customs record ID + * @apiSuccess {String} mch_custom_name Customs record name + * @apiSuccess {String} order_id RoyalPay Order ID + * @apiSuccess {String} transaction_id Channel Order ID + * @apiSuccess {String} order_currency Currency + * @apiSuccess {Double} order_amount Order Amount + * @apiSuccess {String} report_time Declare Time + * @apiSuccess {String} creation_date Create Time + * @apiSuccess {String} last_update_date Update Time + * @apiSuccess {String} error_code Error Code + * @apiSuccess {String} error_msg Error Description + * + * @apiUse GlobalError + * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner + * + */ +/** + * @api {PUT} /api/v1.0/customs/partners/{partner_code}/redeclare/report/{client_report_id} Redeclare + * @apiName redeclare_report + * @apiDescription + * Used to resubmit the attachment information of the order required by the merchant. + * + * @apiVersion 1.0.0 + * @apiGroup Custom + * @apiHeader Accept application/json + * @apiHeader Content-Type application/json + * @apiParam (PathVariable) {String} partner_code Required, Partner code + * @apiParam (PathVariable) {String} client_report_id Required, Client declare ID + * @apiUse Sign + * + * @apiSuccess {String} report_id RoyalPay declare ID + * @apiSuccess {String} client_report_id Client declare ID + * @apiSuccess {String} report_status Result status: PROCCESSING,SUBMITED,FAILED,SUCCESS * @apiSuccess {String} channel Channel * @apiSuccess {String} custom Customs No. * @apiSuccess {String} mch_custom_no Customs record ID * @apiSuccess {String} mch_custom_name Customs record name - * @apiSuccess {String} order_id Royalpay Order ID + * @apiSuccess {String} order_id RoyalPay Order ID * @apiSuccess {String} transaction_id Channel Order ID * @apiSuccess {String} order_currency Currency * @apiSuccess {Double} order_amount Order Amount @@ -940,24 +976,26 @@ * */ /** - * @api {GET} /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/{client_report_id} Query Declare ID * @apiName declare_query * @apiDescription * Used by the merchant to check the status of the customs declaration number. * * @apiVersion 1.0.0 - * @apiGroup Customs_Declaration + * @apiGroup Custom * @apiHeader Accept application/json * @apiHeader Content-Type application/json * @apiParam (PathVariable) {String} partner_code Required, Partner code - * @apiParam (PathVariable) {String} report_id Required，RoyalPay Declare ID + * @apiParam (PathVariable) {String} client_report_id Required，Client declare ID * @apiUse Sign * * @apiSuccess {String} return_code Execution result - * @apiSuccess {String} report_status Result status - * @apiSuccess {String} report_id Client declare ID + * @apiSuccess {String} report_status Result status: PROCCESSING,SUBMITED,FAILED,SUCCESS + * @apiSuccess {String} report_id RoyalPay declare ID + * @apiSuccess {String} client_report_id Client declare ID * @apiSuccess {String} return_msg Error Description - * @apiSuccess {String} order_id RoyalPay Order + * @apiSuccess {String} order_id RoyalPay Order ID + * @apiSuccess {String} partner_order_id Partner Order ID * * @apiUse GlobalError * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java b/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java index 47694c5e7..96a4b83f3 100644 --- a/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java @@ -110,7 +110,7 @@ public class CustomServiceImpl implements CustomService { // if (report.getIntValue("report_status") != 2) { // throw new BadRequestException("order can't report"); // } - customSupport.sendCustom(report_id); + customSupport.resendCustom(report_id); } diff --git a/src/main/java/au/com/royalpay/payment/manage/custom/task/CustomQueryTask.java b/src/main/java/au/com/royalpay/payment/manage/custom/task/CustomQueryTask.java new file mode 100644 index 000000000..07e30a2f7 --- /dev/null +++ b/src/main/java/au/com/royalpay/payment/manage/custom/task/CustomQueryTask.java @@ -0,0 +1,38 @@ +package au.com.royalpay.payment.manage.custom.task; + +import au.com.royalpay.payment.core.CustomSupport; +import au.com.royalpay.payment.core.mappers.PmtCustomReportMapper; +import com.alibaba.fastjson.JSONObject; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author: james7whm + * @Date: 2019/4/2 18:11 + */ +@Component +@ConditionalOnProperty(value = "app.run-tasks", havingValue = "true") +public class CustomQueryTask { + @Resource + private CustomSupport customSupport; + + @Resource + private PmtCustomReportMapper pmtCustomReportMapper; + + @Scheduled(cron = "0 0/10 * * * *") + public void customReportQuery(){ + List reports = pmtCustomReportMapper.findCustomReportNotScucess(); + if(!reports.isEmpty()){ + for (JSONObject report:reports) { + //Alipay直接返回成功与否，Wechat返回的结果较多，成功提交至海关后状态才会变为success，因此只有Wechat需要定时查询报关单状态 + if(report.getString("channel").equals("Wechat")){ + customSupport.queryCustomResult(report.getString("report_id")); + } + } + } + } +} diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java index cb493a8a4..67bf76bc9 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/beans/ClientRegisterInfo.java @@ -64,6 +64,9 @@ public class ClientRegisterInfo { private String jdindustry; private String royalpayindustry; private String hfindustry; + private String lakalapayindustry; + private String lakalapaygoods; + private String lakalapaysettle; private String referrer_id; private String referrer_name; @@ -406,4 +409,28 @@ public class ClientRegisterInfo { public String getClient_pay_desc() { return client_pay_desc; } + + public String getLakalapayindustry() { + return lakalapayindustry; + } + + public void setLakalapayindustry(String lakalapayindustry) { + this.lakalapayindustry = lakalapayindustry; + } + + public String getLakalapaygoods() { + return lakalapaygoods; + } + + public void setLakalapaygoods(String lakalapaygoods) { + this.lakalapaygoods = lakalapaygoods; + } + + public String getLakalapaysettle() { + return lakalapaysettle; + } + + public void setLakalapaysettle(String lakalapaysettle) { + this.lakalapaysettle = lakalapaysettle; + } } diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 42db1c3fc..41b30e865 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -136,4 +136,4 @@ app.hanyin-secure.pid=ROYALPAY app.hanyin-secure.sftp-host=180.168.61.86 app.hanyin-secure.sftp-port=28480 app.hanyin-secure.sftp-username=royalpay -app.hanyin-secure.sftp-pwd=royalpay \ No newline at end of file +app.hanyin-secure.sftp-pwd=royalpay diff --git a/src/main/ui/static/commons/filters/commonFilters.js b/src/main/ui/static/commons/filters/commonFilters.js index 7361abf79..db9d7a6a0 100644 --- a/src/main/ui/static/commons/filters/commonFilters.js +++ b/src/main/ui/static/commons/filters/commonFilters.js @@ -34,6 +34,31 @@ define(['../app', 'jquery'], function (app, $) { } }); + + var lakalapayindustry = []; + $.ajax({ + url: '/static/data/lakalapayindustry.json', + method: 'GET', + async: false, + dataType: 'json', + success: function (data) { + lakalapayindustry = data; + + } + }); + + var lakalapaysettle = []; + $.ajax({ + url: '/static/data/lakalapaysettle.json', + method: 'GET', + async: false, + dataType: 'json', + success: function (data) { + lakalapaysettle = data; + + } + }); + var hfindustry = []; $.ajax({ url: '/static/data/hfindustry.json', @@ -128,6 +153,32 @@ define(['../app', 'jquery'], function (app, $) { } }]); + app.filter('partner_lakala_industry', function () { + + return function (lakalapayindustryCode) { + var result = ""; + angular.forEach(lakalapayindustry, function (industry) { + if (industry.value + 0 == lakalapayindustryCode + 0) { + result = industry.label; + } + }); + return result; + } + }); + + app.filter('partner_lakala_settle', function () { + + return function (lakalapaysettleCode) { + var result = ""; + angular.forEach(lakalapaysettle, function (industry) { + if (industry.value + 0 == lakalapaysettleCode + 0) { + result = industry.label; + } + }); + return result; + } + }); + app.filter('partner_hf_industry', ['$http', function ($http) { return function (industryCode) { var industryLabel = ''; @@ -219,4 +270,4 @@ define(['../app', 'jquery'], function (app, $) { return sectorLabel; } }]); -}); \ No newline at end of file +}); diff --git a/src/main/ui/static/data/lakalapaygoods.json b/src/main/ui/static/data/lakalapaygoods.json new file mode 100644 index 000000000..62265f387 --- /dev/null +++ b/src/main/ui/static/data/lakalapaygoods.json @@ -0,0 +1,8 @@ +[ + {"label":"国际展览","value":"国际展览"}, + {"label":"酒店住宿","value":"酒店住宿"}, + {"label":"留学教育","value":"留学教育"}, + {"label":"货物贸易","value":"货物贸易"}, + {"label":"航空机票","value":"航空机票"}, + {"label":"其他","value":"其他"} +] diff --git a/src/main/ui/static/data/lakalapayindustry.json b/src/main/ui/static/data/lakalapayindustry.json new file mode 100644 index 000000000..0f5eecb8c --- /dev/null +++ b/src/main/ui/static/data/lakalapayindustry.json @@ -0,0 +1,8 @@ +[ + {"label":"酒店住宿、旅游服务","value":"223029"}, + {"label":"航空机票","value":"222024"}, + {"label":"货物贸易","value":"122030"}, + {"label":"国际展览","value":"228025"}, + {"label":"留学教育（一年以上）","value":"223022"}, + {"label":"留学教育（一年及以下）","value":"223023"} +] diff --git a/src/main/ui/static/data/lakalapaysettle.json b/src/main/ui/static/data/lakalapaysettle.json new file mode 100644 index 000000000..1eda0dd76 --- /dev/null +++ b/src/main/ui/static/data/lakalapaysettle.json @@ -0,0 +1,13 @@ +[ + {"label":"货物贸易","value":"0100"}, + {"label":"运输","value":"0210"}, + {"label":"自费出境学习","value":"0221"}, + {"label":"因私旅游","value":"0222"}, + {"label":"公务及商务出国","value":"0223"}, + {"label":"旅游项下其他","value":"0225"}, + {"label":"金融和保险服务","value":"0230"}, + {"label":"专有权利使用费和特许费","value":"0240"}, + {"label":"咨询服务","value":"0250"}, + {"label":"其他服务","value":"0260"} +] + diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index c5835438a..e1a328b7c 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -429,6 +429,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.loadJDindustry(); + $scope.loadLakalaPayindustry = function () { + $http.get('/static/data/lakalapayindustry.json').then(function (resp) { + $scope.lakalapayindustry = resp.data; + }) + }; + $scope.loadLakalaPayindustry(); + + $scope.loadLakalaPaySettle = function () { + $http.get('/static/data/lakalapaysettle.json').then(function (resp) { + $scope.lakalapaysettle = resp.data; + }) + }; + $scope.loadLakalaPaySettle(); + + $scope.loadLakalaPayGoods = function () { + $http.get('/static/data/lakalapaygoods.json').then(function (resp) { + $scope.lakalapaygoods = resp.data; + }) + }; + $scope.loadLakalaPayGoods(); + $scope.loadRoyalpayindustry = function () { $http.get('/static/data/royalpayindustry.json').then(function (resp) { $scope.royalpayindustry = resp.data; @@ -1150,6 +1171,27 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.loadJDindustry(); + $scope.loadLakalaPayindustry = function () { + $http.get('/static/data/lakalapayindustry.json').then(function (resp) { + $scope.lakalapayindustry = resp.data; + }) + }; + $scope.loadLakalaPayindustry(); + + $scope.loadLakalaPaySettle = function () { + $http.get('/static/data/lakalapaysettle.json').then(function (resp) { + $scope.lakalapaysettle = resp.data; + }) + }; + $scope.loadLakalaPaySettle(); + + $scope.loadLakalaPayGoods = function () { + $http.get('/static/data/lakalapaygoods.json').then(function (resp) { + $scope.lakalapaygoods = resp.data; + }) + }; + $scope.loadLakalaPayGoods(); + $scope.loadRoyalpayindustry = function () { $http.get('/static/data/royalpayindustry.json').then(function (resp) { $scope.royalpayindustry = resp.data; @@ -2540,6 +2582,28 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter }; $scope.loadJDindustry(); + $scope.loadLakalaPayindustry = function () { + $http.get('/static/data/lakalapayindustry.json').then(function (resp) { + $scope.lakalapayindustry = resp.data; + }) + }; + $scope.loadLakalaPayindustry(); + + $scope.loadLakalaPaySettle = function () { + $http.get('/static/data/lakalapaysettle.json').then(function (resp) { + $scope.lakalapaysettle = resp.data; + }) + }; + $scope.loadLakalaPaySettle(); + + $scope.loadLakalaPayGoods = function () { + $http.get('/static/data/lakalapaygoods.json').then(function (resp) { + $scope.lakalapaygoods = resp.data; + }) + }; + $scope.loadLakalaPayGoods(); + + $scope.loadRoyalpayindustry = function () { $http.get('/static/data/royalpayindustry.json').then(function (resp) { $scope.royalpayindustry = resp.data; diff --git a/src/main/ui/static/payment/partner/templates/add_partner.html b/src/main/ui/static/payment/partner/templates/add_partner.html index 0ed591d6e..d55bb9ffc 100644 --- a/src/main/ui/static/payment/partner/templates/add_partner.html +++ b/src/main/ui/static/payment/partner/templates/add_partner.html @@ -979,6 +979,63 @@ on-select="onHfIndustrySelect($selected)"> + +
+ +
+ +
+

+ Required Field

+
+
+
+ +
+ +
+ +
+

+ Required Field

+
+
+
+ +
+ +
+ +
+

+ Required Field

+
+
+
@@ -992,4 +1049,4 @@ - \ No newline at end of file + diff --git a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html index d904012ed..e3a4650d3 100644 --- a/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html +++ b/src/main/ui/static/payment/partner/templates/add_sub_partner_dialog.html @@ -743,6 +743,62 @@ on-select="onHfIndustrySelect($selected)"> +
+ +
+ +
+

+ Required Field

+
+
+
+ +
+ +
+ +
+

+ Required Field

+
+
+
+ +
+ +
+ +
+

+ Required Field

+
+
+
@@ -755,4 +811,4 @@
-
\ No newline at end of file + diff --git a/src/main/ui/static/payment/partner/templates/partner_detail.html b/src/main/ui/static/payment/partner/templates/partner_detail.html index 32dc67aec..43d4ab07f 100644 --- a/src/main/ui/static/payment/partner/templates/partner_detail.html +++ b/src/main/ui/static/payment/partner/templates/partner_detail.html @@ -869,6 +869,33 @@ ng-if="$root.complianceCheck.clientInfo"> +
+ +
+

+ +
+
+
+ +
+

+ +
+
+
+ +
+

+ +
+
diff --git a/src/main/ui/static/payment/partner/templates/partner_edit.html b/src/main/ui/static/payment/partner/templates/partner_edit.html index fb4b73361..694524aee 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -843,6 +843,63 @@ on-select="onHfIndustrySelect($selected)"> + +
+ +
+ +
+

+ Required Field

+
+
+
+ +
+ +
+ +
+

+ Required Field

+
+
+
+ +
+ +
+ +
+

+ Required Field

+
+
+
diff --git a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js index 4a85c55fc..196687505 100644 --- a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js +++ b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi.js @@ -77,8 +77,8 @@ $(document).ready(function () { } var select_currency = $('#select_currency').val(); var remark = $('#remark').val(); - var buyForexKind = $('#buyForexKind').val(); - var jsonData = {user_id: customer_id, price: price, product_name: product,gateway_type: 9,description: remark,buy_forex_kind: buyForexKind,currency: select_currency}; + // var buyForexKind = $('#buyForexKind').val(); + var jsonData = {user_id: customer_id, price: price, product_name: product,gateway_type: 9,description: remark,currency: select_currency}; var commit = confirm("是否确认提交支付"); if (commit) { $('#commit-btn').addClass('hidden'); @@ -95,10 +95,11 @@ $(document).ready(function () { $('#commit-btn').removeClass('hidden'); $('#commit-btn-loading').addClass('hidden'); }else { - const $form = $(res.formString); - $('body').append($form); - $form.submit(); - $('body').removeChildren($form); + location.href = res.pay_url+'?'+res.sign_url; + // const $form = $(res.formString); + // $('body').append($form); + // $form.submit(); + // $('body').removeChildren($form); } }, error: function (jqXHR) { diff --git a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js index da5a814c8..16cf505d9 100644 --- a/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js +++ b/src/main/ui/static/templates/cbpay/lakala/v1/gateway_jsapi_phone.js @@ -27,9 +27,9 @@ $(document).ready(function () { $('.surcharge').hide(); $('#commit-btn').click(function () { var currency = $('#select_currency option:selected').val(); - var buy_forex_kind = $('#buy_forex_kind option:selected').val(); var price = $('#price').val(); - var remark = $('#product_name option:selected').val() + '-' + $('#remark').val(); + var product = $('#product').val(); + var remark = $('#remark').val(); if (price == null || onChange(price, 0)) { alert('请填写订单金额'); return; @@ -38,17 +38,21 @@ $(document).ready(function () { alert('金额不能为0'); return; } + if (product == null || product.length === 0) { + alert('请填写真实的商品名称'); + return; + } $('#commit-btn').addClass('hidden'); $('#commit-btn-loading').removeClass('hidden'); var jsonData = { - customer_id: window.customer_id, + user_id: window.customer_id, price: price, currency: currency, - buy_forex_kind: buy_forex_kind, gateway_type: 8, - description:remark + description:remark, + product_name:product }; $.ajax({ @@ -63,10 +67,11 @@ $(document).ready(function () { $('#commit-btn').removeClass('hidden'); $('#commit-btn-loading').addClass('hidden'); }else { - const $form = $(res.formString); - $('body').append($form); - $form.submit(); - $('body').removeChildren($form); + location.href = res.pay_url+'?'+res.sign_url; + // const $form = $(res.formString); + // $('body').append($form); + // $form.submit(); + // $('body').removeChildren($form); } }, error: function (jqXHR) {