Merge branch 'develop'

7 years ago · 1655144454
parent 86681ed0ca 9c6f6db4bf
commit 1655144454
12 changed files with 88 additions and 29 deletions
--- a/src/document/cn/apis.js
+++ b/src/document/cn/apis.js
@ -681,6 +681,7 @@
 * @apiDescription
 * 接入微信小程序需完成海外主体认证，并且认证主体需要与在RoyalPay开通的商户主体一致。具体如何认证请查看微信公众平台相关文档。
 * 用于小程序中发起支付，创建订单后返回小程序支付所需参数，该接口现仅支持微信小程序。
+ *  <a href="https://www.royalpay.com.au/downloads/MiniProgram_WechatPay.pdf"> 接入参考文档</a>
 * <br>
 *     <img src="img/microapp_cn.png">
 * @apiVersion 1.0.0
--- a/src/document/en/apis.js
+++ b/src/document/en/apis.js
@ -698,7 +698,8 @@
 * @apiName microapp
 * @apiDescription
 Use for wechat Payment in miniprogram. After create order, returned and redirect param.
- *     wechat Channel Only.<br> * <br>
+ * wechat Channel Only.<br> * <br>
+ * <a href="https://www.royalpay.com.au/downloads/MiniProgram_WechatPay.pdf"> MiniProgram_WechatPay doc</a>
 *     <img src="img/microapp_en.png">
 * @apiVersion 1.0.0
 * @apiGroup Miniprogram_Payment
--- a/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
+++ b/src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.java
@ -28,7 +28,7 @@ public interface ClientsContractMapper {
    @AutoSql(type = SqlType.SELECT)
    List<JSONObject> list();

-    PageList<JSONObject> listWithClientInfo(PageBounds pagination);
+    PageList<JSONObject> listWithClientInfo(JSONObject param,PageBounds pagination);

    List<JSONObject> analysisSingstatus();
 }
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/ClientContractService.java
@ -17,7 +17,7 @@ public interface ClientContractService {

    void saveContract(int client_id, Date expire_date, String channel);

-    JSONObject list(PageBounds pagination);
+    JSONObject list(JSONObject param,PageBounds pagination);

    JSONObject analysis();
 }
--- a/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/core/impl/ClientContractServiceImpl.java
@ -151,8 +151,8 @@ public class ClientContractServiceImpl implements ClientContractService {
    }

    @Override
-    public JSONObject list(PageBounds pagination) {
-        return PageListUtils.buildPageListResult(clientsContractMapper.listWithClientInfo(pagination));
+    public JSONObject list(JSONObject param,PageBounds pagination) {
+        return PageListUtils.buildPageListResult(clientsContractMapper.listWithClientInfo(param,pagination));
    }

    @Override
--- a/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java
+++ b/src/main/java/au/com/royalpay/payment/manage/system/web/contractController.java
@ -25,8 +25,10 @@ public class contractController {
    private ManualSettleSupport manualSettleSupport;

    @ManagerMapping(value = "/contract/list", method = RequestMethod.GET)
-    public JSONObject contractList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit) {
-        return clientContractService.list(new PageBounds(page,limit));
+    public JSONObject contractList(@RequestParam(value = "page", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int limit,@RequestParam(required = false) String client_moniker) {
+        JSONObject params = new JSONObject();
+        params.put("client_moniker",client_moniker);
+        return clientContractService.list(params,new PageBounds(page,limit));
    }

    @ManagerMapping(value = "/contract", method = RequestMethod.GET)
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientsContractMapper.xml
@ -11,7 +11,11 @@
        select c.client_moniker client_moniker,cc.create_time create_time,cc.confirm_time confirm_time,a.display_name display_name from
        sys_clients_contract cc left join sys_clients c on c.client_id = cc.client_id
        left join sys_accounts a on a.account_id = cc.sign_account_id
-
+        <where>
+            <if test="client_moniker!=null">
+                c.client_moniker = #{client_moniker}
+            </if>
+        </where>
    </select>

    <select id="analysisSingstatus" resultType="com.alibaba.fastjson.JSONObject">
--- a/src/main/ui/static/sys/contract.js
+++ b/src/main/ui/static/sys/contract.js
@ -19,10 +19,11 @@ define(['angular'], function (angular) {
            controller: 'manualSettleCtrl'
        })
    }]);
