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

pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>manage</artifactId>
-    <version>2.3.49</version>
+    <version>2.3.50</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <jib-maven-plugin.version>2.4.0</jib-maven-plugin.version>

src/main/java/au/com/royalpay/payment/manage/mappers/system/ClientMapper.java

@@ -29,7 +29,7 @@ public interface ClientMapper {
 
     List<JSONObject> listValidClient();
 
-    List<JSONObject> listValidClientFor30Days();
+    List<JSONObject> listValidClientFor30Days(JSONObject params);
 
     List<JSONObject> listGreenChannel(JSONObject params);
 

src/main/java/au/com/royalpay/payment/manage/notice/core/impls/NoticeManageImpl.java

@@ -117,9 +117,9 @@ public class NoticeManageImpl implements NoticeManage {
         notice.put("create_time", date);
         notice.put("create_id", manager.getString("manager_id"));
         notice.put("create_name", manager.getString("display_name"));
-        if (!notice.getBoolean("merchants_type")){
+        if (notice.getInteger("merchants_type") != 1){
             StringBuilder sendClients = new StringBuilder();
-            List<JSONObject> clients = clientMapper.listValidClientFor30Days();
+            List<JSONObject> clients = clientMapper.listValidClientFor30Days(notice);
             clients.forEach(c -> {
                 if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){
                     String p = c.getString("client_moniker")+",";
@@ -177,10 +177,10 @@ public class NoticeManageImpl implements NoticeManage {
             notice.put("send_id", manager.getString("manager_id"));
             notice.put("send_name", manager.getString("display_name"));
         }
-        if (!notice.getBoolean("merchants_type")){
+        if (notice.getInteger("merchants_type") != 1){
             StringBuilder sendClients = new StringBuilder();
 
-            List<JSONObject> clients = clientMapper.listValidClientFor30Days();
+            List<JSONObject> clients = clientMapper.listValidClientFor30Days(notice);
             clients.forEach(c -> {
                 if (c.getInteger("parent_client_id")==null || c.getInteger("parent_client_id")!=9){
                     String p = c.getString("client_moniker")+",";

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

@@ -12,9 +12,17 @@
                         sc.client_moniker,
                         sc.parent_client_id
         FROM statistics_customer_order sco,
-             sys_clients sc
+             sys_clients sc,
+             sys_client_config cc
         WHERE sco.date >= DATE_SUB(CURDATE(), INTERVAL 30 DAY)
           AND sco.client_id = sc.client_id
+          AND sc.client_id = cc.client_id
+          <if test="merchants_type == 2">
+              AND cc.enable_cross_payment = 1
+          </if>
+          <if test="merchants_type == 3">
+              AND cc.enable_card_payment = 1
+          </if>
     </select>
     <select id="listGreenChannel" resultType="com.alibaba.fastjson.JSONObject">
         select m.manager_id manager_id,m.display_name display_name, m.wx_openid wx_openid , c.client_moniker

src/main/ui/static/config/notice/notice.js

@@ -9,10 +9,22 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
             "label": "All",
             "value": 0
         },
+        {
+            //跨境商户
+            "label": "Cross-border",
+            "value": 2
+        },
+        {
+            //卡支付商户
+            "label": "Card",
+            "value": 3
+        },
         {
             "label": "Custom",
             "value": 1
-        }];
+        }
+    ];
+
 
     var app = angular.module('noticeApp', ['ui.bootstrap', 'ui.router', 'frapontillo.bootstrap-switch', 'ngFileUpload', 'ng.uditor']);
     app.config(['$stateProvider', function ($stateProvider) {
@@ -104,6 +116,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
         };
         $scope.today = new Date();
         $scope.save = function (form) {
+            debugger
             if (form.$invalid) {
                 angular.forEach(form, function (item, key) {
                     if (key.indexOf('$') < 0) {