Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

liquidnet-bus-config/liquidnet-config/liquidnet-support-zuul.yml

@@ -96,6 +96,7 @@ global:
       /adam/login/mobile,
       /adam/login/tpa,
       /adam/send
+      /adam/member/info
     url-pattern: /kylin/**
 # -----------------------------------------------------------
 #解决错误 com.netflix.client.ClientException: Load balancer does not have available server for client:panfeng-item-service

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

@@ -8,7 +8,6 @@ import com.liquidnet.service.adam.entity.AdamUserMember;
  * 会员用户信息
  */
 public interface IAdamUserMemberService extends IService<AdamUserMember> {
-    void createUserMemberInfo(String memberId);
 
     String getMaxMemberNo(String memberId);
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberMapper.xml

@@ -10,7 +10,7 @@
         <result column="icon" property="icon" />
         <result column="avatar" property="avatar" />
         <result column="type" property="type" />
-        <result column="interests_details" property="interestsDetails" />
+        <result column="interests_detail" property="interestsDetail" />
         <result column="notes" property="notes" />
         <result column="is_notice" property="isNotice" />
         <result column="notice_info" property="noticeInfo" />
@@ -24,31 +24,28 @@
     </resultMap>
 
     <!-- sql -->
-    <sql id="Base_Column">
-        m.member_id,
-        m.name,
-        m.title,
-        m.sub_title,
-        m.start_no,
-        m.icon,
-        m.avatar,
-        m.type,
-        m.interests_details,
-        m.notes,
-        m.is_notice,
-        m.notice_info,
-        m.notice_title,
-        m.need_question,
-        m.display_agreement,
-        m.agreement,
-        m.limitation,
-        m.created_at,
-        m.updated_at
-    </sql>
-    <select id="getFirstMember" parameterType="java.lang.String" resultMap="MemberResult">
+    <select id="getFirstMember" resultMap="MemberResult">
         SELECT
-        *
-        FROM adam_member_price as m
+           member_id,
+           `name`,
+           title,
+           sub_title,
+           start_no,
+           icon,
+           avatar,
+           `type`,
+           interests_detail,
+           notes,
+           is_notice,
+           notice_info,
+           notice_title,
+           need_question,
+           display_agreement,
+           agreement,
+           limitation,
+           created_at,
+           updated_at
+        FROM adam_member
         limit 0,1
     </select>
 </mapper>

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

@@ -123,7 +123,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
             result.setState(0);
             return result;
         }
-        String cardNumber = "";
         // 查询用户是否是会员 获取会员编号
         AdamUserMemberVo userMemberInfo = adamUserMemberService.getUserMemberInfo(param.getUid());
 
@@ -137,7 +136,6 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         AdamMemberOrderVo orderVo = new AdamMemberOrderVo();
         String orderNo = IDGenerator.nextSnowId().toString().concat("V");
         orderVo.setOrderNo(orderNo);
-        orderVo.setMemberNo(cardNumber);
         orderVo.setMemberId(memberId);
         orderVo.setBirthday(DateUtil.format(param.getBirthday(), DateUtil.Formatter.yyyyMMddHHmmss));
         orderVo.setDays(memberPrice.getDays());
@@ -153,7 +151,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         // todo 此处调用MQ通知mysql
 //        List<Object> mqList = new ArrayList<>();
 
-        mongoTemplate.insert(orderVo);
+        mongoTemplate.insert(orderVo, AdamMemberOrderVo.class.getSimpleName());
 
         redisUtil.hset(AdamRedisConst.INFO_MEMBERS_ORDER_INFO.concat(param.getUid()), orderNo, orderVo);
 
@@ -249,7 +247,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         }
 
         // 创建用户使用兑换码的订单
-        mongoTemplate.insert(orderVo);
+        mongoTemplate.insert(orderVo, AdamMemberOrderVo.class.getSimpleName());
         redisUtil.hset(AdamRedisConst.INFO_MEMBERS_ORDER_INFO.concat(uid), orderVo.getOrderNo(), orderVo);
         // 组装用户会员数据
         AdamUserMemberVo memberVo = new AdamUserMemberVo();
@@ -266,7 +264,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         memberVo.setExpiryAt(expiryAtStr);
 
         // 创建用户会员相关信息
-        mongoTemplate.insert(memberVo);
+        mongoTemplate.insert(memberVo, AdamUserMemberVo.class.getSimpleName());
         redisUtil.set(AdamRedisConst.INFO_MEMBERS_USER_INFO.concat(uid), memberVo);
 
         // 更新旧数据
@@ -367,10 +365,10 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
                     codeVo.setMemberCodeId(IDGenerator.nextSnowId().toString());
 
                     // 订单写入MongoDB和Redis中
-                    mongoTemplate.insert(createMemberUser);
+                    mongoTemplate.insert(createMemberUser, AdamUserMemberVo.class.getSimpleName());
                     redisUtil.set(AdamRedisConst.INFO_MEMBERS_USER_INFO.concat(orderVo.getUid()), createMemberUser);
                     // 会员码使用记录
-                    mongoTemplate.insert(codeVo);
+                    mongoTemplate.insert(codeVo, AdamMemberCodeVo.class.getSimpleName());
                     redisUtil.hset(AdamRedisConst.INFO_MEMBERS_CODE_INFO.concat(codeVo.getBuyUid()), codeVo.getBuyOrderNo(), codeVo);
                     // todo mq 发送数据到队列中
 
