Merge branch 'dev_2024102_adam' into 'master'

Dev 2024102 adam

See merge request !370

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -24,7 +24,7 @@
     <select id="getUserOrgByPerIdAndUidAndAgentMaster" resultType="java.util.Map">
         SELECT
             kotr.agent_id_master uid,
-            SUM( ( kot.price_actual - kot.price_refund )* kotr.agent_distributions_master ) totalPrice
+            SUM( ( kot.price_actual -  kot.price_express )* kotr.agent_distributions_master ) totalPrice
         FROM
             kylin_order_ticket_relations AS kotr
                 INNER JOIN kylin_order_tickets AS kot ON kot.order_tickets_id = kotr.order_id
@@ -36,7 +36,7 @@
                     kylin_order_ticket_relations AS kotr
                         LEFT JOIN kylin_order_ticket_status AS kots ON kots.order_id = kotr.order_id
                 WHERE
-                    kots.STATUS IN ( 1, 6, 3 ) )
+                    kots.STATUS IN (1) )
           AND kotr.performance_id = #{performancesId}
           AND kotr.ticket_id IN (
             SELECT

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/AdamRdmService.java

@@ -262,6 +262,12 @@ public class AdamRdmService {
      */
     public void identityHandler1(String uid, String name, String idCard) {
         int rst = this.isCertification(1, idCard, name);
+        //增加判断逻辑 用户添加的时候先去调自己的库,如果有身份证数据但和名字不匹配的时候,再请求第三方接口去验
+        if(rst==0){
+            //本地存在，验证不通过 删除标记
+            redisUtil.del(AdamRedisConst.INFO_CERTIFICATION + 1 + idCard);
+            rst=-1;
+        }
         switch (rst) {
             case -1:// 本地不存在
                 if (this.isCertificationJunk(1, idCard, name)) {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
+import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.*;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamEntersParam;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.service.AdamRdmService;