Merge remote-tracking branch 'origin/dev' into dev

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

@@ -70,5 +70,5 @@ public interface IAdamUserService extends IService<AdamUser> {
 
     void close(String uid);
 
-    void identity(String uid, String name, String idCard);
+    AdamRealInfoVo identity(String uid, String name, String idCard);
 }

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

@@ -149,17 +149,13 @@ public class AdamUserController {
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "idCard", value = "证件号"),
     })
     @PostMapping(value = {"identity"})
-    public ResponseDto<Object> identity(@RequestParam String name, @RequestParam String idCard) {
+    public ResponseDto<AdamRealInfoVo> identity(@RequestParam String name, @RequestParam String idCard) {
         // TODO: 2021/5/10
         log.info("name:{},idCard:{}", name, idCard);
 
-        AdamRealInfoVo realInfoVo = AdamRealInfoVo.getNew();
-        realInfoVo.setName(name);
-        realInfoVo.setIdCard(idCard);
-        realInfoVo.setState(1);
-        adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
+        AdamRealInfoVo infoVo = adamUserService.identity(CurrentUtil.getCurrentUid(), name, idCard);
 
-        return ResponseDto.success();
+        return ResponseDto.success(infoVo);
     }
 
 //    @ApiOperationSupport(order = 6)

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

@@ -2,13 +2,11 @@ package com.liquidnet.service.adam.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.BsonUtil;
 import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.mapper.AdamAddressesMapper;
 import com.liquidnet.service.adam.service.IAdamAddressesService;
-import com.liquidnet.service.base.SqlMapping;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
@@ -135,7 +133,7 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
 //                    SqlMapping.get("adam_enters.update.is_default", paramList.toArray()));
             linkedList.add(paramList.toArray());
 
-            redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
+            redisUtil.hset(AdamRedisConst.INFO_ADDRESSES.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
         }
 //        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
 //                SqlMapping.get("adam_addresses.update.is_default", linkedList));
@@ -167,7 +165,7 @@ public class AdamAddressesServiceImpl extends ServiceImpl<AdamAddressesMapper, A
 //                        SqlMapping.get("adam_addresses.update.is_default", paramList.toArray()));
 
                 AdamAddresses addresses = BsonUtil.toBean(doc, AdamAddresses.class);
-                redisUtil.hset(AdamRedisConst.INFO_ENTERS.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
+                redisUtil.hset(AdamRedisConst.INFO_ADDRESSES.concat(addresses.getUid()), addresses.getAddressesId(), addresses);
             }
         }
 

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

@@ -284,7 +284,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void identity(String uid, String name, String idCard) {
+    public AdamRealInfoVo identity(String uid, String name, String idCard) {
         // TODO: 2021/5/18 调用第三方认证服务
 
         AdamRealName realName = new AdamRealName();
@@ -295,11 +295,18 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         realName.setIdCard(idCard);
         realName.setState(1);
         realName.setCreatedAt(LocalDateTime.now());
-//        adamRealNameService.add(realName);
+        adamRealNameService.add(realName);
 
-        AdamRealInfoVo aNew = AdamRealInfoVo.getNew();
+        AdamRealInfoVo realInfoVo = AdamRealInfoVo.getNew();
+        realInfoVo.setName(StringUtils.rightPad(StringUtils.left(name, 1), name.length(), "*"));
+        realInfoVo.setIdCard(StringUtils.rightPad(StringUtils.left(idCard, 3), idCard.length(), "*").concat(StringUtils.right(idCard, 2)));
+        realInfoVo.setState(1);
+
+        redisUtil.hset(AdamRedisConst.INFO_REAL_NAME, uid, realInfoVo);
 
         // TODO: 2021/5/18 修改UserInfoVo，同步redis
 
+
+        return realInfoVo;
     }
 }

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

@@ -6,7 +6,6 @@ import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dto.vo.PerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.TicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.TicketVo;
-import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
 import com.liquidnet.service.kylin.entity.KylinPerformances;
 import com.liquidnet.service.kylin.mapper.KylinPerformancesMapper;
 import com.liquidnet.service.kylin.service.IKylinPerformancesService;
@@ -24,10 +23,7 @@ import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 import java.util.regex.Pattern;
 
 /**
@@ -283,4 +279,33 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return ticketTimesList;
     }
 
+    public HashMap<String, Object> userList(List performancesIds, int page, int size) {
+        HashMap<String, Object> info = new HashMap<>();
+
+        // 排序 分页
+        Sort sortName = Sort.by(Sort.Direction.ASC, "timeStart");
+
+        Pageable pageable = PageRequest.of(page - 1, size, sortName);
+
+        //条件
+        Document queryObject = new Document();
+
+        Query query = new Query();
+        query.addCriteria(Criteria.where("performancesId").in(performancesIds));
+
+        // 查询总数
+        long count = mongoTemplate.count(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+        query.getQueryObject();
+
+        query.with(pageable);
+
+        List<PerformanceVo> list = mongoTemplate.find(query, PerformanceVo.class, PerformanceVo.class.getSimpleName());
+
+        // 组合数据
+        info.put("total", count);
+        info.put("list", list);
+
+        return info;
+    }
+
 }