Merge branch 'master' into zhengzai_apple_login

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -24,6 +24,10 @@ public class AdamRedisConst {
     public static final String INFO_ENTERS = INFO.concat("enters:");
     public static final String INFO_ADDRESSES = INFO.concat("addresses:");
     public static final String INFO_CERTIFICATION = INFO.concat("certification:");
+    /**
+     * 认证失败标记
+     */
+    public static final String INFO_CERTIFICATION_JUNK = INFO.concat("certification_junk:");
 
     public static final String INFO_MEMBER_SIMPLE = INFO.concat("member:simple");
     public static final String INFO_MEMBER_CATEGORY = INFO.concat("member:category:");

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -7,15 +7,20 @@ import lombok.Data;
 import java.util.List;
 
 @Data
-public class OrderDetailsVo implements Cloneable{
+public class OrderDetailsVo implements Cloneable {
     private KylinOrderTicketVo orderTicketVo;
     private String enterDescribe;
     private Integer expressStatus;
     private Long restTime;
     private Integer isCanRefund;
+
+    private Integer isShowQrCode;
+    private String showQrCodeTime;
+
     private List<KylinOrderRefundsOrderCodeVo> orderRefundsVoList;
 
     private static final OrderDetailsVo obj = new OrderDetailsVo();
+
     public static OrderDetailsVo getNew() {
         try {
             return (OrderDetailsVo) obj.clone();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performances/details.html

@@ -9,9 +9,9 @@
         <div class="col-sm-12">
             <div class="tabs-container">
                 <ul class="nav nav-tabs">
-                    <li class="active"><a data-toggle="tab" href="#tab-2" aria-expanded="false">演出详情</a>
+                    <li id="li-tab-2" class="active"><a data-toggle="tab" href="#tab-2" aria-expanded="false">演出详情</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a>
+                    <li id="li-tab-1"><a data-toggle="tab" href="#tab-1" aria-expanded="true" id="tab-nav-1"> 演出数据</a>
                     </li>
 <!--                    <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">校园分销</a>-->
 <!--                    </li>-->
@@ -19,13 +19,15 @@
 <!--                    </li>-->
 <!--                    <li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">状态管理</a>-->
 <!--                    </li>-->
-                    <li class=""><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
+                    <li id="li-tab-6"><a data-toggle="tab" href="#tab-6" aria-expanded="false" onclick="refundConfigInfo()">退款管理</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
+                    <li id="li-tab-3"><a data-toggle="tab" href="#tab-3" aria-expanded="false" onclick="memberInfo()">会员信息配置</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
+                    <li id="li-tab-4"><a data-toggle="tab" href="#tab-4" aria-expanded="false" onclick="agentInfo()">代理配置</a>
                     </li>
-                    <li class=""><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
+                    <li id="li-tab-5"><a data-toggle="tab" href="#tab-5" aria-expanded="false" onclick="damaiInfo()">大麦配置</a>
+                    </li>
+                    <li id="li-tab-7"><a data-toggle="tab" href="#tab-7" aria-expanded="false" onclick="transferInfo()">转赠配置</a>
                     </li>
                 </ul>
                 <div class="tab-content">
@@ -241,6 +243,12 @@
                                     height=800px frameborder=0></iframe>
                         </div>
                     </div>
+                    <div id="tab-7" class="tab-pane">
+                        <div class="panel-body">
+                            <iframe id="transfer_iframe" name="transfer_iframe" marginwidth=0 marginheight=0 width=100%
+                                    height=800px frameborder=0></iframe>
+                        </div>
+                    </div>
                 </div>
 
 
@@ -254,6 +262,42 @@
     const isShow = '[[${kylinPerformanceMisVo.isShow}]]';
     const auditStatus = '[[${kylinPerformanceMisVo.auditStatus}]]';
 
+    var agentFlag = [[${@permission.hasPermi('kylin:performances:agent')}]];
+    if(agentFlag=="hidden"){
+        document.getElementById("li-tab-4").style.display = "none";
+    }
+
+    var otherFlag = [[${@permission.hasPermi('kylin:performances:audit')}]];
+    if(otherFlag=="hidden"){
+        document.getElementById("li-tab-2").style.display = "none";
+        document.getElementById("tab-2").style.display = "none";
+    }
+
+    var refundFlag = [[${@permission.hasPermi('kylin:performances:refund')}]];
+    if(refundFlag=="hidden"){
+        document.getElementById("li-tab-6").style.display = "none";
+    }
+
+    var memberFlag = [[${@permission.hasPermi('kylin:performances:member')}]];
+    if(memberFlag=="hidden"){
+        document.getElementById("li-tab-3").style.display = "none";
+    }
+
+    var damaiFlag = [[${@permission.hasPermi('kylin:performances:damai')}]];
+    if(damaiFlag=="hidden"){
+        document.getElementById("li-tab-5").style.display = "none";
+    }
+
+    var dataFlag = [[${@permission.hasPermi('kylin:performances:data')}]];
+    if(dataFlag=="hidden"){
+        document.getElementById("li-tab-1").style.display = "none";
+    }
+
+    var transferFlag = [[${@permission.hasPermi('kylin:performances:transfer')}]];
+    if(transferFlag=="hidden"){
+        document.getElementById("li-tab-7").style.display = "none";
+    }
+
     if (auditStatus != 0) {
         document.getElementsByName("auditBtn")[0].style.display = "none";
     }
@@ -322,6 +366,11 @@
         document.getElementById("refundConfig_iframe").src = "../refundConfig/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
     }
 
+    //转正配置
+    function transferInfo(){
+        // document.getElementById("transfer_iframe").src = "../refundConfig/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", "");
+    }
+
     $("#tab-nav-1").bind("click", function () {
         $("#tab_iframe_1").attr("src", prefix + "/performanceStatic/" + '[[${kylinPerformanceMisVo.performancesId}]]'.replaceAll("\"", ""));
     });

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/PerformanceVoUtils.java

@@ -269,6 +269,7 @@ public class PerformanceVoUtils {
             performanceRelations.setPerformanceRelationsId(IDGenerator.nextSnowId().toString());
             performanceRelations.setCreatedAt(null);
             performanceRelations.setUpdatedAt(updatedAt);
+            performanceRelations.setMerchantId(null);
 
             performancesMapper.update(performances, new UpdateWrapper<KylinPerformances>().eq("performances_id", performances.getPerformancesId()));
             performanceStatusMapper.update(performanceStatus, new UpdateWrapper<KylinPerformanceStatus>().eq("performance_id", performances.getPerformancesId()));

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/constant/LnsRegex.java

@@ -17,7 +17,7 @@ public class LnsRegex {
         /**
          * 汉字-姓名（2～20位）
          */
-        public static final String CN_HANZI = "^[\\u4e00-\\u9fa5]{2,20}$";
+        public static final String CN_HANZI = "^[\\u4e00-\\u9fa5+\\·?\\u4e00-\\u9fa5+]{2,30}$";
         /**
          * 汉字-省|市|区（2～30位）
          */

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -149,7 +149,7 @@ public final class RedisUtil {
             }
 
             //删除Redis
-            for (Integer redisDb: hashMap.keySet()) {
+            for (Integer redisDb : hashMap.keySet()) {
                 ArrayList<String> delRedisKeyList = hashMap.get(redisDb);
                 redisConfig.getRedisTemplateByDb(redisDb).delete(delRedisKeyList);
             }
@@ -746,4 +746,22 @@ public final class RedisUtil {
     public Object getDB15RedisGet(String redisKey) {
         return redisConfig.getRedisTemplateByDb(15).opsForValue().get(redisKey);
     }
+
+
+    public boolean getDB15RedisHasKey(String redisKey, String item) {
+        return redisConfig.getRedisTemplateByDb(15).opsForSet().isMember(redisKey, item);
+    }
+
+
+    public static void main(String[] args) {
+        String[] keys = {
+                "adam:identity:mobile:18518013286"
+        };
+        for (String key : keys) {
+            long value = key.hashCode();
+            int idx = ((int) (value ^ (value >>> 32)) % 250);
+            System.out.printf("\n[%s] - idx:%s", key, idx);
+        }
+    }
+
 }

liquidnet-bus-common/liquidnet-common-sms/src/main/java/com/liquidnet/common/sms/constant/SmsEnum.java

@@ -55,6 +55,16 @@ public class SmsEnum {
          * - 您已成功购买${name}门票。可至个人中心查看订单，个人中心地址:http://t.cn/ExMlr1B。演出${time}开始。请持购票人身份证到现场取票。咨询电话:4001680650。
          */
         SMS_181500419,
+        /**
+         * 微信关注正在现场服务号通知
+         * - 模版内容:您已成功购买$(name)门票。可至个人中心查看订单http://tcn/ExMir1B。演出$(time)开始。微信关注正在现场服务号，联系我们。
+         */
+        SMS_223192705,
+        /**
+         * 微信关注正在现场服务号通知
+         * - 模版内容:您已成功购买$(name)门票。可至个人中心查看订单http://tcn/ExMir1B。演出$(time)开始。微信关注摩登天空服务号，联系我们。
+         */
+        SMS_223203737,
         ;
     }
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinCheckUserMapper.xml

@@ -22,7 +22,7 @@
         mobile
         FROM kylin_check_user
         <where>
-            merchant_id=#{merchantId} AND `status` = 1
+            `status` = 1
             <if test="mobile !=null and mobile !='' ">
                 AND `mobile` LIKE concat('%', #{mobile}, '%')
             </if>

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

@@ -136,6 +136,9 @@ public class AdamEntersController {
             if (!Pattern.matches(LnsRegex.Valid.CN_HANZI, parameter.getName())) {
                 return ResponseDto.failure(ErrorMapping.get("10103"));
             }
+            if (!Pattern.matches(LnsRegex.Valid.CN_ID_CARD_REF, parameter.getIdCard())) {
+                return ResponseDto.failure(ErrorMapping.get("10104"));
+            }
         }
         if (StringUtils.isBlank(parameter.getEntersId())) {
             return ResponseDto.failure(ErrorMapping.get("10015"));

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

@@ -231,9 +231,6 @@ public class AdamUserController {
             return ResponseDto.failure(ErrorMapping.get("10104"));
         }
         AdamRealInfoVo vo = adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
-        if (null == vo) {
-            return ResponseDto.failure(ErrorMapping.get("10000"));
-        }
         vo.setName(SensitizeUtil.chineseName(vo.getName()));
         vo.setIdCard(SensitizeUtil.custom(vo.getIdCard(), 3, 2));
         return ResponseDto.success(vo);

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

 package com.liquidnet.service.adam.service;
 
+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.IdentityUtils;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.SensitizeUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.util.NknameUtil;
 import com.liquidnet.service.adam.util.ObjectUtil;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import lombok.extern.slf4j.Slf4j;
@@ -15,7 +19,9 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -156,15 +162,81 @@ public class AdamRdmService {
         return vo;
     }
 
-    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <ID_TYPE+ID_NO, ID_NAME> */
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 认证失败的<ID_TYPE+ID_NO, ID_NAME> */
 
+    public boolean setCertificationJunk(int idType, String idNo, String idName) {
+        return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION_JUNK + idType + idNo, idName, 604800);
+    }
+
+    public boolean isCertificationJunk(int idType, String idNo, String idName) {
+        String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION_JUNK + idType + idNo);
+        return !StringUtils.isEmpty(o) && o.equals(idName);
+    }
+
+    /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | 认证成功的<ID_TYPE+ID_NO, ID_NAME> */
+
+    /**
+     * 目前只针对身份证类型三方服务认证成功的标记
+     *
+     * @param idType
+     * @param idNo
+     * @param idName
+     * @return
+     */
     public boolean setCertification(int idType, String idNo, String idName) {
         return redisUtil.set(AdamRedisConst.INFO_CERTIFICATION + idType + idNo, idName);
     }
 
-    public boolean isCertification(int idType, String idNo, String idName) {
+    /**
+     * 目前只针对身份证类型三方服务认证成功的标记
+     *
+     * @param idType
+     * @param idNo
+     * @param idName
+     * @return
+     */
+    public int isCertification(int idType, String idNo, String idName) {
         String o = (String) redisUtil.get(AdamRedisConst.INFO_CERTIFICATION + idType + idNo);
-        return !StringUtils.isEmpty(o) && o.equals(idName);
+        if (StringUtils.isEmpty(o)) {
+            return -1;
+        }
+        return o.equals(idName) ? 1 : 0;
+//        return !StringUtils.isEmpty(o) && o.equals(idName);
+    }
+
+    /**
+     * 身份证实名处理
+     *
+     * @param uid
+     * @param name
+     * @param idCard
+     */
+    public void identityHandler1(String uid, String name, String idCard) {
+        int rst = this.isCertification(1, idCard, name);
+        switch (rst) {
+            case -1:// 本地不存在
+                if (this.isCertificationJunk(1, idCard, name)) {
+                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+                }
+
+                String respStr = IdentityUtils.aliThird(name, idCard);
+                JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
+                if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
+                    log.info("###实名认证失败[{}]", respStr);
+                    this.setCertificationJunk(1, idCard, name);
+                    ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                    throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+                }
+
+                this.setCertification(1, idCard, name);
+                break;
+            case 0:// 本地存在，验证不通过
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            case 1:// 本地存在，验证通过
+                break;
+        }
     }
 
     /* - - - - - - - - - - - - - - - - - - - - - - - - - - - - - | <UID, List<AdamThirdPartInfoVo>> */

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

@@ -49,11 +49,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
 
         if (1 == parameter.getType()) {
-            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
-                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
-
-                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
-            }
+//            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+//                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
+//
+//                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+//            }
+            adamRdmService.identityHandler1(currentUid, parameter.getName(), parameter.getIdCard());
         }
 
 
@@ -134,9 +135,12 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         LocalDateTime now = LocalDateTime.now();
 
         if (1 == parameter.getType()) {
-            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
-                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
-            }
+//            if (!adamRdmService.isCertification(1, parameter.getIdCard(), parameter.getName())) {
+//                identityHandler(currentUid, parameter.getName(), parameter.getIdCard());
+//
+//                adamRdmService.setCertification(1, parameter.getIdCard(), parameter.getName());
+//            }
+            adamRdmService.identityHandler1(currentUid, parameter.getName(), parameter.getIdCard());
         }
 
         List<AdamEntersVo> vos = adamRdmService.getEntersVoByUid(currentUid);
@@ -214,14 +218,4 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         log.debug("#collect.process耗时:{}ms", System.currentTimeMillis() - s);
         return vos;
     }
-
-    private void identityHandler(String currentUid, String name, String idCard) {
-        String respStr = IdentityUtils.aliThird(name, idCard);
-        JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
-        if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
-            log.info("###实名认证失败[{}]", respStr);
-            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-        }
-    }
 }

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

@@ -321,17 +321,24 @@ public class AdamUserServiceImpl implements IAdamUserService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public AdamRealInfoVo identity(String uid, String name, String idCard) {
-        AdamRealInfoVo vo = null;
-        if (!adamRdmService.isCertification(1, idCard, name)) {
-            String respStr = IdentityUtils.aliThird(name, idCard);
-            JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
-            if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
-                log.info("###实名认证失败[{}]", respStr);
-                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
-                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
-            }
-            adamRdmService.setCertification(1, idCard, name);
-        }
+//        if (!adamRdmService.isCertification(1, idCard, name)) {
+//            if (adamRdmService.isCertificationJunk(1, idCard, name)) {
+//                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+//                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+//            }
+//
+//            String respStr = IdentityUtils.aliThird(name, idCard);
+//            JsonNode respJNode = JsonUtils.fromJson(respStr, JsonNode.class);
+//            if (null == respJNode || !"0".equals(respJNode.get("error_code").asText())) {
+//                log.info("###实名认证失败[{}]", respStr);
+//                adamRdmService.setCertificationJunk(1, idCard, name);
+//                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+//                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+//            }
+//            adamRdmService.setCertification(1, idCard, name);
+//        }
+        adamRdmService.identityHandler1(uid, name, idCard);
+
 
         AdamRealName realName = new AdamRealName();
         realName.setRealNameId(IDGenerator.nextSnowId() + "");
@@ -343,12 +350,7 @@ public class AdamUserServiceImpl implements IAdamUserService {
         realName.setCreatedAt(LocalDateTime.now());
         adamRealNameService.add(realName);
 
-        vo = AdamRealInfoVo.getNew();
-        vo.setUid(uid);
-        vo.setName(name);
-        vo.setIdCard(idCard);
-        vo.setType(realName.getType());
-        vo.setState(1);
+        AdamRealInfoVo vo = AdamRealInfoVo.getNew().copy(realName);
 
         long s = System.currentTimeMillis();
         adamRdmService.setRealInfoVoByUid(uid, vo);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -27,7 +27,7 @@
 
 10101=姓名或身份证件号无效
 10102=身份证号与姓名不符
-10103=已超出姓名长度限制
+10103=身份证姓名不合规
 10104=身份证号码不合规
 10105=入场人不存在
 10106=收获地址不存在

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-dragon/src/main/java/com/liquidnet/service/consumer/dragon/receiver/RedisRefundReceiver.java

@@ -32,7 +32,7 @@ public class RedisRefundReceiver implements StreamListener<String, MapRecord<Str
         log.info("body " + message.getValue());
         boolean result = this.consumerSqlDaoHandler(message.getValue().get("message"));
 //        if(result){
-            log.error("consumer success delete message messageId:{} ",message.getId());
+            log.info("consumer success delete message messageId:{} ",message.getId());
             try {
 //                stringRedisTemplate.multi();
                 stringRedisTemplate.opsForStream().acknowledge(DragonConstant.MysqlRedisQueueEnum.DRAGON_REFUND_GROUP.getCode(), message);

liquidnet-bus-service/liquidnet-service-consumer-all/liquidnet-service-consumer-kylin/src/main/java/com/liquidnet/service/consumer/kylin/Utils/KylinUtils.java

@@ -39,6 +39,9 @@ public class KylinUtils {
         KylinOrderTicketVo data = dataSingle;
         BeanUtils.copyProperties(data, voItem);
         List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        if(redisData==null){
+            return false;
+        }
         if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -125,8 +125,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
 //            checkOrderTime(uid);
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             currentTime = System.currentTimeMillis() - currentTime;
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return null;
                 }
@@ -162,11 +162,17 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                     LocalDateTime date = DateUtil.Formatter.yyyyMMddHHmmss.parse(ticketVo.getQrCodeShowTime());
                     if (LocalDateTime.now().isAfter(date)) {
                         orderTicketVo.setQrCode(orderTicketVo.getQrCode());
+                        vo.setIsShowQrCode(ticketVo.getIsShowCode());
+                        vo.setShowQrCodeTime(ticketVo.getQrCodeShowTime() == null ? "" : ticketVo.getQrCodeShowTime());
                     } else {
                         orderTicketVo.setQrCode("");
+                        vo.setIsShowQrCode(ticketVo.getIsShowCode());
+                        vo.setShowQrCodeTime(ticketVo.getQrCodeShowTime() == null ? "" : ticketVo.getQrCodeShowTime());
                     }
                 } else {
                     orderTicketVo.setQrCode("");
+                    vo.setIsShowQrCode(0);
+                    vo.setShowQrCodeTime("");
                 }
                 currentTime = System.currentTimeMillis() - currentTime;
 
@@ -205,7 +211,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                         break;
                     }
                     OrderRefundListVo data = OrderRefundListVo.getNew();
-                    if(item.getOrderRefundCode().length()>20) {
+                    if (item.getOrderRefundCode().length() > 20) {
                         data.setOrderRefundCode(item.getOrderRefundCode().substring(item.getOrderRefundCode().length() - 10));
                     }
                     data.setOrderRefundsId(item.getOrderRefundsId());
@@ -233,7 +239,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 }
 
                 orderTicketVo.setOrderRefundListVos(orderRefundListVos);
-                if(orderTicketVo.getOrderCode().length()>20) {
+                if (orderTicketVo.getOrderCode().length() > 20) {
                     orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
                 }
                 vo.setOrderTicketVo(orderTicketVo);
@@ -242,7 +248,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             log.info(UserPathDto.setData("订单详情", orderId, vo));
             return vo;
         } catch (Exception e) {
-            log.info("订单详情异常:",e);
+            log.info("订单详情异常:", e);
             return null;
         }
     }
@@ -280,8 +286,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
 
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return ResponseDto.failure(ErrorMapping.get("20003"));
                 }
