Merge branch 'develop'

# Conflicts:
#	pom.xml

pom.xml

@@ -5,16 +5,16 @@
     <parent>
         <groupId>au.com.royalpay.payment</groupId>
         <artifactId>payment-parent</artifactId>
-        <version>1.1.3</version>
+        <version>1.1.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>manage</artifactId>
-    <version>1.2.28</version>
+    <version>1.2.41</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jib-maven-plugin.version>1.6.1</jib-maven-plugin.version>
+        <jib-maven-plugin.version>1.4.0</jib-maven-plugin.version>
         <docker-image.version>${project.version}</docker-image.version>
     </properties>
 
@@ -142,6 +142,11 @@
             <artifactId>itext</artifactId>
             <version>2.1.7</version>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+            <version>2.4.8</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>

src/document/cn/apis.js

@@ -960,6 +960,19 @@
  * @apiSuccess {String} last_update_date 更新时间
  * @apiSuccess {String} error_code 错误代码
  * @apiSuccess {String} error_msg 错误返回的信息描述
+ * @apiSuccess {String} verify_department 验核机构
+ * @apiSuccess {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess {JSON[]} sub_orders 拆单信息(可能返回多个)
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no 商户子订单号
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY 币种代码
+ * @apiSuccess (SUB_JSON) {Double} order_fee 子订单金额
+ * @apiSuccess (SUB_JSON) {Double} transport_fee 子订单物流金额
+ * @apiSuccess (SUB_JSON) {String} verify_department 验核机构
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess (SUB_JSON) {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code 错误代码
+ * @apiSuccess (SUB_JSON) {String} error_msg 错误返回的信息描述
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
@@ -995,6 +1008,19 @@
  * @apiSuccess {String} last_update_date 更新时间
  * @apiSuccess {String} error_code 错误代码
  * @apiSuccess {String} error_msg 错误返回的信息描述
+ * @apiSuccess {String} verify_department 验核机构
+ * @apiSuccess {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess {JSON[]} sub_orders 拆单信息(可能返回多个)
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no 商户子订单号
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY 币种代码
+ * @apiSuccess (SUB_JSON) {Double} order_fee 子订单金额
+ * @apiSuccess (SUB_JSON) {Double} transport_fee 子订单物流金额
+ * @apiSuccess (SUB_JSON) {String} verify_department 验核机构
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess (SUB_JSON) {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code 错误代码
+ * @apiSuccess (SUB_JSON) {String} error_msg 错误返回的信息描述
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配
@@ -1021,6 +1047,19 @@
  * @apiSuccess {String} return_msg 错误描述，仅在执行结果不为SUCCESS情况下出现
  * @apiSuccess {String} order_id RoyalPay订单号
  * @apiSuccess {String} partner_order_id 商户订单ID
+ * @apiSuccess {String} verify_department 验核机构
+ * @apiSuccess {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess {JSON[]} sub_orders 拆单信息(可能返回多个)
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no 商户子订单号
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY 币种代码
+ * @apiSuccess (SUB_JSON) {Double} order_fee 子订单金额
+ * @apiSuccess (SUB_JSON) {Double} transport_fee 子订单物流金额
+ * @apiSuccess (SUB_JSON) {String} verify_department 验核机构
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id 验核机构交易流水号
+ * @apiSuccess (SUB_JSON) {String} report_status 报关单状态: PROCCESSING,SUBMITED,FAILED,SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code 错误代码
+ * @apiSuccess (SUB_JSON) {String} error_msg 错误返回的信息描述
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH 订单号与商户不匹配

src/document/en/apis.js

@@ -978,6 +978,19 @@
  * @apiSuccess {String} last_update_date Update Time
  * @apiSuccess {String} error_code Error Code
  * @apiSuccess {String} error_msg Error Description
+ * @apiSuccess {String} verify_department Verify Department
+ * @apiSuccess {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess {JSON[]} sub_orders sub_order Child orders
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no  Child order ID
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY Currency
+ * @apiSuccess (SUB_JSON) {Double} order_fee Child Order Amount
+ * @apiSuccess (SUB_JSON) {Double} transport_fee Child Order Logistics Amount
+ * @apiSuccess (SUB_JSON) {String} verify_department Verify Department
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess (SUB_JSON) {String} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code Error Code
+ * @apiSuccess (SUB_JSON) {String} error_msg Error Description
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
@@ -1013,6 +1026,19 @@
  * @apiSuccess {String} last_update_date Update Time
  * @apiSuccess {String} error_code Error Code
  * @apiSuccess {String} error_msg Error Description
+ * @apiSuccess {String} verify_department Verify Department
+ * @apiSuccess {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess {JSON[]} sub_orders sub_order Child orders
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no  Child order ID
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY Currency
+ * @apiSuccess (SUB_JSON) {Double} order_fee Child Order Amount
+ * @apiSuccess (SUB_JSON) {Double} transport_fee Child Order Logistics Amount
+ * @apiSuccess (SUB_JSON) {String} verify_department Verify Department
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess (SUB_JSON) {String} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code Error Code
+ * @apiSuccess (SUB_JSON) {String} error_msg Error Description
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner
@@ -1039,6 +1065,19 @@
  * @apiSuccess {String} return_msg Error Description
  * @apiSuccess {String} order_id RoyalPay Order ID
  * @apiSuccess {String} partner_order_id Partner Order ID
+ * @apiSuccess {String} verify_department Verify Department
+ * @apiSuccess {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess {JSON[]} sub_orders sub_order Child orders
+ *
+ * @apiSuccess (SUB_JSON) {String} sub_order_no  Child order ID
+ * @apiSuccess (SUB_JSON) {String=CNY} fee_type=CNY Currency
+ * @apiSuccess (SUB_JSON) {Double} order_fee Child Order Amount
+ * @apiSuccess (SUB_JSON) {Double} transport_fee Child Order Logistics Amount
+ * @apiSuccess (SUB_JSON) {String} verify_department Verify Department
+ * @apiSuccess (SUB_JSON) {String} verify_department_trade_id Verify Department Trade Id
+ * @apiSuccess (SUB_JSON) {String} report_status 0:PROCCESSING,1:SUBMITED,2:FAIL,3:SUCCESS
+ * @apiSuccess (SUB_JSON) {String} error_code Error Code
+ * @apiSuccess (SUB_JSON) {String} error_msg Error Description
  *
  * @apiUse GlobalError
  * @apiError (ERROR_CODE) ORDER_MISMATCH Order is not belong to this partner

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/BDAnalysisServiceImpl.java

@@ -51,7 +51,7 @@ public class BDAnalysisServiceImpl implements BDAnalysisService {
     }
 
     private List<JSONObject> listSalesAnalysis(JSONObject jsonObject) {
-        List<JSONObject> listCountApproved = bdAnalysisMapper.countApproved(jsonObject);
+        List<JSONObject> listCountApproved = bdAnalysisMapper.queryBDNewMerchants(jsonObject);
         List<JSONObject> bdSaleList = bdSalesReportMapper.getBDSaleList(jsonObject);
         for (JSONObject countApproved : listCountApproved) {
             for (JSONObject saleList : bdSaleList) {

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/DailyReportImp.java

@@ -135,7 +135,7 @@ public class DailyReportImp implements DailyReport {
             for (JSONObject clientAmount : clientsAmount) {
                 if (clientAmount.getString("bd_group").equals(kpi.getString("bd_group"))) {
                     //  sys_clients中查询出此bd创建并属于此bd的商户，并且时间是昨天和本月
-                    JSONObject countByBd = clientMapper.findCountByBd(clientAmount.getString("bd_group"), DateUtils.truncate(dt, Calendar.DATE), DateUtils.truncate(DateUtils.addDays(dt, -1), Calendar.DATE), DateUtils.truncate(dt, Calendar.MONTH));
+                    JSONObject countByBd = clientMapper.findCountByBd(clientAmount.getString("bd_group"), DateUtils.truncate(DateUtils.addDays(dt, 1), Calendar.DATE), DateUtils.truncate(dt, Calendar.DATE), DateUtils.truncate(dt, Calendar.MONTH));
                     if (countByBd.getInteger("month_count") == null){
                         kpi.put("clients_month", 0);
                     }else {

src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/EstimateAnalysisServiceImpl.java

@@ -228,13 +228,13 @@ public class EstimateAnalysisServiceImpl implements EstimateAnalysisService {
         //预计到账金额
         Calendar cal = Calendar.getInstance();
         cal.setTime(date);
-        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 0, 0, 0);
+        cal.set(cal.get(Calendar.YEAR), cal.get(Calendar.MONTH), cal.get(Calendar.DAY_OF_MONTH) - 1, 2, 0, 0);
         Date datefrom = cal.getTime();
 
         if (DateUtils.isSameDay(new Date(), datefrom)) {
             JSONObject params = new JSONObject();
-            params.put("datefrom", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
-            params.put("dateto", DateFormatUtils.format(DateUtils.addDays(datefrom, 1), "yyyy-MM-dd HH:mm:ss"));
+            params.put("datefrom", DateFormatUtils.format(DateUtils.addDays(datefrom, -1), "yyyy-MM-dd HH:mm:ss"));
+            params.put("dateto", DateFormatUtils.format(datefrom, "yyyy-MM-dd HH:mm:ss"));
 
             List<JSONObject> lastDayClearingAmount = transactionMapper.getLastDaytransAmount(params);
             BigDecimal total_clearing = BigDecimal.ZERO;

src/main/java/au/com/royalpay/payment/manage/analysis/mappers/BDAnalysisMapper.java

@@ -29,4 +29,7 @@ public interface BDAnalysisMapper {
 
     //获取指定一天销售数据
     List<JSONObject> getOneDayBDSaleList(JSONObject params);
+
+    //查询时间段范围BD新增商户
+    List<JSONObject> queryBDNewMerchants(JSONObject params);
 }

src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppQueryBean.java

@@ -6,7 +6,9 @@ import au.com.royalpay.payment.core.beans.PayChannel;
 import au.com.royalpay.payment.tools.defines.TradeType;
 import au.com.royalpay.payment.tools.utils.TimeZoneUtils;
 import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
+import org.castor.util.StringUtil;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -32,6 +34,7 @@ public class AppQueryBean {
     private int page = 1;
     private int limit = 20;
     private String timezone = "Australia/Melbourne";
+    private String order_id;
 
     public JSONObject toParams() {
         JSONObject params = new JSONObject();
@@ -91,6 +94,9 @@ public class AppQueryBean {
         if (clearing_status != -1) {
             params.put("clearing_status", clearing_status);
         }
+        if (StringUtils.isNotBlank(order_id)) {
+            params.put("order_id", order_id);
+        }
         return params;
     }
 
@@ -182,4 +188,12 @@ public class AppQueryBean {
     public void setClearing_status(int clearing_status) {
         this.clearing_status = clearing_status;
     }
+
+    public void setOrder_id(String order_id) {
+        this.order_id = order_id;
+    }
+
+    public String getOrder_id() {
+        return order_id;
+    }
 }

src/main/java/au/com/royalpay/payment/manage/custom/core/impl/CustomServiceImpl.java

@@ -57,12 +57,12 @@ public class CustomServiceImpl implements CustomService {
         if (report != null) {
             throw new BadRequestException("report record exist");
         }
-        CustomReport customReport = new CustomReport(UUID.randomUUID().toString(),addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
+        CustomReport customReport = new CustomReport(UUID.randomUUID().toString(), addCustomVO.getOrder_id(), addCustomVO.getMch_custom_id(), addCustomVO.getMch_custom_name(),
                 addCustomVO.getCustom());
         customReport.addExtMchCustom(addCustomVO.getMch_ext_custom_id(), addCustomVO.getMch_ext_custom_name());
         if (!CollectionUtils.isEmpty(addCustomVO.getSubOrders())) {
             addCustomVO.getSubOrders().forEach(p -> {
-                customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")));
+                customReport.addSubOrder(p.getBigDecimal("order_fee"), p.getBigDecimal("order_fee").subtract(p.getBigDecimal("transport_fee")), p.getString("sub_order_no"));
             });
         }
         JSONObject result = customSupport.saveCustom(customReport);

src/main/java/au/com/royalpay/payment/manage/mappers/financial/FinancialBDPrizeLogMapper.java

@@ -128,7 +128,7 @@ public interface FinancialBDPrizeLogMapper {
             "\tsc.org_id = 1 \n" +
             "\tAND o.date >= #{start_date} \n" +
             "\tAND o.date < #{end_date} \n" +
-            "\tAND d.start_date <= o.date  AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
+            "\tAND d.start_date <= o.date AND d.is_valid = 1  AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
             "\t) \n" +
             "\tAND c.bd_group IS NOT NULL \n" +
             "\tAND fbc.bd_type in (1, 2, 6, 7) \n" +
@@ -149,7 +149,7 @@ public interface FinancialBDPrizeLogMapper {
             "\tsc.org_id = 1 \n" +
             "\tAND o.date >= #{month_start_date} \n" +
             "\tAND o.date < #{end_date} \n" +
-            "\tAND d.start_date <= o.date  AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
+            "\tAND d.start_date <= o.date AND d.is_valid = 1  AND ( d.end_date IS NULL OR d.end_date > o.date \n" +
             "\t) \n" +
             "\tAND c.bd_group IS NOT NULL \n" +
             "\tAND fbc.bd_type in (1, 2, 6, 7) \n" +

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

@@ -2380,7 +2380,7 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         JSONObject client = clientDetail(manager, clientMoniker);
         try {
             HttpRequestResult boardBackgroundResult = new HttpRequestGenerator(
-                    PlatformEnvironment.getEnv().concatUrl("/static/images/new_aggregate_poster.jpeg"), RequestMethod.GET).execute();
+                    PlatformEnvironment.getEnv().concatUrl("/static/images/new_aggregate_poster.png"), RequestMethod.GET).execute();
             if (boardBackgroundResult.isSuccess()) {
                 InputStream ins = boardBackgroundResult.getResponseContentStream();
                 BufferedImage background = ImageIO.read(ins);

src/main/java/au/com/royalpay/payment/manage/permission/manager/ManagerUserInterceptor.java

@@ -42,8 +42,12 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        Method method = ((HandlerMethod) handler).getMethod();
-        return handleMethod(method, request, response) && super.preHandle(request, response, handler);
+        if (handler instanceof HandlerMethod) {
+            Method method = ((HandlerMethod) handler).getMethod();
+            return handleMethod(method, request, response) && super.preHandle(request, response, handler);
+        } else {
+            return super.preHandle(request, response, handler);
+        }
     }
 
     private boolean handleMethod(Method method, HttpServletRequest request, HttpServletResponse response) {
@@ -75,7 +79,7 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements
             }
             if (ex != null) {
                 String funcId = clazz.getSimpleName() + "." + method.getName();
-                checkPartnerPermission(request, partner, partnerStatusKey, managerStatusKey,funcId);
+                checkPartnerPermission(request, partner, partnerStatusKey, managerStatusKey, funcId);
             }
             return true;
         }
@@ -85,11 +89,11 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements
             return true;
         }
         String funcId = clazz.getSimpleName() + "." + method.getName();
-        checkPartnerPermission(request, partner, partnerStatusKey, managerStatusKey,funcId);
+        checkPartnerPermission(request, partner, partnerStatusKey, managerStatusKey, funcId);
         return true;
     }
 
-    private void checkPartnerPermission(HttpServletRequest request, RequirePartner partner, String partnerStatusKey, String managerStatusKey,String funcId) {
+    private void checkPartnerPermission(HttpServletRequest request, RequirePartner partner, String partnerStatusKey, String managerStatusKey, String funcId) {
         if (StringUtils.isEmpty(partnerStatusKey) && StringUtils.isEmpty(managerStatusKey)) {
             throw new ForbiddenException("error.permission.not_login");
         }
@@ -108,7 +112,7 @@ public class ManagerUserInterceptor extends HandlerInterceptorAdapter implements
         }
 
         JSONObject func = permissionPartnerManager.getPartnerFuncById(funcId);
-        if(func!=null && StringUtils.isNotEmpty(func.getString("module_id"))){
+        if (func != null && StringUtils.isNotEmpty(func.getString("module_id"))) {
             JSONArray arr = loginUser.getJSONArray("available_module_ids");
             if (arr == null || !arr.contains(func.getString("module_id"))) {
                 logger.info(partner.toString());

src/main/java/au/com/royalpay/payment/manage/task/DailyReportGenerationTask.java

@@ -25,7 +25,7 @@ public class DailyReportGenerationTask {
     @Resource
     private SynchronizedScheduler synchronizedScheduler;
 
-    @Scheduled(cron = "0 0 10 * * ?")
+    @Scheduled(cron = "0 0 9 * * ?")
     public void dailyReportAutoGenerateReport() {
         synchronizedScheduler.executeProcess("manage_task:dailyReportAutoGenerateReport", 120_000, () -> {
             Date yesterday = DateUtils.addDays(new Date(), -1);

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

@@ -249,4 +249,27 @@
         ORDER BY pay_amount DESC
     </select>
 
+    <!--此处多分组一次t表，是因为查询的结果会存在误操作的记录-->
+    <select id="queryBDNewMerchants" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT t.bd_id,t.bd_name,count(t.client_id) num FROM (
+             SELECT bd_id,bd_name,client_id
+             FROM sys_client_bd
+             WHERE
+                    is_valid = 1
+             AND create_time &gt;= #{begin}
+             AND create_time &lt; #{end}
+             AND client_id IN (
+                SELECT client_id FROM sys_clients
+                WHERE is_valid = 1
+                AND approve_result = 1
+                <if test="org_id != null">
+                    AND org_id = #{org_id}
+                </if>
+              )
+              GROUP BY client_id,bd_id
+        ) t
+        GROUP BY t.bd_id
+        ORDER BY num DESC
+    </select>
+
 </mapper>

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

@@ -745,6 +745,13 @@
                 </foreach>
             </if>
             <if test="clearing_status!=null">and t.clearing_status=#{clearing_status}</if>
+            <if test="order_id!=null">
+                AND (
+                OR t.system_transaction_id = #{order_id}
+                OR o.client_order_id = #{order_id}
+                OR o.order_id = #{order_id}
+                )
+            </if>
         </where>
         ORDER BY transaction_time desc
         LIMIT #{after_limit},#{limit}

src/main/resources/au/com/royalpay/payment/manage/mappers/riskbusiness/RiskEventMapper.xml

@@ -17,6 +17,7 @@
         re.fillin_id,
         re.result_type,
         re.channel_result,
+        re.remark,
         re.temporary_close_channel,
         re.temporary_close_merchant,
         re.in_merchant_blacklist,

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

@@ -142,7 +142,7 @@
                 <if test="text_type=='all'">
                     and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
                     #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
-                    #{name_pattern} or c.contact_email=#{search_text})
+                    #{name_pattern} or c.contact_email=#{search_text} or c.address = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and c.client_moniker=#{search_text}
@@ -162,6 +162,12 @@
                 <if test="text_type=='remark'">
                     and c.remark like #{name_pattern}
                 </if>
+                <if test="text_type=='email'">
+                    and c.contact_email like #{name_pattern}
+                </if>
+                <if test="text_type=='address'">
+                    and c.address like #{name_pattern}
+                </if>
             </if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
@@ -317,7 +323,7 @@
                 <if test="text_type=='all'">
                     and (c.client_moniker=#{search_text} or c.short_name like #{name_pattern} or c.company_name like
                     #{name_pattern} or c.business_name like #{name_pattern} or c.remark like
-                    #{name_pattern} or c.contact_email=#{search_text})
+                    #{name_pattern} or c.contact_email=#{search_text} or c.address = #{search_text})
                 </if>
                 <if test="text_type=='client_moniker'">
                     and c.client_moniker=#{search_text}
@@ -337,6 +343,12 @@
                 <if test="text_type=='remark'">
                     and c.remark like #{name_pattern}
                 </if>
+                <if test="text_type=='email'">
+                    and c.contact_email like #{name_pattern}
+                </if>
+                <if test="text_type=='address'">
+                    and c.address like #{name_pattern}
+                </if>
             </if>
             <if test="org_id!=null and org_ids==null">and c.org_id=#{org_id}</if>
             <if test="org_ids!=null">and c.org_id in
@@ -675,24 +687,43 @@
 
     </select>
 
+    <!--此处多分组一次t表，是因为查询的结果会存在误操作的记录-->
     <select id="findCountByBd" resultType="com.alibaba.fastjson.JSONObject">
         SELECT *
         FROM (
-                 SELECT count(*) yesterday_count
-                 FROM sys_clients
-                 WHERE creator = #{bd_group}
-                   AND create_time &gt;= #{yesterday}
-                   AND create_time &lt; #{today}
-                   AND is_valid = 1
-             ) a,
-             (
-                 SELECT count(*) month_count
-                 FROM sys_clients
-                 WHERE creator = #{bd_group}
-                   AND create_time &gt;= #{month}
-                   AND create_time &lt; #{today}
-                   AND is_valid = 1
-             ) b
+           SELECT count(client_id) yesterday_count
+            FROM (
+                SELECT bd.client_id
+                FROM sys_client_bd AS bd
+                WHERE
+                bd.is_valid = 1
+                AND bd.bd_id = #{bd_group}
+                AND bd.create_time &gt;= #{yesterday}
+                AND bd.create_time &lt; #{today}
+                AND bd.client_id IN (
+                        SELECT client_id FROM sys_clients
+                        WHERE is_valid = 1
+                        AND approve_result = 1)
+                GROUP BY bd.client_id,bd_id
+            ) t
+        ) a,
+        (
+           SELECT count(client_id) month_count
+            FROM (
+                SELECT bd.client_id
+                FROM sys_client_bd AS bd
+                WHERE
+                bd.is_valid = 1
+              AND bd.bd_id = #{bd_group}
+                AND bd.create_time &gt;= #{month}
+                AND bd.create_time &lt; #{today}
+                AND bd.client_id IN (
+                        SELECT client_id FROM sys_clients
+                        WHERE is_valid = 1
+                        AND approve_result = 1)
+                GROUP BY bd.client_id,bd_id
+            ) t
+        ) b
     </select>
 
     <select id="findSamePhone" resultType="com.alibaba.fastjson.JSONObject">
@@ -738,4 +769,6 @@
           and client_id >= #{start}
           and client_id &lt; #{end}
     </select>
+
+
 </mapper>

src/main/ui/static/analysis/templates/audit_material.html

@@ -61,7 +61,7 @@
                             >{{item.fileProgressValue}}%</uib-progressbar>
 
                             <img class="col-xs-3 logo-width"
-                                 ng-repeat="url in (item.file)"
+                                 ng-repeat="url in (item.file) track by $index"
                                  ng-src="{{url}}">
                         </div>
                     </div>

src/main/ui/static/analysis/templates/risk_business.html

@@ -232,6 +232,7 @@
                                 <th>Email Status</th>
                                 <th>Description</th>
                                 <th>Channel Result</th>
+                                <th ng-if="('10000000010'|withRole)">Remark</th>
                                 <th>Risk Manager</th>
                                 <th>Create Time</th>
                                 <th>Operation</th>
@@ -259,6 +260,7 @@
 
                                 <td ng-bind="riskEvent.description | limitTo:20"></td>
                                 <td ng-bind="riskEvent.channel_result"></td>
+                                <td ng-if="('10000000010'|withRole)" ng-bind="riskEvent.remark"></td>
                                 <td ng-bind="riskEvent.fillin_person"></td>
                                 <td ng-bind="riskEvent.create_time"></td>
                                 <td>

src/main/ui/static/analysis/templates/risk_business_bd.html

@@ -152,7 +152,7 @@
                                     <a class="text-primary"
                                        role="button"
                                        title="Detail"
-                                       ui-sref="analysis_monitoring.risk_business.riskEvent_detail_bd({risk_id:riskEvent.risk_id})">
+                                       ui-sref="analysis_monitoring.riskEvent_detail_bd({risk_id:riskEvent.risk_id})">
                                         <i class="fa fa-search"></i> Detail
                                     </a>
                                 </td>

src/main/ui/static/dashboard/partner-dashboard.js

@@ -504,6 +504,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
             $scope.rateHistory = chartParser.parse(rateHistoryConfig, exchangeRates);
         }
     }]);
+    */
     app.controller('unSettledAmountHistoryDialogCtrl', ['$scope', '$http', '$filter','commonDialog', function ($scope, $http, $filter,commonDialog) {
         $scope.params = {isAll:true};
         $scope.settleParams = {};
@@ -559,7 +560,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
         });
         $scope.manualSettle  = function () {
             if($scope.currentSettle.locked){
-              alert("系统正好在执行清算任务,暂不能提现,请稍后再试!");
+              alert("系统在执行清算任务,暂不能提现,请稍后再试!");
               return;
             }
             $scope.settle_to = $scope.params.to_date || $scope.params.maxData;
@@ -571,7 +572,7 @@ define(['angular','decimal', 'uiRouter', 'uiBootstrap', 'angularEcharts'], funct
                 commonDialog.alert({title: 'Error', content: resp.data.message, type: 'error'});
             })
         }
-    }]);*/
+    }]);
 
     app.controller('partnerDashboardCtrl', ['$scope', '$http', '$filter', '$uibModal','$timeout', 'chartParser','clearingDetailService','commonDialog','company_info', function ($scope, $http, $filter, $uibModal,$timeout, chartParser,clearingDetailService,commonDialog,company_info) {
         $scope.company_info = company_info.data || {};

src/main/ui/static/dashboard/templates/partner_dashboard.html

@@ -1,4 +1,13 @@
+<style>
+    #manual-settle {
+        font-size: 16px;
+        color: white;
+    }
 
+    #manual-settle .active{
+
+    }
+</style>
 <!--
 <section class="content-header">
     <h1>
@@ -348,10 +357,13 @@
                 <span class="mini-stat-icon bg-light"><i class="glyphicon glyphicon-btc text-info"></i></span>
                 <div class="mini-stat-info text-right text-light f-14">
                     <span class="counter text-white" style="font-size: 24px">
-                         {{transcommon.not_settled|currency:'AUD '}} <a role="button" ng-click="toShowUnSettledDialog()" ng-if="manual_settle&&([1]|withRole)">
-                        <i class="fa fa-info-circle text-black" uib-tooltip="withdraw deposit" aria-hidden="true"></i></a>
+                         {{transcommon.not_settled|currency:'AUD '}}
                     </span>
                     UNSETTLED
+                    <br>
+                    <a role="button" id="manual-settle" ng-click="toShowUnSettledDialog()" ng-if="manual_settle&&([1]|withRole)&&(currentUser.client_moniker=='MEGP' ||currentUser.client_moniker=='PINE')">
+                        Manual Settle
+                        <i class="fa fa-info-circle text-black" uib-tooltip="withdraw deposit" aria-hidden="true"></i></a>
                 </div>
                 <p class="mb-0 m-t-20 text-light">Latest settlement: {{transcommon.latest_settle|currency:'AUD '}}
                 </p>

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

@@ -85,7 +85,7 @@ define(['angular', 'decimal', 'uiRouter', 'ngBootSwitch', 'ngFileUpload', 'uiBoo
         $scope.partner.sameAsAddress = false;
 
         $scope.partner.partner_type = $scope.partner.company_website ? 'website' : 'photo';
-        if ($scope.partner.representativeInfo) {
+        if ($scope.partner.representativeInfo.phone) {
             $scope.partner.representativeInfo.phone = $scope.partner.representativeInfo.phone.substring(1, $scope.partner.contact_phone.length);
         }
         $scope.getMerchantLocation = function () {

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

@@ -84,6 +84,8 @@
                                                     <option value="company_name">Company Name</option>
                                                     <option value="business_name">Business Name</option>
                                                     <option value="remark">Remark</option>
+                                                    <option value="email">Email</option>
+                                                    <option value="address">Address</option>
                                                 </select>
                                             </label>
                                             <div class="col-xs-8 col-sm-4">

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

@@ -83,6 +83,8 @@
                                                     <option value="company_name">Company Name</option>
                                                     <option value="business_name">Business Name</option>
                                                     <option value="remark">Remark</option>
+                                                    <option value="email">Email</option>
+                                                    <option value="address">Address</option>
                                                 </select>
                                             </label>
                                             <div class="col-xs-8 col-sm-4">

src/main/ui/static/templates/payment/v1/payment.js

@@ -236,6 +236,12 @@ $(function () {
         }
     });
 
+    function addBlurListen() {
+        $('.remark-input').on('blur', function (event) {
+            window.scrollTo(0, 0);
+        });
+    }
+
     $('#key_P').bind('touchstart', function () {
         if (window.requireRemark) {
             if (!dataCache.remark) {
@@ -436,6 +442,7 @@ $(function () {
                 }
             }
             dialog.appendTo($('body'));
+            addBlurListen();
         }
 
     }