add 商户端新增kyc相关接口

src/main/java/au/com/royalpay/payment/manage/apsKYC/domain/entity/ApsNoticeClient.java

@@ -1,7 +1,6 @@
 package au.com.royalpay.payment.manage.apsKYC.domain.entity;
 
 
-import com.alibaba.fastjson.annotation.JSONField;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -35,6 +34,11 @@ public class ApsNoticeClient {
      */
     private String partnerCode;
 
+    /**
+     * 用户id
+     */
+    private String userId;
+
     /**
      * 用户第一次阅读时间
      */

src/main/java/au/com/royalpay/payment/manage/mappers/apskyc/ApsNoticeClientMapper.java

@@ -17,7 +17,7 @@ public interface ApsNoticeClientMapper {
     @AutoSql(SqlType.INSERT)
     void saveApsNoticeClient(ApsNoticeClient apsNoticeClient);
 
-    @AutoSql(SqlType.UPDATE)
+
     void updateApsNoticeClient(ApsNoticeClient apsNoticeClient);
 
     PageList<JSONObject> getApsNoticeClients(String id, PageBounds pageBounds);
@@ -26,4 +26,9 @@ public interface ApsNoticeClientMapper {
 
     @AutoSql(SqlType.SELECT)
     ApsNoticeClient getApsNoticeClientById(String id);
+
+    JSONObject getApsKycClient(@Param("client_moniker")String clientMoniker);
+
+    @AutoSql(SqlType.UPDATE)
+    void toUpdateApsKycClient(JSONObject updateReadTime);
 }

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

@@ -393,6 +393,7 @@ public interface ClientManager {
     void getAggregateAgreeFile(String clientMoniker, JSONObject manager, boolean renewal) throws Exception;
 
     void getAggregateCardAgreeFile(String clientMoniker, JSONObject manager, boolean renewal) throws Exception;
+
     //重新制作卡支付合同
     void getAggregateCardAgreeFileAgain(String clientMoniker, JSONObject manager) throws Exception;
 
@@ -613,4 +614,7 @@ public interface ClientManager {
 
     String queryAlipayPlusOfflineStatus(String clientMoniker, JSONObject manager);
 
+    JSONObject getApsKycClient(JSONObject account, String clientMoniker);
+
+    void updateApsKycClient(JSONObject account, JSONObject item);
 }

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

@@ -32,7 +32,6 @@ import au.com.royalpay.payment.core.beans.MerchantApplicationResult;
 import au.com.royalpay.payment.core.exceptions.EmailException;
 import au.com.royalpay.payment.core.exceptions.InvalidShortIdException;
 import au.com.royalpay.payment.core.impls.MerchantChannelApplicationManager;
-import au.com.royalpay.payment.core.impls.MerchantChannelPermissionManager;
 import au.com.royalpay.payment.core.mappers.SysClientMapper;
 import au.com.royalpay.payment.core.utils.OrderExpiryRuleResolver;
 import au.com.royalpay.payment.manage.analysis.mappers.TransactionAnalysisMapper;
@@ -47,9 +46,8 @@ import au.com.royalpay.payment.manage.device.core.DeviceManager;
 import au.com.royalpay.payment.manage.gateway.core.GatewayMerchantApply;
 import au.com.royalpay.payment.manage.kyc.enums.FilesAuthEnum;
 import au.com.royalpay.payment.manage.management.sysconfig.core.impls.PermissionPartnerManagerImpl;
+import au.com.royalpay.payment.manage.mappers.apskyc.ApsNoticeClientMapper;
 import au.com.royalpay.payment.manage.mappers.financial.FinancialBDConfigMapper;
-import au.com.royalpay.payment.manage.mappers.log.ClearingDetailMapper;
-import au.com.royalpay.payment.manage.mappers.log.ClearingLogMapper;
 import au.com.royalpay.payment.manage.mappers.log.ClientsOperationLogMapper;
 import au.com.royalpay.payment.manage.mappers.log.LogClientSubMerchantIdMapper;
 import au.com.royalpay.payment.manage.mappers.payment.CommonSubMerchantIdMapper;
@@ -328,6 +326,8 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
     private PaymentApi paymentApi;
     @Resource
     private ApsConfigService apsConfigService;
+    @Resource
+    private ApsNoticeClientMapper apsNoticeClientMapper;
 
     DateTimeFormatter formatter = DateTimeFormat.forPattern("dd MMM yyyy");
 
@@ -7160,6 +7160,21 @@ public class ClientManagerImpl implements ClientManager, ManagerTodoNoticeProvid
         return null;
     }
 
+    @Override
+    public JSONObject getApsKycClient(JSONObject account, String clientMoniker) {
+        return apsNoticeClientMapper.getApsKycClient(clientMoniker);
+    }
+
+    @Override
+    public void updateApsKycClient(JSONObject account, JSONObject item) {
+        if (item.getIntValue("status") == 1) {
+            item.put("read_time", new Date());
+        }
+        item.put("status_time", new Date());
+        item.put("user_id", account.getString("account_id"));
+        apsNoticeClientMapper.toUpdateApsKycClient(item);
+    }
+
     private void exportLetterOfferPDF(String clientMoniker, JSONObject manage) {
         JSONObject info = convertClientLetterOfferInfo(clientMoniker);
         String pdfPath = this.getClass().getClassLoader().getResource("").getPath() + "/templates/pdf/letter_of_offer.pdf";

src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerViewController.java

@@ -636,6 +636,7 @@ public class PartnerViewController {
 
     /**
      * 获取商户所有增值服务
+     *
      * @param clientMoniker
      * @return
      */
@@ -647,6 +648,7 @@ public class PartnerViewController {
 
     /**
      * 获取商户增值服务详情
+     *
      * @param clientMoniker
      * @param channel
      * @return
@@ -663,4 +665,15 @@ public class PartnerViewController {
         return clientManager.getClientIncrementalServiceLoginToken(account, sourceCode);
     }
 
+    @PartnerMapping(value = "/{clientMoniker}/aps_kyc", method = RequestMethod.GET, roles = {PartnerRole.ADMIN, PartnerRole.MANAGER})
+    @ResponseBody
+    public JSONObject getApsKycClient(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @PathVariable("clientMoniker") String clientMoniker) {
+        return clientManager.getApsKycClient(account, clientMoniker);
+    }
+
+    @PartnerMapping(value = "/aps_kyc", method = RequestMethod.PUT, roles = {PartnerRole.ADMIN, PartnerRole.MANAGER})
+    @ResponseBody
+    public void updateApsKycClient(@ModelAttribute(CommonConsts.PARTNER_STATUS) JSONObject account, @RequestBody JSONObject item) {
+        clientManager.updateApsKycClient(account, item);
+    }
 }

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

@@ -15,5 +15,17 @@
         FROM sys_aps_notice_clients
         where notice_id = #{id}
     </select>
+    <select id="getApsKycClient" resultType="com.alibaba.fastjson.JSONObject">
+        SELECT c.*,
+               n.title,
+               n.content
+        FROM sys_aps_notice_clients c
+                 INNER JOIN sys_aps_notice n ON n.id = c.notice_id
+        WHERE c.partner_code = #{client_moniker}
+          AND n.`status` = 0
+          AND c.`status` IN (0, 1)
+          AND c.is_valid = 0
+          AND c.handle = 0
+    </select>
 
 </mapper>