@@ -303,7 +309,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 kylinOrderTicketEntitiesPreRefundVos.add(refundVo);
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
-            if(orderTicketVo.getOrderCode().length()>20) {
+            if (orderTicketVo.getOrderCode().length() > 20) {
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
             }
             BeanUtils.copyProperties(orderTicketVo, vo);
@@ -324,18 +330,18 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
 
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return ResponseDto.failure(ErrorMapping.get("20003"));
                 }
             }
             orderTicketVo.setFieldName(performanceVo.getFieldName());
-            if(orderTicketVo.getOrderCode().length()>20) {
+            if (orderTicketVo.getOrderCode().length() > 20) {
                 orderTicketVo.setOrderCode(orderTicketVo.getOrderCode().substring(orderTicketVo.getOrderCode().length() - 10));
             }
             KylinOrderRefundsVo kylinOrderRefundsVoBase = dataUtils.getOrderRefundVo(orderRefundId);
-            if(kylinOrderRefundsVoBase.getOrderRefundCode().length()>20) {
+            if (kylinOrderRefundsVoBase.getOrderRefundCode().length() > 20) {
                 kylinOrderRefundsVoBase.setOrderRefundCode(kylinOrderRefundsVoBase.getOrderRefundCode().substring(kylinOrderRefundsVoBase.getOrderRefundCode().length() - 10));
             }
             vo.setKylinOrderRefundsVoBaseList(kylinOrderRefundsVoBase);
@@ -354,8 +360,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             String uid = CurrentUtil.getCurrentUid();
             KylinOrderTicketVo orderTicketVo = dataUtils.getOrderTicketVo(orderId);
             List<KylinOrderRefundsVo> kylinOrderRefundsVoBaseList = dataUtils.getOrderRefundVoByOrderId(orderTicketVo.getOrderTicketsId());
-            if(uid.equals("809406") || uid.equals("773650")) {
-            }else{
+            if (uid.equals("809406") || uid.equals("773650")) {
+            } else {
                 if (!orderTicketVo.getUserId().equals(uid)) {
                     return "无权查看";
                 }
@@ -580,7 +586,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
                 entitiesTable.setIsPayment(newIsPayment);
                 entitiesTable.setUpdatedAt(time);
 
-                log.info("sqlsDataB data = "+entitiesTable.getIsPayment());
+                log.info("sqlsDataB data = " + entitiesTable.getIsPayment());
 
                 sqlsDataB.add(new Object[]{
                         entitiesTable.getIsPayment(), entitiesTable.getUpdatedAt(), item.getOrderTicketEntitiesId(), now, now

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -278,6 +278,9 @@ public class DataUtils {
         if (obj == null) {
             // 固定条件
             Query query = getCommonWhere();
+            // 排序
+            Sort sortName = Sort.by(Sort.Direction.ASC, "sellTime");
+            query.with(sortName);
 
             // 今天的
             HashMap toDayTime = DateUtil.oneDayStartEnd();
@@ -292,6 +295,9 @@ public class DataUtils {
 
             // 固定条件
             Query queryT = getCommonWhere();
+            // 排序
+            Sort sortNameT = Sort.by(Sort.Direction.ASC, "sellTime");
+            queryT.with(sortNameT);
 
             // 三天的
             Calendar cal = Calendar.getInstance();

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinOrderTicketsServiceImpl.java

@@ -857,9 +857,9 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
 
                 SmsEnum.ADTemplate adTemplate = null;
                 if (orderTicketData.getGetTicketType().equals("express")) {
-                    adTemplate = SmsEnum.ADTemplate.SMS_181490473;
+                    adTemplate = SmsEnum.ADTemplate.SMS_223203737;
                 } else if (orderTicketData.getGetTicketType().equals("electronic")) {
-                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_171358560 : SmsEnum.ADTemplate.SMS_181500419;
+                    adTemplate = ticketData.getIsShowCode() == 1 ? SmsEnum.ADTemplate.SMS_223203737 : SmsEnum.ADTemplate.SMS_223203737;
                 }
 
                 if (null != adTemplate) {
@@ -909,7 +909,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
     public boolean checkAgent(String agentId, KylinTicketVo ticketData) {
         boolean isAgent = ticketData.getIsAgent() == 1;
         if (isAgent) {
-            return redisUtil.sHasKey(KylinRedisConst.AGENT, agentId);
+            return redisUtil.getDB15RedisHasKey(KylinRedisConst.AGENT, agentId);
         } else {
             return true;
         }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/partner/KylinCheckUserPerformancesPartnerController.java

@@ -57,9 +57,9 @@ public class KylinCheckUserPerformancesPartnerController {
     public ResponseDto<PageInfo<ChildPerformanceDao>> childPerformanceList(@RequestParam("merchantId") @NotNull(message = "商户ID不能为空") String merchantId,
                                                                            @RequestParam("checkUserId") @NotNull(message = "验票用户ID不能为空") String checkUserId,
                                                                            @RequestParam("page") @NotNull(message = "页数不能为空") @Min(1) int page,
-                                                                           @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1)int size,
+                                                                           @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1) int size,
                                                                            @RequestParam("name") String name) {
-        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size,name);
+        return userPerformancesPartnerService.childPerformanceList(merchantId, checkUserId, page, size, name);
     }
 
     @GetMapping(value = "unRelation")
@@ -70,6 +70,6 @@ public class KylinCheckUserPerformancesPartnerController {
                                                                              @RequestParam("page") @NotNull(message = "页数不能为空") @Min(1) int page,
                                                                              @RequestParam("size") @NotNull(message = "数量不能为空") @Min(1) int size,
                                                                              @RequestParam("name") String name) {
-        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size,name);
+        return userPerformancesPartnerService.unChildPerformanceList(merchantId, checkUserId, page, size, name);
     }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinCheckUserPartnerServiceImpl.java

@@ -57,6 +57,9 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
         try {
             PageHelper.startPage(page, size);
             List<ChildListDao> data = checkUserMapper.childSimpleList(merchantId, mobile);
+            for (ChildListDao item : data) {
+                item.setMobile(item.getMobile().substring(0, 3) + "****" + item.getMobile().substring(7));
+            }
             pageInfo = new PageInfo(data);
             return pageInfo;
         } catch (Exception e) {
@@ -86,8 +89,8 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     public ResponseDto<String> create(String merchantId, String name, String pwd, String mobile) {
         try {
 
-            int count = checkUserMapper.selectCount(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile,mobile).eq(KylinCheckUser::getStatus,1));
-            if(count>0){
+            int count = checkUserMapper.selectCount(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile, mobile).eq(KylinCheckUser::getStatus, 1));
+            if (count > 0) {
                 return ResponseDto.failure("手机号已存在");
             }
 
@@ -114,8 +117,8 @@ public class KylinCheckUserPartnerServiceImpl extends ServiceImpl<KylinCheckUser
     @Override
     public ResponseDto<String> change(String merchantId, String checkUserId, String name, String pwd, String mobile) {
         try {
-            KylinCheckUser kylinCheckUser = checkUserMapper.selectOne(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile,mobile).eq(KylinCheckUser::getStatus,1));
-            if(kylinCheckUser!=null && !kylinCheckUser.getCheckUserId().equals(checkUserId)){
+            KylinCheckUser kylinCheckUser = checkUserMapper.selectOne(Wrappers.lambdaQuery(KylinCheckUser.class).eq(KylinCheckUser::getMobile, mobile).eq(KylinCheckUser::getStatus, 1));
+            if (kylinCheckUser != null && !kylinCheckUser.getCheckUserId().equals(checkUserId)) {
                 return ResponseDto.failure("手机号已存在");
             }
 

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/partner/KylinPerformancesPartnerServiceImpl.java

@@ -112,10 +112,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             PerformancePartnerVo createParam = mongoTemplate.findOne(Query.query(Criteria.where("performancesId").is(step1Param.getPerformancesId())), PerformancePartnerVo.class, PerformancePartnerVo.class.getSimpleName());
             if (createParam == null) {
                 result = createStep1(step1Param);
-                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"createStep1", step1Param,result));
+                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "createStep1", step1Param, result));
             } else {// 修改
                 result = updateStep1(step1Param);
-                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(),"updateStep1", step1Param,result));
+                log.info(UserPathDto.setPartnerData(step1Param.getMerchantId(), "updateStep1", step1Param, result));
             }
         }
         return result;
@@ -219,7 +219,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         if (null != performanceStatus) {
             data.setStatus(performanceStatus.getStatus());
         }
-        log.info(UserPathDto.setPartnerData("0","getStep1", "performancesId="+performancesId,data));
+        log.info(UserPathDto.setPartnerData("0", "getStep1", "performancesId=" + performancesId, data));
         return ResponseDto.success(data);
     }
 
@@ -232,10 +232,10 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             KylinPerformanceStatus performanceStatus = performanceStatusMapper.selectOne(Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, step2Param.getPerformancesId()));
             if (performanceStatus == null || performanceStatus.getStatus() == 0 || performanceStatus.getStatus() == 4) {
                 result = createStep2(step2Param);
-                log.info(UserPathDto.setPartnerData("0","createStep2", step2Param,result));
+                log.info(UserPathDto.setPartnerData("0", "createStep2", step2Param, result));
             } else if (performanceStatus.getStatus() == 1 || performanceStatus.getStatus() == 3 || performanceStatus.getStatus() == 6 || performanceStatus.getStatus() == 7 || performanceStatus.getStatus() == 8 || performanceStatus.getStatus() == 9) {// 修改
                 result = updateStep2(step2Param);
-                log.info(UserPathDto.setPartnerData("0","updateStep2(step2Param", step2Param,result));
+                log.info(UserPathDto.setPartnerData("0", "updateStep2(step2Param", step2Param, result));
             } else if (performanceStatus.getStatus() == 10) {
                 result = ResponseDto.failure("演出已结束不可修改");
             }
@@ -384,7 +384,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     performanceStatus.setLimitCount(step2Param.getLimitCount());
                     performanceStatusMapper.update(performanceStatus, Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performanceId));
 
-                    dataUtils.setPerformanceIsTrueName(performanceId,step2Param.getIsTrueName());
+                    dataUtils.setPerformanceIsTrueName(performanceId, step2Param.getIsTrueName());
 
                     //提示：票种价格、售票时间、票种购票限制 直接生效 (演出购票限制，购票须知 演出是否实名 票种缺货登记 票种是否电子票 票种是否快递票 票种最低购买张数 票种是否显示二维码)
                     List<TicketTimesTicketCreatePartnerVo> timeList = kylinPerformanceMisVo.getTicketTimes();
@@ -477,7 +477,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
         }
 
         performanceStep2Param.setTicketTimes(ticketTimesTicketCreatePartnerVoList);
-        log.info(UserPathDto.setPartnerData("0","getStep2", "performancesId="+performancesId,performanceStep2Param));
+        log.info(UserPathDto.setPartnerData("0", "getStep2", "performancesId=" + performancesId, performanceStep2Param));
         return ResponseDto.success(performanceStep2Param);
     }
 
