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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/dto/vo/AdamMemberOrderSimpleVo.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
 
 @ApiModel(value = "AdamMemberOrderSimpleVo", description = "会员订单列表信息")
 @Data
-public class AdamMemberOrderSimpleVo implements Serializable {
+public class AdamMemberOrderSimpleVo implements Serializable, Cloneable {
     private static final long serialVersionUID = 3978877550469933116L;
     @ApiModelProperty(position = 10, value = "订单号")
     private String orderNo;
@@ -29,4 +29,26 @@ public class AdamMemberOrderSimpleVo implements Serializable {
     private BigDecimal price;
     @ApiModelProperty(position = 17, value = "实付价格")
     private BigDecimal pricePaid;
+
+    private static final AdamMemberOrderSimpleVo obj = new AdamMemberOrderSimpleVo();
+
+    public static AdamMemberOrderSimpleVo getNew() {
+        try {
+            return (AdamMemberOrderSimpleVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new AdamMemberOrderSimpleVo();
+        }
+    }
+
+    public AdamMemberOrderSimpleVo copy(AdamMemberOrderVo source) {
+        if (null == source) return this;
+        this.setOrderNo(source.getOrderNo());
+        this.setState(source.getState());
+        this.setCreatedAt(source.getCreatedAt());
+        this.setMemberName(source.getMemberName());
+        this.setMode(source.getMode());
+        this.setPrice(source.getPrice());
+        this.setPricePaid(source.getPricePaid());
+        return this;
+    }
 }

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

@@ -229,22 +229,22 @@ public class DataUtils {
 
         KylinPerformanceVo vo = getPerformanceVo(performanceId);
         int isTrueName = vo.getIsTrueName();
-        String useTime = "";
-        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
-        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
-            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
-            ArrayList<String> ticketList = new ArrayList<>();
-            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
-                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
-                if (ticketItem.getType() == 1) {
-                    ticketList.add(ticketItem.getTicketsId());
-                }
-                if (ticketItem.getTicketsId().equals(ticketId)) {
-                    useTime = ticketItem.getUseStart();
-                }
-            }
-            allTicketId.put(timeItem.getUseStart(), ticketList);
-        }
+//        String useTime = "";
+//        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
+//        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+//            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
+//            ArrayList<String> ticketList = new ArrayList<>();
+//            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+//                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+//                if (ticketItem.getType() == 1) {
+//                    ticketList.add(ticketItem.getTicketsId());
+//                }
+//                if (ticketItem.getTicketsId().equals(ticketId)) {
+//                    useTime = ticketItem.getUseStart();
+//                }
+//            }
+//            allTicketId.put(timeItem.getUseStart(), ticketList);
+//        }
 
         if (0 == isTrueName) {
             redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
@@ -254,8 +254,8 @@ public class DataUtils {
 
         String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
         String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
-        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
-        redisUtil.set(ticketUseTimeKey, useTime);
+//        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
+//        redisUtil.set(ticketUseTimeKey, useTime);
 
         if (buyCount > 0) {
             redisUtil.incr(ticketIdKey, buyCount);

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

@@ -196,6 +196,15 @@ public class AdamRdmService {
         return thirdPartInfoVos;
     }
 
+    public boolean addThirdPartVoListByUid(String uid, List<AdamThirdPartInfoVo> vos, AdamThirdPartInfoVo vo) {
+        if (CollectionUtils.isEmpty(vos)) {
+            vos = Collections.singletonList(vo);
+        } else {
+            vos.add(vo);
+        }
+        return redisUtil.set(AdamRedisConst.INFO_THIRD_PARTY + uid, vos);
+    }
+
     public AdamThirdPartInfoVo getThirdPartVoByUidPlatform(String uid, String platform) {
         List<AdamThirdPartInfoVo> vos = this.getThirdPartVoListByUid(uid);
         if (!CollectionUtils.isEmpty(vos)) {

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

@@ -22,12 +22,14 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -497,6 +499,19 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
 //        }
 //        return pagedResult;
         // TODO: 2021/7/29 会员订单列表查取
-        return ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
+        PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
+        ArrayList<AdamMemberOrderVo> orderVos = adamRdmService.getMemberOrderVosByUid(uid);
+        if (!CollectionUtils.isEmpty(orderVos)) {
+            ArrayList<AdamMemberOrderSimpleVo> vos = ObjectUtil.getAdamMemberOrderSimpleVoArrayList();
+
+            orderVos.forEach(r -> {
+                vos.add(AdamMemberOrderSimpleVo.getNew().copy(r));
+            });
+
+            pagedResult.setTotal(orderVos.size(), 20);
+            pagedResult.setList(vos);
+        }
+
+        return pagedResult;
     }
 }

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

@@ -4,11 +4,11 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.base.PagedResult;
 
 import java.util.ArrayList;
-import java.util.List;
 
 public class ObjectUtil {
     private static final ArrayList<AdamTagParentVo> adamTagParentVoArrayList = new ArrayList<>();
     private static final ArrayList<AdamTagVo> adamTagVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoArrayList = new ArrayList<>();
 
     private static final PagedResult<AdamCollectVo> adamCollectVoPagedResult = new PagedResult<>();
     private static final PagedResult<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoPagedResult = new PagedResult<>();
@@ -23,6 +23,10 @@ public class ObjectUtil {
         return (ArrayList<AdamTagVo>) adamTagVoArrayList.clone();
     }
 
+    public static ArrayList<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoArrayList() {
+        return (ArrayList<AdamMemberOrderSimpleVo>) adamMemberOrderSimpleVoArrayList.clone();
+    }
+
     public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
         return adamCollectVoPagedResult.clone();
     }

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

@@ -89,22 +89,22 @@ public class KylinUtils {
         String redisKey;
         KylinPerformanceVo vo = getPerformanceVo(performanceId);
         int isTrueName = vo.getIsTrueName();
-        String useTime = "";
-        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
-        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
-            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
-            ArrayList<String> ticketList = new ArrayList<>();
-            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
-                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
-                if (ticketItem.getType() == 1) {
-                    ticketList.add(ticketItem.getTicketsId());
-                }
-                if (ticketItem.getTicketsId().equals(ticketId)) {
-                    useTime = ticketItem.getUseStart();
-                }
-            }
-            allTicketId.put(timeItem.getUseStart(), ticketList);
-        }
+//        String useTime = "";
+//        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
+//        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+//            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
+//            ArrayList<String> ticketList = new ArrayList<>();
+//            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+//                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+//                if (ticketItem.getType() == 1) {
+//                    ticketList.add(ticketItem.getTicketsId());
+//                }
+//                if (ticketItem.getTicketsId().equals(ticketId)) {
+//                    useTime = ticketItem.getUseStart();
+//                }
+//            }
+//            allTicketId.put(timeItem.getUseStart(), ticketList);
+//        }
 
         if (0 == isTrueName) {
             redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
@@ -114,8 +114,8 @@ public class KylinUtils {
 
         String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
         String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
-        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
-        redisUtil.set(ticketUseTimeKey, useTime);
+//        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
+//        redisUtil.set(ticketUseTimeKey, useTime);
 
         if (buyCount > 0) {
             redisUtil.incr(ticketIdKey, buyCount);

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -58,7 +58,8 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
 
     @Override
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
-
+        long startTimeTotal = System.currentTimeMillis();
+        long startTime = System.currentTimeMillis();
         try {
             //构造请求参数
             SortedMap<String, Object> commonParams = this.buildRequestParamMap(dragonPayBaseReqDto);
@@ -73,9 +74,12 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
 
             log.info("dragonPay:wepay:"+dragonPayBaseReqDto.getDeviceFrom()+" request jsondata: {} ",data);
 
+
             HttpPost httpost = new HttpPost(this.getRequestUrl());
             httpost.setEntity(new StringEntity(data, "UTF-8"));
+            startTime = System.currentTimeMillis();
             CloseableHttpResponse response = PayWepayUtils.getInstance().getHttpClient().execute(httpost);
+            log.info("wepay-->request--> 耗时:{}",(System.currentTimeMillis() - startTime)+"毫秒");
             HttpEntity entity = response.getEntity();
             //接受到返回信息
             String xmlStr = EntityUtils.toString(response.getEntity(), "UTF-8");
@@ -98,6 +102,7 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
 
                     //支付订单持久化
                     dragonServiceCommonBiz.buildPayOrders(dragonPayBaseReqDto,respPayDto);
+                    log.info("wepay-->dragonPay--> 耗时:{}",(System.currentTimeMillis() - startTimeTotal)+"毫秒");
                     return ResponseDto.success(respPayDto);
                 }else{
                     throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_PARAM_ERROR.getCode(),DragonErrorCodeEnum.TRADE_PARAM_ERROR.getMessage());

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -27,7 +27,7 @@ kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_pay
 
 # ------------------------用户发起订单退款----------------------------
 kylin_order_ticket_status.refund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
-kylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
+wkylin_order_ticket_entities.refund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ? or updated_at is null)
 kylin_order_refund.refund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.refund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)
 kylin_order_refund_pic.refund=INSERT INTO kylin_order_refund_pic (refund_pic_id,order_refunds_id,pic_url,created_at) VALUES (?,?,?,?)

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

@@ -104,22 +104,22 @@ public class DataUtils {
 
         KylinPerformanceVo vo = getPerformanceVo(performanceId);
         int isTrueName = vo.getIsTrueName();
-        String useTime = "";
-        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
-        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
-            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
-            ArrayList<String> ticketList = ObjectUtil.cloneArrayListString();
-            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
-                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
-                if (ticketItem.getType() == 1) {
-                    ticketList.add(ticketItem.getTicketsId());
-                }
-                if (ticketItem.getTicketsId().equals(ticketId)) {
-                    useTime = ticketItem.getUseStart();
-                }
-            }
-            allTicketId.put(timeItem.getUseStart(), ticketList);
-        }
+//        String useTime = "";
+//        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
+//        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+//            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
+//            ArrayList<String> ticketList = ObjectUtil.cloneArrayListString();
+//            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+//                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+//                if (ticketItem.getType() == 1) {
+//                    ticketList.add(ticketItem.getTicketsId());
+//                }
+//                if (ticketItem.getTicketsId().equals(ticketId)) {
+//                    useTime = ticketItem.getUseStart();
+//                }
+//            }
+//            allTicketId.put(timeItem.getUseStart(), ticketList);
+//        }
 
         if (0 == isTrueName) {
             redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
@@ -129,8 +129,8 @@ public class DataUtils {
 
         String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
         String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
-        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
-        redisUtil.set(ticketUseTimeKey, useTime);
+//        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
+//        redisUtil.set(ticketUseTimeKey, useTime);
 
         if (buyCount > 0) {
             redisUtil.incr(ticketIdKey, buyCount);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/DataMigrationProcessorService.java

@@ -2,7 +2,6 @@ package com.liquidnet.service.platform.service.impl.adam.dm;
 
 import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,8 +29,8 @@ public abstract class DataMigrationProcessorService {
 //    public static final String DB_PWD = "zhengzai!mYT";
 //    public static final String DB_NAME_PASSPORT = "devpassport";
 
-    @Autowired
-    public MongoTemplate mongoTemplate;
+//    @Autowired
+//    public MongoTemplate mongoTemplate;
     @Autowired
     public DMRdmService dmRdmService;
     @Autowired

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMAddressesProcessor.java

@@ -31,10 +31,10 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
     public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
-            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from addresses where created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from addresses where created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt));
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }
@@ -92,10 +92,13 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 
                         addressesList.add(addresses);
                         vos.add(vo);
+
+                        dmRdmService.addAddressesVoByUid(uid, dmRdmService.getAddressesVoByUid(uid), vo);
                     }
+
                     if (addressesList.size() == 500 || (addressesList.size() > 0 && smFlg)) {
                         tl += addressesList.size();
-                        mongoTemplate.insert(vos, AdamAddressesVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamAddressesVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmAddressesService.saveBatch(addressesList));
                         vos.clear();
                         addressesList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMCollectionProcessor.java

@@ -32,10 +32,10 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.collection:{}", userMapper.executeForDM("adam_collection"));
 
-            log.info("DM.flush.AdamCollectVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamCollectBaseVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamCollectVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamCollectBaseVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from user_collections where type='TICKET' and status=1 and content_id>=5722 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from user_collections where type='TICKET' and status=1 and content_id>=5722 and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt));
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }
@@ -89,7 +89,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
                     }
                     if (collectionList.size() == 500 || (collectionList.size() > 0 && smFlg)) {
                         tl += collectionList.size();
-                        mongoTemplate.insert(vos, AdamCollectBaseVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamCollectBaseVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmCollectionService.saveBatch(collectionList));
                         vos.clear();
                         collectionList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMEntersProcessor.java

@@ -32,11 +32,11 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
-            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from (\n" +
-                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()\n" +
+                "                  select row_number() over (partition by user_id,type,idcode,name order by updated_at desc) rn,e.* from enters e where e.is_certification = 'yes' and e.deleted_at is null and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) + "\n" +
                 "                  ) tk where tk.rn=1 ";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
@@ -98,10 +98,11 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                         if (enters.getType() == 1) {
                             dmRdmService.setCertification(1, enters.getIdCard(), enters.getName());
                         }
+                        dmRdmService.addEntersVoByUid(uid, dmRdmService.getEntersVoByUid(uid), vo);
                     }
                     if (entersList.size() == 500 || (entersList.size() > 0 && smFlg)) {
                         tl += entersList.size();
-                        mongoTemplate.insert(vos, AdamEntersVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamEntersVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmEntersService.saveBatch(entersList));
                         vos.clear();
                         entersList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberCodeProcessor.java

@@ -186,7 +186,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_code:{}", userMapper.executeForDM("adam_member_code"));
 
-            log.info("DM.flush.AdamMemberCodeVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberCodeVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamMemberCodeVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberCodeVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from vip_card_codes where buy_order_id <> use_order_id or status=0";
@@ -253,7 +253,7 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
 //                }
                     if (memberCodeList.size() == 500) {
                         tl += memberCodeList.size();
-                        mongoTemplate.insert(vos, AdamMemberCodeVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamMemberCodeVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmMemberCodeService.saveBatch(memberCodeList));
                         vos.clear();
                         memberCodeList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMMemberOrderProcessor.java

@@ -56,10 +56,10 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order"));
 
-            log.info("DM.flush.AdamMemberOrderVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberOrderVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamMemberOrderVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberOrderVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from user_vip_card_orders where status in (1,5) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from user_vip_card_orders where status in (1,5) and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt));
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }
@@ -129,10 +129,12 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
 
                         memberOrderList.add(memberOrder);
                         vos.add(vo);
+
+                        dmRdmService.addMemberOrderVoByUid(uid, dmRdmService.getMemberOrderVosByUid(uid), vo);
                     }
                     if (memberOrderList.size() == 500 || (memberOrderList.size() > 0 && smFlg)) {
                         tl += memberOrderList.size();
-                        mongoTemplate.insert(vos, AdamMemberOrderVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamMemberOrderVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmMemberOrderService.saveBatch(memberOrderList));
                         vos.clear();
                         memberOrderList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMRealNameProcessor.java

@@ -32,10 +32,10 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
 
-            log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from user_real_name where id not in (9145,7456,7448,7197,7194,4137,4138,4139,269,261,262,263,264,265,266,267,251) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from user_real_name where id not in (9145,7456,7448,7197,7194,4137,4138,4139,269,261,262,263,264,265,266,267,251) and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt));
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }
@@ -96,11 +96,12 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         realNameList.add(realName);
                         vos.add(vo);
 
+                        dmRdmService.setRealInfoVoByUid(uid, vo);
                         dmRdmService.setCertification(1, realName.getIdCard(), realName.getName());
                     }
                     if (realNameList.size() == 500 || (realNameList.size() > 0 && smFlg)) {
                         tl += realNameList.size();
-                        mongoTemplate.insert(vos, AdamRealInfoVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamRealInfoVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmRealNameService.saveBatch(realNameList));
                         vos.clear();
                         realNameList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMThirdPartsProcessor.java

@@ -34,11 +34,11 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
 
-            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from (\n" +
-                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()\n" +
+                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt)) + "\n" +
                 "                     ) t where t.rn=1";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
@@ -106,10 +106,11 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         vos.add(vo);
 
                         dmRdmService.setUidByPlatformOpenId(thirdParty.getPlatform(), thirdParty.getOpenId(), uid);
+                        dmRdmService.addThirdPartVoListByUid(uid, dmRdmService.getThirdPartVoListByUid(uid), vo);
                     }
                     if (thirdPartyList.size() == 500 || (thirdPartyList.size() > 0 && smFlg)) {
                         tl += thirdPartyList.size();
-                        mongoTemplate.insert(vos, AdamThirdPartInfoVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamThirdPartInfoVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmThirdPartyService.saveBatch(thirdPartyList));
                         vos.clear();
                         thirdPartyList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMTracesInfoProcessor.java

@@ -39,8 +39,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));
 
-            log.info("DM.flush.AdamMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberVo.class.getSimpleName()).getDeletedCount());
-            log.info("DM.flush.AdamMemberPriceVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberPriceVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamMemberPriceVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberPriceVo.class.getSimpleName()).getDeletedCount());
         }
         this.memberCardInfoHandler();
         this.memberCardPriceHandler();
@@ -90,7 +90,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             dmRdmService.setMemberVoByMemberId(vo.getMemberId(), vo);
 
             memberMapper.insert(o);
-            mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
+//            mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
 
             log.info("DM.execute ----------------------------> end");
 
@@ -147,7 +147,7 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
             dmRdmService.setMemberPriceVoByMemberId(vo.getMemberId(), Collections.singletonList(vo));
 
             memberPriceMapper.insert(o);
-            mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());
+//            mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());
 
             log.info("DM.execute ----------------------------> end");
 
@@ -214,8 +214,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
     }
 
     private void setRdsCache() {
-        dmRdmService.setSwitch(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, 612543);
-        log.info("switch {}:{}", AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, dmRdmService.getSwitch(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS));
+//        dmRdmService.setSwitch(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, 612543);
+//        log.info("switch {}:{}", AdamRedisConst.SWITCH_GRAY_LOGIN_SMS, dmRdmService.getSwitch(AdamRedisConst.SWITCH_GRAY_LOGIN_SMS));
         List<String> nknameList = dmRdmService.getNknameList();
         log.info("init loader nknameList.size:{}", nknameList.size());
     }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserInformationProcessor.java

@@ -52,11 +52,11 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
 
-            log.info("DM.flush.AdamUserInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserInfoVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamUserInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
 //        String sqlCount = "select count(1) from users where delete_tag in (0,1) and length(mobile)=11 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
-        String sqlCount = "select count(1) from users where delete_tag in (0,1) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from users where delete_tag in (0,1) and created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt));
         if (null != dg) {
             sqlCount = sqlCount + " and uid%" + dG + "=" + dg;
         }
@@ -144,11 +144,12 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 
                         if (StringUtils.length(mobile) == 11) {
                             dmRdmService.setUidByMobile(mobile, uid);
+                            dmRdmService.setUserInfoVoByUid(uid, vo);
                         }
                     }
                     if (userList.size() == 500 || (userList.size() > 0 && smFlg)) {
                         tl += userList.size();
-                        mongoTemplate.insert(vos, AdamUserInfoVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamUserInfoVo.class.getSimpleName());
                         log.info("DM.execute.result:{} - {}", dmUserService.saveBatch(userList), dmUserInfoService.saveBatch(userInfoList));
                         vos.clear();
                         userList.clear();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/adam/dm/processor/DMUserMemberProcessor.java

 package com.liquidnet.service.platform.service.impl.adam.dm.processor;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.platform.service.impl.adam.dm.DMUserMemberService;
@@ -9,8 +11,6 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.sql.Connection;
@@ -32,10 +32,10 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
 
-            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
+//            log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from user_cards where created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from user_cards where created_at" + (StringUtils.isBlank(incrDt) ? "<curdate()" : (">=curdate()-" + incrDt));
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }
@@ -101,7 +101,7 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                     }
                     if (userMemberList.size() == 500 || (userMemberList.size() > 0 && smFlg)) {
                         tl += userMemberList.size();
-                        mongoTemplate.insert(vos, AdamUserMemberVo.class.getSimpleName());
+//                        mongoTemplate.insert(vos, AdamUserMemberVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", dmUserMemberService.saveBatch(userMemberList));
                         vos.clear();
                         userMemberList.clear();
@@ -116,6 +116,12 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                 log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+
+            AdamUserMember max = dmUserMemberService.getOne(Wrappers.lambdaQuery(AdamUserMember.class).orderByDesc(AdamUserMember::getMemberNo));
+            log.info("DM.execute.setMaxMemberNo:{} ----------------------------> end", JsonUtils.toJson(max));
+            if (null != max) {
+                dmRdmService.setMaxMemberNo(Integer.parseInt(max.getMemberNo()));
+            }
         } catch (Exception e) {
             log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
         }

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

