Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage

extra/crypt/alipay_private.pem

@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC72cPSVWP66+5iDU+Yyg6ODfjDeb+nty90e5UtESIB1YOn4qaq
+gjPiNgDZUDpaUhHKCW95U/V3pQi2FBbIj16z8uAAxVe+Uz45NlWhBIT9+4PY57oF
+yLkaVCr/6Kwir/ql28cvwkhkbrQ2veOpGd7/W8UpMjWMyNuZGelEibmBKQIDAQAB
+AoGABdjpd4qg6had/P9dEux3N4TH0Y3goV/aYk3Wfuihnlz/FCLB/VzAMLJtpFYS
++uzDEP7qMWSjp23Dr6dAbk3ILNQgogrJ4a4z9Uq9fVYt8lBo/T98hjR1xSXDJEQS
+FsUw8XRbYGFOFxnLzlTjLix1b6+gmTJsKihbETMXBKRl/WECQQDkf0LRjoDCME4H
+kgLzm4dq5iCPdJNQLOZT+xJsQy72/RNdnlbYJVO0E9NSo1oIpFtKA2C8z/BTnAUk
+5nuLeac/AkEA0nYN1i4TZCyaB0MbGIgFU/dc7aIY/5QIY4oGrs//3CnqLDxU0Doa
+yFEQAaZTINa7hy4aZqtPl7rdeYBPFwRllwJBAOIrCRNtbwtHTuT1ZJCGQKrR8Cau
+p+WzG6TCnoCkm0cERvfic2lswQY8nW5tm/9z15xR7Z3WYLYRd5IHxP/QQXcCQQC1
+fDveUAlEvvlr/cAl3VXK3Gp0OO4Zpsu9Gk88+/yFHFflIXl5vkFOMCj/YzAYB1Pa
+9DSsCFowW2GU3sJU9OOtAkBB8WLs1AGsBRdMy9b2ucfeeCDjMip5deLCwX9jii/p
+Am5f2ajaEkr60blSbG4sbK/EKZ2uENUZzKqcIje83TB8
+-----END RSA PRIVATE KEY-----

extra/crypt/alipay_public.pem

@@ -0,0 +1 @@
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCnxj/9qwVfgoUh/y2W89L6BkRAFljhNhgPdyPuBV64bfQNN1PjbCzkIM6qRdKBoLPXmKKMiFYnkd6rAoprih3/PrQEB/VsW8OoM8fxn67UDYuyBTqA23MML9q1+ilIZwBC2AQ2UBVOrFXfFl75p6/B5KsiNG9zpgmLCUYuLkxpLQIDAQAB

extra/custom/ali_custom_config.json

@@ -0,0 +1,102 @@
+[
+  {
+    "code": "hangzhou",
+    "name": "杭州海关",
+    "target": [
+      "HANGZHOU_ZONGSHU"
+    ]
+  },
+  {
+    "code": "guangzhou",
+    "name": "广州海关",
+    "target": [
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "zhengzhou",
+    "name": "河南保税物流中心",
+    "target": [
+      "ZHENGZHOU"
+    ]
+  },
+  {
+    "code": "xinzheng",
+    "name": "新郑综合保税区（空港）",
+    "target": [
+      "HENAN",
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "chongqing",
+    "name": "重庆海关",
+    "target": [
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "ningbo",
+    "name": "宁波",
+    "target": [
+      "NINGBO"
+    ]
+  },
+  {
+    "code": "shengzhen",
+    "name": "深圳海关",
+    "target": [
+      "SHENZHEN_ZS",
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "shanghai",
+    "name": "上海海关",
+    "target": [
+      "SHANGHAI_CBT"
+    ]
+  },
+  {
+    "code": "xian",
+    "name": "西安海关",
+    "target": [
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "NANSHAGJ",
+    "name": "南沙国检",
+    "target": [
+      "NANSHAGJ"
+    ]
+  },
+  {
+    "code": "tianjin",
+    "name": "天津海关",
+    "target": [
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "hefei",
+    "name": "合肥海关",
+    "target": [
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "suzhou",
+    "name": "苏州海关",
+    "target": [
+      "ZONGSHU"
+    ]
+  },
+  {
+    "code": "guangzhouhuangpu",
+    "name": "广州黄埔海关",
+    "target": [
+      "GUANGZHOU_HUANGPU"
+    ]
+  }
+]

pom.xml

@@ -10,6 +10,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <jib-maven-plugin.version>1.1.2</jib-maven-plugin.version>
+        <docker-image.version>1.0.2</docker-image.version>
+    </properties>
 
     <dependencies>
         <dependency>
@@ -197,6 +202,31 @@
                     <executable>true</executable>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.google.cloud.tools</groupId>
+                <artifactId>jib-maven-plugin</artifactId>
+                <version>${jib-maven-plugin.version}</version>
+                <configuration>
+                    <from>
+                        <image>hkccr.ccs.tencentyun.com/cross-payment/base:v1.0</image>
+                    </from>
+                    <to>
+                        <image>hkccr.ccs.tencentyun.com/cb-payment/manage:${docker-image.version}</image>
+                    </to>
+                    <extraDirectory>
+                        <path>extra/</path>
+                    </extraDirectory>
+                    <allowInsecureRegistries>true</allowInsecureRegistries>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>build</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>

src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java

@@ -80,13 +80,4 @@ public class EncourageMoneyController {
     public ModelAndView merchantsPage() {
         return new ModelAndView("activity/encourage_money/merchants");
     }
-
-
-    public static void main(String[] args) {
-        JSONObject asd = null;
-
-        JSONObject qwe = null;
-        System.out.println(asd);
-        System.out.println(qwe);
-    }
 }

src/main/java/au/com/royalpay/payment/manage/openim/core/OpenimClient.java

@@ -111,25 +111,4 @@ public class OpenimClient {
         }
     }
 
-    public static void main(String[] args) {
-        String appkey = "24980715";
-        String secret = "60b1ba680a6f27ffc701f10b6d5be00e";
-       String url = "https://eco.taobao.com/router/rest";
-
-        TaobaoClient client = new DefaultTaobaoClient(url, appkey, secret);
-        OpenimUsersGetRequest req = new OpenimUsersGetRequest();
-        // 批量为userid逗号分隔字符串
-        req.setUserids("kiraservant");
-        OpenimUsersGetResponse rsp = null;
-        try {
-            rsp = client.execute(req);
-        } catch (ApiException e) {
-        }
-        JSONObject openInfo = JSONObject.parseObject(rsp.getBody());
-        System.out.println(openInfo.toJSONString());
-        System.out.println(openInfo.toJSONString());
-        System.out.println(openInfo.toJSONString());
-    }
-
-
 }

src/main/java/au/com/royalpay/payment/manage/surchargeAccount/core/impl/SurchargeAccountServiceImpl.java

@@ -130,3 +130,5 @@ public class SurchargeAccountServiceImpl implements SurchargeAccountService {
         }
     }
 }
+
+

src/main/resources/au/com/royalpay/payment/manage/analysis/mappers/ClientAnalysisMapper.xml

@@ -251,7 +251,7 @@
         ]]>
         GROUP by c.sub_merchant_id
     </select>
-
+    
     <select id="tradeSubMerchantIdBy60Days" resultType="com.alibaba.fastjson.JSONObject">
         <![CDATA[
         SELECT COUNT(DISTINCT c.client_id) client_count,

src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClearingDistributedSurchargeMapper.xml

@@ -24,7 +24,7 @@
     </select>
 
     <select id="findSurchargeTransactionsByDetailId" resultType="com.alibaba.fastjson.JSONObject">
-                SELECT clearing_detail_id, settle_date,total_surcharge,tax_amount, type, amount,create_time,operation,remark
+                SELECT client_id,clearing_detail_id, settle_date,total_surcharge,tax_amount, type, amount,create_time,operation,remark
                   FROM log_clearing_distributed_surcharge
                  WHERE client_id = #{client_id}
                    AND bill_id = #{detailId}

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

@@ -1422,6 +1422,7 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
                 $scope.ctrl.editMaxOrderAmount = false;
                 $scope.ctrl.editOrderExpiryConfig = false;
                 $scope.ctrl.editRefundPwd = false;
+                $scope.ctrl.editRefundCreditLine = false;
             })
         };
         $scope.qrConfig = {currency: 'AUD'};
