From d6223d3ae5bc36c09fd707a48225dfcef72c64c7 Mon Sep 17 00:00:00 2001
From: luoyang <yang.luo@globalfreepay.com>
Date: Mon, 1 Apr 2019 22:03:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B5=84=E6=96=99=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/appclient/beans/AppMerchantBean.java      | 12 ++++++++++++
 .../appclient/core/impls/ManageAppServiceImp.java    |  3 +--
 .../payment/manage/mappers/system/ClientMapper.xml   |  3 +++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java
index 6f7dda5d6..bb77faa37 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/beans/AppMerchantBean.java
@@ -48,6 +48,7 @@ public class AppMerchantBean {
     private boolean is_valid = false;
     private String merchant_id;
     private int status;
+    private boolean bd_upload_and_completed = false;
 
     public String getClient_moniker() {
         return StringUtils.isEmpty(client_moniker) ? null : client_moniker;
@@ -213,6 +214,9 @@ public class AppMerchantBean {
         if (merchant_id != null){
             param.put("merchant_id",merchant_id);
         }
+        if (bd_upload_and_completed) {
+            param.put("bd_upload_and_completed", true);
+        }
         return param;
     }
 
@@ -477,4 +481,12 @@ public class AppMerchantBean {
     public int getStatus() {
         return status;
     }
+
+    public boolean isBd_upload_and_completed() {
+        return bd_upload_and_completed;
+    }
+
+    public void setBd_upload_and_completed(boolean bd_upload_and_completed) {
+        this.bd_upload_and_completed = bd_upload_and_completed;
+    }
 }
diff --git a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
index 24b2f674f..502c16c48 100644
--- a/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
+++ b/src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/ManageAppServiceImp.java
@@ -140,8 +140,7 @@ public class ManageAppServiceImp implements ManageAppService {
                 query.setApproving(true);
                 break;
             case 3:
-                query.setCompleted_contract(true);
-                query.setBd_upload_material(true);
+                query.setBd_upload_and_completed(true);
                 break;
             case 4:
                 break;
diff --git a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
index e46b2703e..88781f89f 100644
--- a/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
+++ b/src/main/resources/au/com/royalpay/payment/manage/mappers/system/ClientMapper.xml
@@ -196,6 +196,9 @@
             <if test="apply_to_back">
                 AND c.approve_result = 5 AND c.approve_time is NOT NULL
             </if>
+            <if test="bd_upload_and_completed">
+                AND ((c.open_status = 3 AND c.approve_result != 5 ) OR ( and c.open_status IS NULL AND c.approve_result IS NULL AND c.source != 4))
+            </if>
             <if test="bd_upload_material">
                 AND c.open_status = 3 AND c.approve_result != 5
             </if>