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

src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java

@@ -1782,9 +1782,19 @@ public class RetailAppServiceImp implements RetailAppService {
             getActs.put("publish_date", DateFormatUtils.format(getActs.getDate("publish_time"),"yyyy/MM/dd HH:mm:ss"));
             String reference = getActs.getString("reference");
             JSONObject referenceObj = JSONObject.parseObject(reference);
-            getActs.put("ad_type", referenceObj.getString("ad_type"));
-            getActs.put("expire_date", referenceObj.getString("expire_date"));
-            getActs.put("duration_time", referenceObj.getString("duration_time"));
+            if (reference != null) {
+                if (referenceObj.getString("ad_type") != null) {
+                    getActs.put("ad_type", referenceObj.getString("ad_type"));
+                }
+                if (referenceObj.getString("expire_date") != null) {
+                    getActs.put("expire_date", referenceObj.getString("expire_date"));
+                }
+                if (referenceObj.getString("duration_time") != null) {
+                    getActs.put("duration_time", referenceObj.getString("duration_time"));
+                }
+            }else {
+                getActs.put("message", "mess : (ad_type &&  expire_date && duration_time) not set");
+            }
             getActs.remove("reference");
             getActs.remove("page_desc");
             getActs.remove("page_keywords");

src/main/java/au/com/royalpay/payment/manage/mappers/risk/RiskAttentionMerchantsMapper.java

@@ -34,11 +34,11 @@ public interface RiskAttentionMerchantsMapper {
     PageList<JSONObject> query(JSONObject params, PageBounds pagination);
 
     @Select("SELECT client_moniker FROM risk_attention_merchants " +
-            "WHERE (abn LIKE CONCAT('%',#{abn},'%') ) OR (acn LIKE CONCAT('%',#{acn},'%') ) " +
-            "   OR (contact_phone LIKE CONCAT('%',#{contact_phone},'%') ) " +
-            "   OR (contact_person LIKE CONCAT('%',#{contact_person},'%') ) " +
-            "   OR (client_moniker LIKE CONCAT('%',#{client_moniker},'%') ) " +
-            "   OR (bank_account_no LIKE CONCAT('%',#{bank_account_no},'%') ) AND is_valid=1")
+            "WHERE (abn = #{abn} ) OR (acn = #{acn} ) " +
+            "   OR (contact_phone = #{contact_phone} ) " +
+            "   OR (contact_person = #{contact_person} ) " +
+            "   OR (client_moniker = #{client_moniker} ) " +
+            "   OR (bank_account_no = #{bank_account_no} ) AND is_valid=1")
     List<JSONObject> listRiskySimilarMerchants(JSONObject params);
 
 }

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

@@ -591,8 +591,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         if (clientMapper.findClientByMoniker(registery.getClientMoniker()) != null) {
             throw new BadRequestException("error.partner.valid.dumplicate_client_moniker");
         }
-        //检查商户是否进入系统黑名单
-        isRiskyMerchant(partner, null);
+        //2018-09-10,新建商户不检查是否在系统黑名单
+        //isRiskyMerchant(partner, null);
 
         try {
 
@@ -1184,6 +1184,11 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
                     clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_hf_email_notice", allow));
                 }
                 clientModifySupport.processClientConfigModify(new SwitchPermissionModify(manager, clientMoniker, "enable_" + channel.toLowerCase(), allow));
+
+                if (channel.equals("Wehcat") || channel.equals("Alipay")) {
+
+                    isRiskyMerchant(client,null);
+                }
                 logger.info(manager.getString("display_name") + "(" + manager.getString("manager_id") + ") switched client " + clientMoniker + " channel "
                         + channel + " to " + allow);
                 return;

src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml

@@ -6,7 +6,7 @@
         from  act_charity
         left JOIN  pmt_transactions on act_charity.client_id = pmt_transactions.client_id
         and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time>=act_charity.active_time
-        and  pmt_transactions.transaction_time<'2018-09-01' and  pmt_transactions.transaction_time>='2018-07-09'
+        and  pmt_transactions.transaction_time<'2018-10-31' and  pmt_transactions.transaction_time>='2018-07-09'
         and pmt_transactions.channel != 'Settlement'
         GROUP BY act_charity.client_id order by count_ordernum desc
     </select>
@@ -14,7 +14,7 @@
         select count(DISTINCT order_id) as count_ordernum,date_format(pmt_transactions.transaction_time,'%Y-%m-%d') as orderdate,client_moniker,ifnull(sum(pmt_transactions.clearing_amount),0) as sum_ordernum from act_charity   inner JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id
         and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time>=#{begin} and pmt_transactions.transaction_time&lt;=#{end} and pmt_transactions.transaction_time>=act_charity.active_time
         and pmt_transactions.channel != 'Settlement'
-        and  pmt_transactions.transaction_time&lt;'2018-09-01' and  pmt_transactions.transaction_time>='2018-07-09'
+        and  pmt_transactions.transaction_time&lt;'2018-10-31' and  pmt_transactions.transaction_time>='2018-07-09'
         group by date_format(pmt_transactions.transaction_time,'%Y-%m-%d')
 
     </select>
@@ -22,7 +22,7 @@
     <select id="getChairtyWeekRaking" resultType="com.alibaba.fastjson.JSONObject">
         select count(DISTINCT pmt_transactions.order_id) *0.01 as chair_ordernum,act_charity.client_moniker,ifnull(sum(pmt_transactions.clearing_amount),0) as sum_ordernum from act_charity   left JOIN pmt_transactions ON act_charity.client_id = pmt_transactions.client_id
         and pmt_transactions.transaction_type='Credit'  and pmt_transactions.transaction_time&gt;=#{begin} and pmt_transactions.transaction_time&lt;=#{end} and pmt_transactions.transaction_time>=act_charity.active_time
-        and  pmt_transactions.transaction_time&lt;'2018-09-01' and  pmt_transactions.transaction_time>='2018-07-09'
+        and  pmt_transactions.transaction_time&lt;'2018-10-31' and  pmt_transactions.transaction_time>='2018-07-09'
         GROUP BY act_charity.client_moniker order by chair_ordernum desc
     </select>
 </mapper>

src/main/ui/static/cms/cms.js

@@ -120,7 +120,11 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
 
     app.controller('cmsArticleEditCtrl', ['$scope', '$http', '$state', '$stateParams', 'commonDialog', 'article', function ($scope, $http, $state, $stateParams, commonDialog, article) {
         $scope.article = article.data;
-        $scope.reference = JSON.parse($scope.article.reference);
+        if ($scope.article.reference) {
+            $scope.reference = JSON.parse($scope.article.reference);
+        }else {
+            $scope.reference = {};
+        }
 
         $scope.saveArticle = function () {
                 $scope.article.reference =$scope.reference;