@@ -1502,6 +1503,17 @@ define(['angular', 'decimal', 'static/commons/commons', 'uiBootstrap', 'uiRouter
             })
         };
 
+        $scope.setRefundCreditLine = function () {
+            if (!$scope.paymentInfo) {
+                return;
+            }
+            $http.put('/sys/partners/' + $scope.partner.client_moniker + '/refund_credit_line', {refund_credit_line: $scope.paymentInfo.refund_credit_line}).then(function (resp) {
+                $scope.loadPartnerPaymentInfo();
+            }, function (resp) {
+                commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'})
+            });
+        };
+
         $scope.updateClientQRCodePaySurCharge = function () {
             if (!$scope.paymentInfo) {
                 return;

src/main/ui/static/payment/partner/templates/add_partner.html

@@ -1050,4 +1050,3 @@
 
     </form>
 </div>
-

src/main/ui/static/payment/partner/templates/partner_payment_info.html

@@ -495,6 +495,33 @@
                 </div>
             </div>
 
+            <!--授信退款额度-->
+            <div class="form-group" ng-if="('100000000'|withRole)&& paymentInfo.enable_pre_refund">
+                <label class="col-sm-2 control-label">Refund Credit Line</label>
+                <div class="col-sm-9">
+                    <p ng-if="!ctrl.editRefundCreditLine" class="form-control-static">
+                        {{paymentInfo.refund_credit_line||'Not Configure'}}
+                        <a role="button" ng-click="ctrl.editRefundCreditLine=true" ng-if="'01'|withRole"><i
+                                class="fa fa-edit"></i></a>
+                    </p>
+                    <div class="input-group" ng-if="ctrl.editRefundCreditLine">
+                        <input type="number" maxlength="6" class="form-control"
+                               ng-model="paymentInfo.refund_credit_line">
+                        <div class="input-group-btn">
+                            <button class="btn btn-success"
+                                    ng-click="setRefundCreditLine()">
+                                <i class="fa fa-check"></i>
+                            </button>
+                        </div>
+                        <div class="input-group-btn">
+                            <button class="btn btn-danger" ng-click="ctrl.editRefundCreditLine=false">
+                                <i class="fa fa-remove"></i>
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
             <div class="form-group" ng-if="('100000000'|withRole)">
                 <label class="col-sm-2 control-label">Reset Refund Password</label>
                 <div class="col-sm-9">

src/main/ui/static/payment/tradelog/transflow.js

@@ -170,6 +170,9 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
               url += connectSymbol + 'dev_id=' + params.dev_id;
               connectSymbol = '&'
             }
+            if (!params.client_ids) {
+                $scope.params.client_ids = [$scope.currentUser.client.client_id]
+            }
             params.client_ids.forEach(function (i) {
                 url += connectSymbol + 'client_ids=' + i;
                 connectSymbol = '&';