From 644f68c06c863a65af93a072ca4c5b31051d178e Mon Sep 17 00:00:00 2001 From: yixian Date: Sun, 28 Jul 2019 22:23:47 +0800 Subject: [PATCH 1/7] wxtest p12 --- extra/wx_test.p12 | Bin 0 -> 2868 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 extra/wx_test.p12 diff --git a/extra/wx_test.p12 b/extra/wx_test.p12 new file mode 100644 index 0000000000000000000000000000000000000000..f8962b8cfd7d0eddd6611e1e233297b05a323ee2 GIT binary patch literal 2868 zcmY+^cQhN076wV{D+9py94FW!5VjsaAKVsfwlnDcP7)Q@u5U{AzR22wGuqSe%Ve6$ z@TASa6zz|UV7-VwYwFzAx}19FP(+!qWp4|I@clR2^2Bz ziHLdQ>7wL-?VU%x^5riXE*1}l`TJq@Yoh?q%tNj;Gs>pfb9U!{9Lyu@=2HK`sT4nj<{KdaiK&-ci!NVU* z{RpH_T#;^kPpya&X_k^*$*d}Y*oA@?-FI7vcceN)f1b!CNE@!ae{w6z&hn1AvG!QC zA2Bc&_9Wb2sh7BpKtZHY9D7k99~O+W7QmZk*#l72M-&R<3XG0$qxpQ5;V(kRUz-LR zkh2EbfzJ*Q7TC9OtXMf{fFSNv;zU&W;_zVGX1l?`dP{%8`DY5&ym%ON5u>LQza(*A<- z%OL%lg{Z#Ux>0APZ3yy503J`ca#xrEy9l|AC~Q7A263sKF5=z&B0?fq9i%C(_A=B8MGNUTJ? zi>t6>%A2yf)Y)?W_U4R`5(V&El4yFP!#;g~a(Vq$rH&n*1+UDTV@b`wlAiTM>=JQs zgPeiW0abW+LbH4pPZ@pzZJ)O!d{+`d|GA37Gc!B&(vmFe>~@3JeePv&`-x$30S9kp z!;i2Y+6k7^r*pA{I%xf@oJ>uB5dMUgCu{CG*JJ4Ta3% zHad-~O)9<2Y8UfH+4w2OjS2HjB58`>H&l@$W;TnCqe;*F=hiUOTmK_A79qW7MDQdp z=7mQTy%Z;-)tM~eC@R?~;-yi4ix!tSdf;R5&X01#o0_ zm%twglu>%wyexDV<1CM@XLO$9Ik#_ry&=IoQ@BPegj1o6W{v;p)Ve)i*ZW-lzJ9S7f-( zvE?!BOp=`~pQ6VTM+L1+I}bCFl?V}0M=44QTha5vp)z}2A8*$$;=0#^3Z7(^(hE_N z|3%K_R5c0{zMjQzdD2iLC1wu5iRd{8I}e~FV=~=Re@jhXTb{wHS;lM_)7nsgraZ?{ z(aAc?qL4@N;zUb;>CiALc8pymI4}vXWVZQKy&fl*q~L6ne4%a5!=zSaYAt=835_rY zI)+JolZ-5D6gGLa%!~YPsa^2$F|)JRI5$$U!&nBI4&mtFPHodV{Nyx`oADEun3#ye zn0fYlmJ$HkNn_9hClM1!*x26aKr+t2C&}dedE_ zIaLo!BVg^(N%EN<+_mWL!g~utr37K%&>D;Q)=lppA(B2yQ=#|zpJ;3}voQG}Qj}iH zqPWE}L^Y#p1rjr6_etduI_x5Um>tt=uEoF@^sKsE2#&V+gS}75vdA5#BeN5x)G?Eq1RIE>YE5`oDkd1Tk+hHH zFz{O%F!!F7ARLT;!dCZ=AWT=(;JS9ll$xr^aXh%f!uPTeuJm(Ph;kA`KD;L;Uvt^; zwcQrmvpnlZlyx!MW<(XWx~qlv`D?hK8{Z3))Wt4*sCdIwiiyw9p-_rM)E(soW{VOX zyx0QggQzB02g9{jt=YFCB>iG|)4QlEr*0kn#da3S)bzcrI8$$LceBcgG2XL6@pi7> zinwYIR^eM1cGX2S^w?*vj(w2U);{Q|Hsql8khje#{Myy$*m&ywrOiM$+t*R#wG=iK zj#{cHW6l7fyu9=o!8~V%Uh%YoAuza_%q_(|&6^b;v_x8+o?QviSy7-(rQ{!Pf&&B) ztB*Oa?k5h45rVms#tY>S%DG$Ih{@vg21yaFQ63&7|*=-GIiTC_>B_r>aY|)TxaA5)Ldw%M1DqpfA(`X^{Osn&D70 Date: Mon, 29 Jul 2019 15:19:31 +0800 Subject: [PATCH 2/7] parent version --- pom.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c2c1555f5..f99fb6431 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ au.com.royalpay.payment payment-parent - 1.0.4 + 1.0.5 4.0.0 @@ -33,11 +33,11 @@ au.com.royalpay.payment - hf-core + alipay-core au.com.royalpay.payment - alipay-core + hf-core au.com.royalpay.payment @@ -55,15 +55,15 @@ au.com.royalpay.payment lakala-core + + au.com.royalpay.payment + bestpay-core + com.github.stuxuhai jpinyin 1.1.7 - - au.com.royalpay.payment - bestpay-core - org.springframework.boot spring-boot-starter From de7ee5484d67a13ae839e67e65fecff0362ac66d Mon Sep 17 00:00:00 2001 From: luoyang Date: Mon, 29 Jul 2019 16:24:54 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix=20=E6=96=B0=E5=A2=9E=E5=95=86=E6=88=B7?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8Eclient=5Fpay=5Ftype=20and=20desc?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/partner-manage.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/ui/static/payment/partner/partner-manage.js b/src/main/ui/static/payment/partner/partner-manage.js index 67764f20a..047ac71dc 100644 --- a/src/main/ui/static/payment/partner/partner-manage.js +++ b/src/main/ui/static/payment/partner/partner-manage.js @@ -632,6 +632,11 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter alert('请选择商户支付方式') return; } + if (typeof ($scope.partner.client_pay_type) == 'string' || typeof ($scope.partner.client_pay_desc) == 'string') { + $scope.partner.client_pay_type = $scope.partner.client_pay_type.split(","); + $scope.partner.client_pay_desc = $scope.partner.client_pay_desc.split(","); + + } if ($scope.partner.client_pay_type.indexOf('1') >= 0) { if ($scope.partner.client_pay_desc.join(',').indexOf('10') < 0) { alert("请检查线上支付场景是否已选择支付方式"); From 4eced16988b420f8c8316b7ae93ce78549efab37 Mon Sep 17 00:00:00 2001 From: liuxinxin Date: Mon, 29 Jul 2019 17:57:35 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BA=A4=E6=98=93=E6=B5=81=E6=B0=B4?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mappers/system/ClientApplyMapper.java | 3 ++ .../merchants/core/impls/ClientApplyImpl.java | 32 +++++++++++++++++-- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java index e8938bcb6..5e221cd6e 100644 --- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java +++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientApplyMapper.java @@ -24,6 +24,9 @@ public interface ClientApplyMapper { @AutoSql(type = SqlType.SELECT) JSONObject findClientApplicationById(@Param("client_apply_id") String client_apply_id); + @AutoSql(type = SqlType.SELECT) + JSONObject findClientApplicationByClientMoniker(@Param("client_moniker") String client_moniker); + PageList listPartnerApplications(JSONObject params, PageBounds pageBounds); @AutoSql(type = SqlType.COUNT) diff --git a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java index 2d9c07f5d..d2e549f7a 100644 --- a/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java +++ b/src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientApplyImpl.java @@ -218,8 +218,36 @@ public class ClientApplyImpl implements ClientApply, ApplicationEventPublisherAw partner.put("bd_user", manager.getString("manager_id")); partner.put("bd_user_name", manager.getString("display_name")); - if (clientMapper.findClientByMoniker(info.getClientMoniker()) != null) { - throw new BadRequestException("error.partner.valid.dumplicate_client_moniker"); + JSONObject client; + + if ((client = clientMapper.findClientByMoniker(info.getClientMoniker())) != null) { + if( manager.getString("manager_id").equals(client.getString("creator")) ) + { + if(clientApplyMapper.findClientApplicationByClientMoniker(info.getClientMoniker()) != null) + { + throw new BadRequestException("无效，已关联商户"); + } + JSONObject client_bd = new JSONObject(); + client_bd.put("client_id", partner.getIntValue("client_id")); + client_bd.put("bd_id", manager.getString("manager_id")); + client_bd.put("bd_name", manager.getString("display_name")); + client_bd.put("create_time", new Date()); + client_bd.put("create_id", manager.getString("manager_id")); + client_bd.put("start_date", new Date()); + client_bd.put("proportion", 1); + clientBDMapper.saveBD(client_bd); + + apply.put("client_apply_id", client_apply_id); + apply.put("client_id", partner.getIntValue("client_id")); + apply.put("client_moniker", info.getClientMoniker()); + apply.put("apply_approve_result", 2); + apply.put("apply_approve_time", new Date()); + clientApplyMapper.updatePartnerApplication(apply); + + return partner; + } + throw new BadRequestException("您只能关联自己创建的商户"); + //throw new BadRequestException("error.partner.valid.dumplicate_client_moniker"); } partner.put("source", 2);//自主申请 partner.put("country", "AUS");//自主申请 From ef6e45caa4deacec2fdec47667c58815fe7d3c7f Mon Sep 17 00:00:00 2001 From: yixian Date: Tue, 30 Jul 2019 11:28:41 +0800 Subject: [PATCH 5/7] parent version --- pom.xml | 4 ++-- src/main/resources/application.properties | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f99fb6431..00e8f28f4 100644 --- a/pom.xml +++ b/pom.xml @@ -5,12 +5,12 @@ au.com.royalpay.payment payment-parent - 1.0.5 + 1.0.6 4.0.0 manage - 1.0.31 + 1.0.34 UTF-8 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index c8844ef37..d177ae586 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -88,7 +88,7 @@ app.mail.appid=1 app.mail.host=https://mailsupport.royalpay.com.au mail.send.credentialCode=Fd1aRfdjc9 -spring.thymeleaf.mode=LEGACYHTML5 +spring.thymeleaf.mode=HTML app.mpsupport.host=https://mp.royalpay.com.au app.foreign-currency=AUD From dc527461be7b913fbcc0d119e05d8a467e24eefa Mon Sep 17 00:00:00 2001 From: luoyang Date: Tue, 30 Jul 2019 15:59:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix=20remark=20=E5=8F=AA=E6=9C=89=E5=90=88?= =?UTF-8?q?=E8=A7=84=E5=92=8C=E9=A3=8E=E6=8E=A7=E5=8F=AF=E4=BB=A5=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/ui/static/payment/partner/templates/partner_edit.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 31e1558b2..af6482fb8 100644 --- a/src/main/ui/static/payment/partner/templates/partner_edit.html +++ b/src/main/ui/static/payment/partner/templates/partner_edit.html @@ -286,7 +286,7 @@ -
+
Date: Thu, 1 Aug 2019 17:47:53 +0800 Subject: [PATCH 7/7] document update --- src/document/cn/apis.js | 29 +++++++++++++++-------------- src/document/en/apis.js | 31 ++++++++++++++++--------------- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/src/document/cn/apis.js b/src/document/cn/apis.js index e3dfb03d8..b7c8ae2ff 100644 --- a/src/document/cn/apis.js +++ b/src/document/cn/apis.js @@ -82,7 +82,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} code_url 支付码字符串，商户可以据此自行生产二维码 * @apiSuccess {String} qrcode_img Base64封装的二维码图片，可直接作为img的src属性 @@ -121,7 +121,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id GlobalFreePay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @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属性 @@ -177,7 +177,7 @@ * @apiSuccess {String} channel 支付渠道 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} pay_url 跳转URL * @@ -231,7 +231,7 @@ * @apiSuccess {String} channel 支付渠道 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} pay_url 跳转URL * @@ -301,7 +301,7 @@ *
  • PAY_FAIL:支付失败
    • *
  • PAY_SUCCESS:支付成功
    • * - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {int} total_fee 订单金额，单位是货币最小面值单位 * @apiSuccess {int} real_fee 实际支付金额，单位是货币最小面值单位(目前等于订单金额，为卡券预留) @@ -346,7 +346,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} code_url 支付码字符串，商户可以据此自行生产二维码 * @@ -378,7 +378,7 @@ *
  • FULL_REFUND:全额退款
    • * * 如果需要可以用相同订单号再次发起支付单，支付成功或支付中的无法重复发起订单 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} channel_order_id 渠道方(支付宝、微信)交易流水号 * @apiSuccess {int} total_fee 订单金额，单位是货币最小面值单位 @@ -715,7 +715,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} pay_url 跳转URL * @@ -744,17 +744,18 @@ * @apiParam (JSON) {String} description 必填，订单标题（最大长度128字符，超出自动截取） * @apiParam (JSON) {int} price 必填，金额，单位为货币最小单位，例如使用100表示AUD1.00 * @apiParam (JSON) {String=AUD,CNY} currency=AUD 币种代码 + * @apiParam (JSON) {String=Alipay,Wechat} channel=Wechat 支付通道，微信小程序只能调用微信渠道，支付宝小程序只能调用支付宝渠道 * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知 * @apiParam (JSON) {String} operator 操作人员标识 - * @apiParam (JSON) {String} appid 小程序appid - * @apiParam (JSON) {String} customer_id 小程序openid + * @apiParam (JSON) {String} appid 小程序appid(接入微信小程序必填，支付宝不需要) + * @apiParam (JSON) {String} customer_id 小程序获取的用户id(微信为openid，支付宝为userid) * * @apiSuccess {String} return_code 执行结果 * @apiSuccess {String} result_code SUCCESS表示创建订单成功，EXISTS表示订单已存在 * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} sdk_params 小程序支付所需参数(Json字符串) * @@ -790,7 +791,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} pay_url 跳转URL * @@ -835,7 +836,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} sdk_params 调用SDK的参数字符串 * @@ -874,7 +875,7 @@ * @apiSuccess {String} partner_code 商户编码 * @apiSuccess {String} full_name 商户注册全名 * @apiSuccess {String} partner_name 商户名称 - * @apiSuccess {String} order_id RoyalPay订单ID，同时也是微信订单ID，最终支付成功的订单ID可能不同 + * @apiSuccess {String} order_id RoyalPay订单ID，同时也是支付渠道订单ID，最终支付成功的订单ID可能不同 * @apiSuccess {String} partner_order_id 商户订单ID * @apiSuccess {String} pay_url 跳转URL * diff --git a/src/document/en/apis.js b/src/document/en/apis.js index 0f370f2df..5597c2ea1 100644 --- a/src/document/en/apis.js +++ b/src/document/en/apis.js @@ -84,7 +84,7 @@ * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one. + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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 @@ -124,7 +124,7 @@ * @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} order_id Order id in GlobalFreePay, which is also payment channel(Wechat/Alipay) 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 @@ -183,7 +183,7 @@ * @apiSuccess {String} channel Payment channel * @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 RoyalPay, which is also WeChat order id. + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) order id. * @apiSuccess {String} partner_order_id Partner order id * @apiSuccess {String} pay_url Payment page in RoyalPay. * @@ -239,7 +239,7 @@ * @apiSuccess {String} channel Payment Channel * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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} pay_url Payment page in RoyalPay. Can only be accessed through WeChat * @@ -310,7 +310,7 @@ *
  • PAY_FAIL:Payment failed
    • *
  • PAY_SUCCESS:Payment succeeded
    • * - * @apiSuccess {String} order_id Order id in RoyalPay, which is also WeChat order id. + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) order id. * @apiSuccess {String} partner_order_id Partner order id * @apiSuccess {int} total_fee Order amount, which uses the base unit of current currency * @apiSuccess {int} real_fee Actual paid amount.(The same as total fee at the moment. After coupon feature is finished, this may be different.) @@ -356,7 +356,7 @@ * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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. * @@ -390,7 +390,7 @@ *
  • Full_REFUND: Full refunded
    • * * Use the same order id to call create order API can renew the order. PAYING, PAY_SUCCESS orders cannot be renewed. - * @apiSuccess {String} order_id Order id in RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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} channel_order_id PayChannel(Alipay、Wechat) Transaction Trade No * @apiSuccess {int} total_fee Order amount, which uses the base unit of current currency @@ -728,7 +728,7 @@ * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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} pay_url Payment page in RoyalPay. Can only be accessed through WeChat * @@ -742,8 +742,8 @@ * @api {PUT} /api/v1.0/gateway/partners/{partner_code}/microapp_orders/{order_id} Create Miniprogram Order * @apiName microapp * @apiDescription - Use for wechat Payment in miniprogram. After create order, returned and redirect param. - * wechat Channel Only.
    *
    + Use for call Payment in Wechat/Alipay miniprogram. After create order, returned and redirect param. + * *
    * MiniProgram_WechatPay doc * * @apiVersion 1.0.0 @@ -756,17 +756,18 @@ * @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=AUD,CNY} currency=AUD Currency + * @apiParam (JSON) {String=Wechat,Alipay} channel=Wechat Payment channel. Wechat for Wechat miniprogram and Alipay for Alipay miniprogram * @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. - * @apiParam (JSON) {String} appid wechat app app_id - * @apiParam (JSON) {String} customer_id wechat app open_id + * @apiParam (JSON) {String} appid Wechat channel required, miniprogram app_id + * @apiParam (JSON) {String} customer_id wechat miniprogram open_id or alipay miniprogram userid * * @apiSuccess {String} return_code Execution result * @apiSuccess {String} result_code SUCCESS means order created successfully, EXISTS means order has already existed. * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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} pay_url Payment page in RoyalPay. Can only be accessed through WeChat * @apiSuccess {String} sdk_params The required parameters for payment.(Json String) @@ -805,7 +806,7 @@ * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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} pay_url Payment page in RoyalPay. Can only be accessed through WeChat * @@ -852,7 +853,7 @@ * @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 RoyalPay, which is also WeChat order id. The final order id which is paid may be different from this one + * @apiSuccess {String} order_id Order id in RoyalPay, which is also payment channel(Wechat/Alipay) 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} sdk_params param string for calling SDK *