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

src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java

@@ -16,8 +16,28 @@ import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper;
 import au.com.royalpay.payment.manage.mappers.log.ClientsOperationLogMapper;
 import au.com.royalpay.payment.manage.mappers.payment.TransactionMapper;
 import au.com.royalpay.payment.manage.mappers.redpack.ActClientInvitationCodeMapper;
-import au.com.royalpay.payment.manage.mappers.system.*;
+import au.com.royalpay.payment.manage.mappers.system.ClientAccountMapper;
-import au.com.royalpay.payment.manage.merchants.beans.*;
+import au.com.royalpay.payment.manage.mappers.system.ClientApplyMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientAuditProcessMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientBDMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientBankAccountMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientDeviceMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientFilesMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientRateMapper;
+import au.com.royalpay.payment.manage.mappers.system.ClientsContractMapper;
+import au.com.royalpay.payment.manage.mappers.system.CommoditiesMapper;
+import au.com.royalpay.payment.manage.mappers.system.ManagerMapper;
+import au.com.royalpay.payment.manage.mappers.system.OrgMapper;
+import au.com.royalpay.payment.manage.mappers.system.SysWxMerchantApplyMapper;
+import au.com.royalpay.payment.manage.merchants.beans.ActivityPosterBuilder;
+import au.com.royalpay.payment.manage.merchants.beans.BankAccountInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientAuthFilesInfo;
+import au.com.royalpay.payment.manage.merchants.beans.ClientRateConfig;
+import au.com.royalpay.payment.manage.merchants.beans.ClientRegisterInfo;
+import au.com.royalpay.payment.manage.merchants.beans.NewAccountBean;
+import au.com.royalpay.payment.manage.merchants.beans.PartnerQuery;
+import au.com.royalpay.payment.manage.merchants.beans.SubMerchantIdApply;
 import au.com.royalpay.payment.manage.merchants.core.ClientComplyValidator;
 import au.com.royalpay.payment.manage.merchants.core.ClientInfoCacheSupport;
 import au.com.royalpay.payment.manage.merchants.core.ClientManager;
@@ -48,16 +68,21 @@ import au.com.royalpay.payment.tools.merchants.qrboard.QRBoard;
 import au.com.royalpay.payment.tools.merchants.qrboard.QRBoardProvider;
 import au.com.royalpay.payment.tools.permission.enums.ManagerRole;
 import au.com.royalpay.payment.tools.permission.enums.PartnerRole;
-import au.com.royalpay.payment.tools.utils.*;
+import au.com.royalpay.payment.tools.utils.ImageUtils;
+import au.com.royalpay.payment.tools.utils.PageListUtils;
+import au.com.royalpay.payment.tools.utils.PasswordUtils;
+import au.com.royalpay.payment.tools.utils.PdfUtils;
+import au.com.royalpay.payment.tools.utils.QRCodeUtils;
+import au.com.royalpay.payment.tools.utils.TimeZoneUtils;
 import au.com.royalpay.payment.tools.websocket.notify.PartnerPageEvent;
-import cn.yixblog.platform.http.HttpRequestGenerator;
+
-import cn.yixblog.platform.http.HttpRequestResult;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.github.miemiedev.mybatis.paginator.domain.Order;
 import com.github.miemiedev.mybatis.paginator.domain.PageBounds;
 import com.github.miemiedev.mybatis.paginator.domain.PageList;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -83,23 +108,35 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.thymeleaf.context.Context;
 import org.thymeleaf.spring4.SpringTemplateEngine;
 
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.yixblog.platform.http.HttpRequestGenerator;
+import cn.yixblog.platform.http.HttpRequestResult;
+
 import static au.com.royalpay.payment.manage.permission.utils.OrgCheckUtils.checkOrgPermission;
 
 /**
@@ -1510,19 +1547,19 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject client = clientDetail(manager, clientMoniker);
         try {
             JSONObject qrboardConfig = new JSONObject();
-            qrboardConfig.put("src", PlatformEnvironment.getEnv().concatUrl("/static/images/aggregate_qr_board.png"));
+            qrboardConfig.put("src", "http://192.168.0.10:9001/static/images/aggregate_qr_board.png");
             qrboardConfig.put("type", "royalpay");
-            qrboardConfig.put("x", "845");
+            qrboardConfig.put("x", "835");
-            qrboardConfig.put("y", "1260");
+            qrboardConfig.put("y", "1290");
             qrboardConfig.put("size", "770");
             qrboardConfig.put("fontsize", "50");
-            qrboardConfig.put("fontx", "1245");
+            qrboardConfig.put("fontx", "1235");
-            qrboardConfig.put("fonty", "2041");
+            qrboardConfig.put("fonty", "2051");
             qrboardConfig.put("snsize", "50");
-            qrboardConfig.put("snx", "1225");
+            qrboardConfig.put("snx", "1215");
-            qrboardConfig.put("sny", "1290");
+            qrboardConfig.put("sny", "1320");
-            qrboardConfig.put("brandx", "940");
+            qrboardConfig.put("brandx", "930");
-            qrboardConfig.put("brandy", "1030");
+            qrboardConfig.put("brandy", "1060");
             qrboardConfig.put("brandw", "600");
             qrboardConfig.put("brandh", "200");
             String type = qrboardConfig.getString("type");

src/main/ui/static/payment/partner/partner.js

@@ -203,8 +203,9 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
             })
         }
     }]);
-    app.controller('clientClearingConfigCtrl', ['$scope', '$http', function ($scope, $http) {
+    app.controller('clientClearingConfigCtrl', ['$scope', '$http','$state','commonDialog', function ($scope, $http,$state,commonDialog) {
         $scope.bankCtrl = {rate_name:'Wechat'};
+        $scope.init = {manual:false};
         $scope.getBankAccount = function () {
             $http.get('/client/partner_info/bank_account').then(function (resp) {
                 $scope.bankaccount = resp.data;
@@ -221,9 +222,28 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload'], funct
             });
         };
         $scope.manualSettle = function (manualSettle) {
-            $http.put('/client/partner_info/manual_settle?'+'manual_settle='+manualSettle).then(function (resp) {
+            if(!$scope.init.manual){
+                $scope.init.manual = true;
+                return;
+            }
+            var waring_messsage;
+            if(manualSettle){
+                waring_messsage = "Open"
+            }else {
+                waring_messsage = "Close"
+            }
+            commonDialog.confirm({
+                title: 'Confirmation',
+                content: 'Are you sure to '+waring_messsage+'?',
+            }).then(function(){
+                $http.put('/client/partner_info/manual_settle?'+'manual_settle='+manualSettle).then(function (resp) {
+                },function (resp) {
+                    commonDialog.alert({title: 'Error!', content: resp.data.message, type: 'error'})
+                })
+            },function () {
+                $state.reload();
+            });
 
-            })
         };
         $scope.getRates();
     }]);