@@ -524,7 +524,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
             }
 //            判断状态
             performanceVoTask.performanceVoStatus(performancesId);
-            log.info(UserPathDto.setPartnerData("0","onLinePerformance", "performancesId="+performancesId,"上线成功"));
+            log.info(UserPathDto.setPartnerData("0", "onLinePerformance", "performancesId=" + performancesId, "上线成功"));
             return ResponseDto.success("上线成功");
         } catch (Exception e) {
             log.debug("上线失败", e);
@@ -546,7 +546,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         , Wrappers.lambdaQuery(KylinPerformanceStatus.class).eq(KylinPerformanceStatus::getPerformanceId, performancesId));
 
                 performanceVoTask.performanceVoStatus(performancesId);
-                log.info(UserPathDto.setPartnerData("0","outLinePerformance", "performancesId="+performancesId,"下线成功"));
+                log.info(UserPathDto.setPartnerData("0", "outLinePerformance", "performancesId=" + performancesId, "下线成功"));
                 return ResponseDto.success("下线成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20111));
@@ -585,7 +585,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                     mongoTemplate.insert(ticketItem, KylinTicketPartnerVo.class.getSimpleName());
                 }
             }
-            log.info(UserPathDto.setPartnerData("0","copyPerformance", "performancesId="+performancesId,performancePartnerVo.getPerformancesId()));
+            log.info(UserPathDto.setPartnerData("0", "copyPerformance", "performancesId=" + performancesId, performancePartnerVo.getPerformancesId()));
             return performancePartnerVo.getPerformancesId();
         } catch (Exception e) {
             e.printStackTrace();
@@ -673,7 +673,7 @@ public class KylinPerformancesPartnerServiceImpl extends ServiceImpl<KylinPerfor
                         Query.query(Criteria.where("performancesId").is(performancesId)).getQueryObject(),
                         object
                 );
-                log.info(UserPathDto.setPartnerData("0","withdraw", "performancesId="+performancesId,"撤回成功"));
+                log.info(UserPathDto.setPartnerData("0", "withdraw", "performancesId=" + performancesId, "撤回成功"));
                 return ResponseDto.success("撤回成功");
             } else {
                 return ResponseDto.failure(ErrorMapping.get(20116));