Merge branch 'develop'

6 years ago · 76191adfa6
parent d680b16875 384475da74
commit 76191adfa6
6 changed files with 46 additions and 20 deletions
--- a/pom.xml
+++ b/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <groupId>au.com.royalpay.payment</groupId>
        <artifactId>payment-parent</artifactId>
-        <version>0.2.0</version>
+        <version>0.2.0-dev</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
+++ b/src/main/java/au/com/royalpay/payment/manage/management/clearing/core/impl/CleanServiceImpl.java
@ -29,6 +29,7 @@ import au.com.royalpay.payment.tools.connections.mpsupport.MpWechatApiProvider;
 import au.com.royalpay.payment.tools.connections.mpsupport.beans.TemplateMessage;
 import au.com.royalpay.payment.tools.defines.TradeType;
 import au.com.royalpay.payment.tools.env.PlatformEnvironment;
+import au.com.royalpay.payment.tools.env.SysConfigManager;
 import au.com.royalpay.payment.tools.exceptions.BadRequestException;
 import au.com.royalpay.payment.tools.exceptions.ForbiddenException;
 import au.com.royalpay.payment.tools.exceptions.NotFoundException;
@ -153,6 +154,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
    private SpringTemplateEngine thymeleaf;
    @Resource
    private ClientConfigService clientConfigService;
+    @Resource
+    private SysConfigManager sysConfigManager;

    @Value("${app.settlement.email-to}")
    private String settlementEmailTo;
@ -969,11 +972,6 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
            String title = "Royalpay Settlement File " + DateFormatUtils.format(date, "yyyyMMdd");
            JSONObject model = new JSONObject();
            model.put("date", DateFormatUtils.format(date, "dd-MM-yyyy"));
-            // todo themeleaf
-
-
-            // final String content = VelocityEngineUtils.mergeTemplateIntoString(velocityEngine,
-            // "mail/settlement_mail.vm", "utf-8", model);
            String fileName1 = "Merchant_Settlement_Info_xlsx_" + DateFormatUtils.format(date, "yyyyMMdd");
            List<JSONObject> attachList = new ArrayList<>();
            JSONObject attach1 = new JSONObject();
@ -1017,9 +1015,8 @@ public class CleanServiceImpl implements CleanService, ManagerTodoNoticeProvider
            // 测试用地址
            // String mailId = mailService.sendEmail(title, "164851225@qq.com", "1029811920@qq.com", content,
            // attachList);