-    app.controller('contractAnalysisCtrl', ['$scope', '$http', '$state', '$filter', 'commonDialog', function ($scope, $http, $state, $filter, commonDialog) {
+    app.controller('contractAnalysisCtrl', ['$scope', '$http', function ($scope, $http) {
        $scope.pagination = {};
+        $scope.params = {};
        $scope.getContractAnalysis = function (page) {
-            var params = {};
+            var params = angular.copy($scope.params);
            params.page = page || $scope.pagination.page || 1;
            $http.get('/manage/common/analysis/contract/list', {params: params}).then(function (resp) {
                $scope.contract = resp.data.data;
--- a/src/main/ui/static/sys/templates/contract_sign.html
+++ b/src/main/ui/static/sys/templates/contract_sign.html
@ -11,8 +11,24 @@
        <a ui-sref="manual_settle">Manual Settle</a>
    </li>
 </ul>
-<div class="modal-body">
-    <div class="box box-danger">
+<br>
+<div class="box box-danger">
+    <div class="modal-body">
+        <div class="form-inline">
+            <div class="form-group">
+                <label class="control-label" for="title-search">Partner Code</label>
+                <input class="form-control" id="title-search" ng-model="params.client_moniker">
+            </div>
+
+            <div class="form-group">
+                <button class="btn btn-primary" type="button" ng-click="getContractAnalysis(1)"><i
+                        class="fa fa-search"></i></button>
+            </div>
+        </div>
+    </div>
+</div>
+<div class="box box-danger">
+    <div class="modal-body">
        <div class="box-header">商户合同情况
            <small>（查看合同数：{{analysis.has_sign + analysis.not_sign}}，已同意：{{analysis.has_sign}})</small>
        </div>
--- a/src/main/ui/static/templates/payment/v1/gateway_jsapi.js
+++ b/src/main/ui/static/templates/payment/v1/gateway_jsapi.js
@ -50,9 +50,16 @@ $(document).ready(function () {
                invokePay(paydata);
            },
            error: function (jqXhr) {
-                alert(jqXhr.responseJSON.message);
-                $('#wdiv').hide();
-                dataCache.paying = false;
+                var respText = jqXhr.responseText;
+                try {
+                    alert(JSON.parse(respText).message);
+                    $('#wdiv').hide();
+                    dataCache.paying = false;
+                } catch (e) {
+                    alert("Unexpected Error:" + respText);
+                    $('#wdiv').hide();
+                    dataCache.paying = false;
+                }
            }
        });

--- a/src/main/ui/static/templates/payment/v1/payment.js
+++ b/src/main/ui/static/templates/payment/v1/payment.js
@ -198,7 +198,7 @@ $(function () {
                    $('<p></p>').html('Surcharge 手续费(' + window.rateValue + '%):+' + currencySymbol + dataCache.surcharge).appendTo(bd);
                }
                if (parseFloat(dataCache.tax) > 0) {
-                    $('<p></p>').html('GST(10%):'+currencySymbol+dataCache.tax).appendTo(bd);
+                    $('<p></p>').html('GST(10%):' + currencySymbol + dataCache.tax).appendTo(bd);
                }
                $(dataCache.discounts).each(function () {
                    $('<p></p>').html(this.title + ':-' + currencySymbol + this.amount).appendTo(bd);
@ -287,10 +287,19 @@ $(function () {
                })
            },
            error: function (jqXhr) {
-                weuiAlert(jqXhr.responseJSON.message);
-                $('#key_P').removeClass('hidden');
-                $('#key_Loading').addClass('hidden');
-                dataCache.paying = false;
+                var respText = jqXhr.responseText;
+                try {
+                    weuiAlert(JSON.parse(respText).message);
+                    $('#key_P').removeClass('hidden');
+                    $('#key_Loading').addClass('hidden');
+                    dataCache.paying = false;
+                } catch (e) {
+                    alert("Unexpected Error:" + respText);
+                    $('#key_P').removeClass('hidden');
+                    $('#key_Loading').addClass('hidden');
+                    dataCache.paying = false;
+                }
+
            }
        })
    });
--- a/src/main/ui/static/templates/payment/v1/retail_jsapi.js
+++ b/src/main/ui/static/templates/payment/v1/retail_jsapi.js
@ -4,18 +4,21 @@
 $(document).ready(function () {
    'use strict';
    decode();
+
    function decode() {
        var redirect = window.redirect;
-        while(redirect.indexOf('://')<0){
+        while (redirect.indexOf('://') < 0) {
            redirect = decodeURIComponent(redirect);
-            if(redirect==window.redirect){
+            if (redirect == window.redirect) {
                break;
            }
            window.redirect = redirect;
        }
    }
+
    var dataCache = {paying: false};
    $('#key_P').bind('touchstart', startPay);
+
    function startPay() {
        $('#wdiv').show();
        if (dataCache.paying) {
@ -28,17 +31,31 @@ $(document).ready(function () {
            method: 'get',
            dataType: 'json',
            success: function (pay) {
-                if(pay.direct_paid){
+                try {
+                    if (pay.direct_paid) {
+                        dataCache.paying = false;
+                        location.href = window.redirect;
+                    }
+                    var paydata = pay.jsapi;
+                    invokePay(paydata);
+                }catch (e) {
+                    alert("Unexpected Error:" + e);
+                    $('#wdiv').hide();
                    dataCache.paying = false;
-                    location.href = window.redirect;
                }
-                var paydata = pay.jsapi;
-                invokePay(paydata);
            },
            error: function (jqXhr) {
-                alert(jqXhr.responseJSON.message);
-                $('#wdiv').hide();
-                dataCache.paying = false;
+                var respText = jqXhr.responseText;
+                try {
+                    alert(JSON.parse(respText).message);
+                    $('#wdiv').hide();
+                    dataCache.paying = false;
+                } catch (e) {
+                    alert("Unexpected Error:" + respText);
+                    $('#wdiv').hide();
+                    dataCache.paying = false;
+                }
+
            }
        });

@ -85,6 +102,7 @@ $(document).ready(function () {
                }
            })
        }
+
        checkOrderStd();
    }
 });