@@ -347,7 +347,11 @@ public class DataImpl {
                             ticketStatus.setStatus(ticketData.getInt("status"));
                             ticketStatus.setCounts(1);
                             ticketStatus.setStatusExchange(7);
-                            ticketStatus.setIsShowCode(1);
+                            if (!performancePartnerVo.getType().equals(101)) {
+                                ticketStatus.setIsShowCode(1);
+                            } else {
+                                ticketStatus.setIsShowCode(0);
+                            }
                             ticketStatus.setQrCodeShowTime(tickets.getCreatedAt());
                             ticketStatus.setIsLackRegister(ticketData.getInt("is_lack_register"));
                             ticketStatus.setTotalGeneral(ticketData.getInt("total_general"));

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

@@ -252,22 +252,22 @@ public class DataUtils {
 
         KylinPerformanceVo vo = getPerformanceVo(performanceId);
         int isTrueName = vo.getIsTrueName();
-        String useTime = "";
-        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
-        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
-            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
-            ArrayList<String> ticketList = new ArrayList<>();
-            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
-                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
-                if (ticketItem.getType() == 1) {
-                    ticketList.add(ticketItem.getTicketsId());
-                }
-                if (ticketItem.getTicketsId().equals(ticketId)) {
-                    useTime = ticketItem.getUseStart();
-                }
-            }
-            allTicketId.put(timeItem.getUseStart(), ticketList);
-        }
+//        String useTime = "";
+//        HashMap<String, ArrayList<String>> allTicketId = new HashMap<>();
+//        for (int x = 0; x < vo.getTicketTimeList().size(); x++) {
+//            KylinTicketTimesVo timeItem = vo.getTicketTimeList().get(x);
+//            ArrayList<String> ticketList = new ArrayList<>();
+//            for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+//                KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+//                if (ticketItem.getType() == 1) {
+//                    ticketList.add(ticketItem.getTicketsId());
+//                }
+//                if (ticketItem.getTicketsId().equals(ticketId)) {
+//                    useTime = ticketItem.getUseStart();
+//                }
+//            }
+//            allTicketId.put(timeItem.getUseStart(), ticketList);
+//        }
 
         if (0 == isTrueName) {
             redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
@@ -277,8 +277,8 @@ public class DataUtils {
 
         String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
         String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
-        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
-        redisUtil.set(ticketUseTimeKey, useTime);
+//        String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
+//        redisUtil.set(ticketUseTimeKey, useTime);
 
         if (buyCount > 0) {
             redisUtil.incr(ticketIdKey, buyCount);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/NknameUtil.java

+package com.liquidnet.service.platform.utils;
+
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+
+public class NknameUtil {
+    private static final Logger log = LoggerFactory.getLogger(NknameUtil.class);
+
+    public static ArrayList<String> readForStringList() {
+        ArrayList<String> nknameList = CollectionUtil.arrayListString();
+        InputStream inputStream = null;
+        InputStreamReader inputStreamReader = null;
+        BufferedReader bufferedReader = null;
+        try {
+            inputStream = NknameUtil.class.getClassLoader().getResourceAsStream("META-FIL/library_nickname.csv");
+            inputStreamReader = new InputStreamReader(inputStream, StandardCharsets.UTF_8);
+            bufferedReader = new BufferedReader(inputStreamReader);
+
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                int l = StringUtils.length(line);
+                if (l == 0) {
+                    break;
+                }
+                if (l > 11) {
+                    line = line.substring(0, 11);
+                }
+                nknameList.add(line);
+            }
+        } catch (IOException e) {
+            log.error("Read CSV[library_nickname.csv] failure.", e);
+        } finally {
+            try {
+                if (null != bufferedReader) bufferedReader.close();
+                if (null != inputStreamReader) inputStreamReader.close();
+                if (null != inputStream) inputStream.close();
+            } catch (IOException e) {
+                log.error("Close stream failure.", e);
+            }
+        }
+        return nknameList;
+    }
+}
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetManualShopController.java

@@ -77,6 +77,7 @@ public class SweetManualShopController {
     @ApiOperation("修改")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "title", value = "标题", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "picUrl", value = "图片地址", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "describes", value = "描述", required = true),
@@ -85,13 +86,14 @@ public class SweetManualShopController {
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "sort", value = "排序", required = true),
     })
     public ResponseDto<Boolean> change(@RequestParam String manualShopId,
+                                       @RequestParam String manualId,
                                        @RequestParam String title,
                                        @RequestParam String picUrl,
                                        @RequestParam String describes,
                                        @RequestParam Integer type,
                                        @RequestParam Integer isRecommend,
                                        @RequestParam Integer sort) {
-        return sweetManualShopService.change(manualShopId, title, picUrl, describes, type, isRecommend, sort);
+        return sweetManualShopService.change(manualShopId, manualId, title, picUrl, describes, type, isRecommend, sort);
     }
 
 