@@ -397,7 +395,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
                 codeVo.setState(0);
                 codeVo.setMemberNo(cardNumber);
 
-                mongoTemplate.insert(codeVo);
+                mongoTemplate.insert(codeVo, AdamMemberCodeVo.class.getSimpleName());
                 redisUtil.hset(AdamRedisConst.INFO_MEMBERS_CODE_INFO.concat(codeVo.getBuyUid()), codeVo.getBuyOrderNo(), codeVo);
 
             }

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.mapper.AdamMemberPriceMapper;
 import com.liquidnet.service.adam.service.IAdamMemberService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -18,10 +19,7 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 
 @Slf4j
@@ -44,17 +42,39 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
     public AdamMemberVo queryMemberInfo() {
         AdamMemberVo info = null;
         List<AdamMemberVo> adamMemberVoList = mongoTemplate.findAll(AdamMemberVo.class);
+        int tag = 0;
         if (adamMemberVoList.size() > 0){
             info = adamMemberVoList.get(0);
+        } else  {
+            AdamMember firstMember = adamMemberMapper.getFirstMember();
+            if (null == firstMember) {
+                return null;
+            }
+            info = new AdamMemberVo();
+            BeanUtils.copyProperties(firstMember, info);
+            tag = 1;
         }
+        String memberId = info.getMemberId();
         List<AdamMemberPriceVo> memberPrice = new ArrayList<>();
-        Map<Object, Object> tempMemberPrice = redisUtil.hmget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat( info.getMemberId()));
-        Iterator<Object> iterator = tempMemberPrice.keySet().iterator();
-        while (iterator.hasNext()) {
-            AdamMemberPriceVo tempAmp = (AdamMemberPriceVo) tempMemberPrice.get(iterator.next());
-            memberPrice.add(tempAmp);
+
+        LinkedHashSet<String> hkeys = (LinkedHashSet<String>) redisUtil.hkeys(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId));
+        Iterator<String> priceIterator = hkeys.iterator();
+        while(priceIterator.hasNext()){
+            String key = priceIterator.next();
+            AdamMemberPriceVo tempMemberPrice = (AdamMemberPriceVo) redisUtil.hget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat(memberId), key);
+            memberPrice.add(tempMemberPrice);
         }
+
+//        Map<Object, Object> tempMemberPrice = redisUtil.hmget(AdamRedisConst.INFO_MEMBERS_PRICE_INFO.concat( info.getMemberId()));
+//        Iterator<Object> iterator = tempMemberPrice.keySet().iterator();
+//        while (iterator.hasNext()) {
+//            AdamMemberPriceVo tempAmp = (AdamMemberPriceVo) tempMemberPrice.get(iterator.next());
+//            memberPrice.add(tempAmp);
+//        }
         info.setAdamMemberPrice(memberPrice);
+        if (1 == tag) {
+            mongoTemplate.insert(info, AdamMemberVo.class.getSimpleName());
+        }
         return info;
     }
 

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

@@ -37,15 +37,6 @@ public class AdamUserMemberServiceImpl extends ServiceImpl<AdamUserMemberMapper,
     @Autowired
     RedisUtil redisUtil;
 
-    @Override
-    public void createUserMemberInfo(String memberId) {
-        // todo  创建用户
-        AdamUserMember userMember = new AdamUserMember();
-        adamUserMemberMapper.insert(userMember);
-        // 获取最大会员号
-        getMaxMemberNo(memberId);
-    }
-
     @Override
     public String getMaxMemberNo(String memberId) {
         String memberNoMaxKey = AdamRedisConst.MEMBER_MEMBER_NO_MAX_KEY.concat(memberId);

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

@@ -2,6 +2,8 @@ package com.liquidnet.service.adam.service.impl.admin;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.adam.constant.AdamRedisConst;
 import com.liquidnet.service.adam.dto.AdamMemberCodeParam;
 import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
 import com.liquidnet.service.adam.entity.AdamMemberCode;
@@ -9,11 +11,16 @@ import com.liquidnet.service.adam.mapper.AdamMemberCodeMapper;
 import com.liquidnet.service.adam.service.admin.IAdamMemberCodeAdminService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
 @Slf4j
 @Service
 public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMapper, AdamMemberCode> implements IAdamMemberCodeAdminService {
@@ -31,7 +38,15 @@ public class AdamMemberCodeAdminServiceImpl extends ServiceImpl<AdamMemberCodeMa
 
     @Override
     public void createGiftCode(AdamMemberCodeParam param) {
+        // 需要主动生成会员编号
         AdamMemberCode adamMemberCode = (new AdamMemberCodeVo()).setCodeParam(param, 0);
         adamMemberCodeMapper.insert(adamMemberCode);
+
+        // mongo
+        AdamMemberCodeVo vo = new AdamMemberCodeVo();
+        BeanUtils.copyProperties(adamMemberCode, vo);
+        vo.setCreatedAt(DateUtil.format(adamMemberCode.getCreatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
+        vo.setUpdatedAt(DateUtil.format(adamMemberCode.getUpdatedAt(), DateUtil.Formatter.yyyyMMddHHmmss));
+        mongoTemplate.insert(vo, AdamMemberCodeVo.class.getSimpleName());
     }
 }