Merge remote-tracking branch 'origin/develop' into develop

src/document/cn/apidoc.json

@@ -18,6 +18,7 @@
     "WxJSAPIPay",
     "AliJSAPIPay",
     "MobileH5",
+    "Miniprogram_Payment",
     "NewMobileH5Pay",
     "MobileH5Pay",
     "RetailPay",

src/document/cn/apis.js

@@ -679,11 +679,11 @@
  * @api {PUT}  /api/v1.0/gateway/partners/{partner_code}/microapp_orders/{order_id} 创建小程序订单
  * @apiName microapp
  * @apiDescription
- * 用于小程序中发起支付，创建订单后返回小程序支付所需参数，该接口仅现仅支持微信小程序。
+ * 用于小程序中发起支付，创建订单后返回小程序支付所需参数，该接口现仅支持微信小程序。
  * <br>
  *     <img src="img/microapp_cn.png">
  * @apiVersion 1.0.0
- * @apiGroup Wechat_Miniprogram_Payment
+ * @apiGroup Miniprogram_Payment
  * @apiHeader Accept application/json
  * @apiHeader Content-Type application/json
  * @apiParam (PathVariable) {String} partner_code 必填，商户编码，由4位大写字母或数字构成
@@ -695,7 +695,7 @@
  * @apiParam (JSON) {String} notify_url 支付通知url，详见支付通知api，不填则不会推送支付通知
  * @apiParam (JSON) {String} operator 操作人员标识
  * @apiParam (JSON) {String} appid 小程序appid
- * @apiParam (JSON) {String} customerId 小程序
+ * @apiParam (JSON) {String} customer_id 小程序openid
  *
  * @apiSuccess {String} return_code 执行结果
  * @apiSuccess {String} result_code SUCCESS表示创建订单成功，EXISTS表示订单已存在
@@ -718,7 +718,7 @@
  * @apiName AlipayOnline
  * @apiDescription
  * 用于PC端支付宝支付，创建订单后跳转到返回的pay_url（需附加签名参数和redirect参数），随后进入支付宝支付页面完成支付
- * 该接口仅现仅支持支付宝。<br>
+ * 该接口现仅支持支付宝。<br>
  *     <img src="img/alipayOnline_cn.png">
  * @apiVersion 1.0.0
  * @apiGroup Alipay_Online_Payment

src/document/en/apidoc.json

@@ -18,6 +18,7 @@
     "WxJSAPIPay",
     "AliJSAPIPay",
     "MobileH5",
+    "Miniprogram_Payment",
     "NewMobileH5Pay",
     "MobileH5Pay",
     "RetailPay",

src/document/en/apis.js

@@ -701,7 +701,7 @@
  *     wechat Channel Only.<br> * <br>
  *     <img src="img/microapp_en.png">
  * @apiVersion 1.0.0
- * @apiGroup Wechat_Miniprogram_Payment
+ * @apiGroup Miniprogram_Payment
  * @apiHeader Accept application/json
  * @apiHeader Content-Type application/json
  * @apiParam (PathVariable) {String} partner_code Required, Partner code
@@ -712,6 +712,8 @@
  * @apiParam (JSON) {String=AUD,CNY} currency=AUD Currency
  * @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
  *
  * @apiSuccess {String} return_code Execution result
  * @apiSuccess {String} result_code SUCCESS means order created successfully, EXISTS means order has already existed.

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java

@@ -534,7 +534,7 @@ public class PartnerManageController {
         clientContractService.confirmSourceAgreement(account.getIntValue("client_id"),account.getString("account_id"),"PC");
     }
 
-    @ManagerMapping(value = "/{clientMoniker}/new_contract", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.FINANCIAL_STAFF})
+    @ManagerMapping(value = "/{clientMoniker}/new_contract", method = RequestMethod.PUT, role = {ManagerRole.ADMIN, ManagerRole.OPERATOR})
     public void skipContract(@PathVariable String clientMoniker, @RequestBody JSONObject new_contract) {
         clientManager.setSkipContract(clientMoniker, new_contract.getBooleanValue("new_contract"));
     }