@@ -99,8 +101,10 @@ public class SweetManualShopController {
     @ApiOperation("删除")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "manualShopId", value = "商铺id", required = true),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "manualId", value = "手册id", required = true),
     })
-    public ResponseDto<Boolean> delete(@RequestParam() String manualShopId) {
-        return sweetManualShopService.delete(manualShopId);
+    public ResponseDto<Boolean> delete(@RequestParam() String manualShopId,
+                                       @RequestParam String manualId) {
+        return sweetManualShopService.delete(manualShopId, manualId);
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/ISweetManualShopService.java

@@ -22,7 +22,7 @@ public interface ISweetManualShopService extends IService<SweetManualShop> {
 
     ResponseDto<Boolean> add(String manualId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
 
-    ResponseDto<Boolean> change(String manualShopId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
+    ResponseDto<Boolean> change(String manualShopId,String manualId,String title,String picUrl,String describe,Integer type,Integer isRecommend,Integer sort);
 
-    ResponseDto<Boolean> delete(String manualShopId);
+    ResponseDto<Boolean> delete(String manualShopId,String manualId);
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualShopServiceImpl.java

@@ -10,6 +10,7 @@ import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.mapper.SweetManualShopMapper;
 import com.liquidnet.service.sweet.service.ISweetManualShopService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.service.sweet.utils.RedisDataUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +30,8 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
 
     @Autowired
     private SweetManualShopMapper sweetManualShopMapper;
+    @Autowired
+    private RedisDataUtils redisDataUtils;
 
     @Override
     public ResponseDto<List<SweetManualShop>> getList(String manualId, Integer type) {
@@ -64,6 +67,7 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
             sweetManualShop.setSort(sort);
             sweetManualShop.setStatus(1);
             sweetManualShopMapper.insert(sweetManualShop);
+            redisDataUtils.setManualShopRedisData(manualId);
             return ResponseDto.success();
         } catch (Exception e) {
             e.printStackTrace();
@@ -72,7 +76,7 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
     }
 
     @Override
-    public ResponseDto<Boolean> change(String manualShopId, String title, String picUrl, String describe, Integer type, Integer isRecommend, Integer sort) {
+    public ResponseDto<Boolean> change(String manualShopId,String manualId, String title, String picUrl, String describe, Integer type, Integer isRecommend, Integer sort) {
         try {
             SweetManualShop sweetManualShop = SweetManualShop.getNew();
             sweetManualShop.setTitle(title);
@@ -82,6 +86,7 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
             sweetManualShop.setIsRecommend(isRecommend);
             sweetManualShop.setSort(sort);
             sweetManualShopMapper.update(sweetManualShop, Wrappers.lambdaUpdate(SweetManualShop.class).eq(SweetManualShop::getManualShopId, manualShopId));
+            redisDataUtils.setManualShopRedisData(manualId);
             return ResponseDto.success();
         } catch (Exception e) {
             return ResponseDto.failure();
@@ -89,11 +94,12 @@ public class SweetManualShopServiceImpl extends ServiceImpl<SweetManualShopMappe
     }
 
     @Override
-    public ResponseDto<Boolean> delete(String manualShopId) {
+    public ResponseDto<Boolean> delete(String manualShopId,String manualId) {
         try {
             SweetManualShop sweetManualShop = SweetManualShop.getNew();
             sweetManualShop.setStatus(0);
             sweetManualShopMapper.update(sweetManualShop, Wrappers.lambdaUpdate(SweetManualShop.class).eq(SweetManualShop::getManualShopId, manualShopId));
+            redisDataUtils.setManualShopRedisData(manualId);
             return ResponseDto.success();
         } catch (Exception e) {
             return ResponseDto.failure();