-            String mailId = mailService.sendEmail(title, "diana.baldi@flexewallet.com,steven.stamboultgis@novatti.com,fazal.cader@flexewallet.com",
-                    "locky@royalpay.com.au,leo.huang@royalpay.com.au,eason.qian@royalpay.com.au,astro.dai@royalpay.com.au,settlement@royalpay.com.au,settlements@flexewallet.com,ben.evans@royalpay.com.au",
-                    content, attachList);
+            JSONObject config = sysConfigManager.getSysConfig();
+            String mailId = mailService.sendEmail(title, config.getString("settle_mail_to"),config.getString("settle_mail_cc"), content, attachList);

            if (settleMail == null) {
                JSONObject settleMailRecord = new JSONObject();
--- a/src/main/ui/static/payment/partner/partner-manage.js
+++ b/src/main/ui/static/payment/partner/partner-manage.js
@ -1195,6 +1195,16 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
        }]);
    app.controller('partnerPaymentInfoCtrl', ['$scope', '$http', '$state', 'commonDialog','$uibModal', '$sce', function ($scope, $http, $state, commonDialog,$uibModal, $sce) {
        $scope.refresh = false;
+        $scope.copyHfLink = function() {
+            var e=document.getElementById("cpbt");
+            e.select();
+            var successful = document.execCommand("Copy");
+            if (successful) {
+                commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
+            }else {
+                commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
+            }
+        };
        $scope.loadPartnerPaymentInfo = function () {
            $http.get('/sys/partners/' + $scope.partner.client_moniker).then(function (resp) {
                $scope.paymentInfo = resp.data;
--- a/src/main/ui/static/payment/partner/partner.js
+++ b/src/main/ui/static/payment/partner/partner.js
@ -557,6 +557,18 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
        $scope.paymentInfo = $scope.partner;
        $scope.old_customer_surcharge_rate = angular.copy($scope.partner.customer_surcharge_rate);
        $scope.qrConfig = {currency: 'AUD'};
+
+        $scope.clientCopyHfLink = function() {
+            var e=document.getElementById("c-cpbt");
+            e.select();
+            var successful = document.execCommand("Copy");
+            if (successful) {
+                commonDialog.alert({title: 'Success', content: '已复制到剪切板!', type: 'success'});
+            }else {
+                commonDialog.alert({title: 'Error', content: '您的浏览器不支持!', type: 'error'});
+            }
+        };
+
        $scope.reloadQRCode = function () {
            $http.get('/client/partner_info/qrcode', {params: $scope.qrConfig}).then(function (resp) {
                $scope.qrcode = resp.data;
--- a/src/main/ui/static/payment/partner/templates/client_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/client_payment_info.html
@ -102,9 +102,11 @@
            <div class="form-group">
                <label class="control-label col-sm-2">HF Pay Link</label>
                <div class="col-sm-10">
-                    <a href={{paymentInfo.hf_pay_url}} target="_Blank">
-                        <p class="form-control-static">{{partner.hf_pay_url}}
-                        <span id="intro">
+                    <a href={{partner.hf_pay_url}} target="_Blank">
+                        <span class="form-control-static">{{partner.hf_pay_url}}
+
+
+<!--                        <span id="intro">
                                <a href=""><i id="carousel_id"  class="glyphicon glyphicon-info-sign" ng-mouseover="toFirst();toShow()"></i></a>
                                 <div class="pos" ng-show="show">
                                       <i class="tocancle glyphicon glyphicon-remove" ng-click="toHide()"></i>
@ -117,18 +119,21 @@
                                    </uib-slide>
                                    </uib-carousel>
                                </div>
-                        </span>
-                    </p>
+                        </span>-->
+                    </span>
                </a>
+                    <i class="fa fa-clipboard margin-r-5" style="cursor: pointer" ng-click="clientCopyHfLink()"></i>
+                    <input style="opacity: 0" id="c-cpbt" value={{partner.hf_pay_url}} readonly>
             </div>
-        <div >
-            <label class="col-sm-2 control-label">HF Pay QR Code</label>
-            <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive" />
-            <div>
-                <span style="padding-left: 19.3%;font-size:9px;">仅支持微信客户端扫描</span>
            </div>
-        </div>
+            <div class="form-group">
+                <label class="col-sm-2 control-label">HF Pay QR Code</label>
+                <img ng-src="{{partner.hfQrcodeUrl}}" class="img-responsive" />
+                <div>
+                    <span style="padding-left: 21%;font-size:9px;">仅支持微信客户端扫描</span>
+                </div>
            </div>
+
        </div>
 </div>
 </div>
--- a/src/main/ui/static/payment/partner/templates/partner_payment_info.html
+++ b/src/main/ui/static/payment/partner/templates/partner_payment_info.html
@ -329,6 +329,8 @@
                <div class="col-sm-10">
                    <input type="checkbox" ng-model="paymentInfo.enable_link" bs-switch switch-change="toggleHfLink('hf')">
                    &nbsp;&nbsp;<a href={{paymentInfo.hf_pay_url}} target="_Blank"><span ng-if="paymentInfo.enable_link">{{paymentInfo.hf_pay_url}}</span></a>
+                    <i class="fa fa-clipboard margin-r-5" style="cursor: pointer" ng-click="copyHfLink()"></i>
+                    <input style="opacity: 0" id="cpbt" value={{paymentInfo.hf_pay_url}} readonly>
                </div>
            </div>
            <div class="form-group"  ng-if="paymentInfo.enable_link">