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/admin/IAdamMemberService.java → liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/admin/IAdamMemberAdminService.java

@@ -10,7 +10,7 @@ import java.util.List;
 /**
  * 会员信息
  */
-public interface IAdamMemberService extends IService<AdamMember> {
+public interface IAdamMemberAdminService extends IService<AdamMember> {
 
     List<AdamMember> list();
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/entity/AdamMember.java

@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * 会员信息
@@ -103,4 +104,8 @@ public class AdamMember implements Serializable {
      * 限购数量
      */
     private Integer limitation;
+
+    private LocalDateTime createdAt;
+
+    private LocalDateTime updatedAt;
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.liquidnet.service.adam.mapper.AdamMemberPriceMapper">
+<mapper namespace="com.liquidnet.service.adam.mapper.AdamMemberMapper">
     <resultMap id="MemberResult" type="com.liquidnet.service.adam.entity.AdamMember">
         <result column="member_id" property="memberId" />
-        <result column="status" property="status" />
         <result column="name" property="name" />
         <result column="title" property="title" />
         <result column="sub_title" property="subTitle" />
@@ -27,7 +26,6 @@
     <!-- sql -->
     <sql id="Base_Column">
         m.member_id,
-        m.status,
         m.name,
         m.title,
         m.sub_title,
@@ -49,7 +47,7 @@
     </sql>
     <select id="getFirstMember" parameterType="java.lang.String" resultMap="MemberResult">
         SELECT
-        <include refid="Base_Column"></include>
+        *
         FROM adam_member_price as m
         limit 0,1
     </select>

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberController.java → liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamMemberAdminController.java

@@ -5,7 +5,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.ResponseDto;
 import com.liquidnet.service.adam.dto.AdamMemberParam;
 import com.liquidnet.service.adam.entity.AdamMember;
-import com.liquidnet.service.adam.service.admin.IAdamMemberService;
+import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -17,11 +17,11 @@ import org.springframework.web.bind.annotation.*;
 @Api(tags = "会员信息")
 @Slf4j
 @RestController
-@RequestMapping("/member")
-public class AdamMemberController {
+@RequestMapping("/admin/member")
+public class AdamMemberAdminController {
 
     @Autowired
-    IAdamMemberService adamMemberService;
+    IAdamMemberAdminService adamMemberService;
     @Autowired
     AmqpTemplate amqpTemplate;
 

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

@@ -62,7 +62,9 @@ public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMem
             memberPrice = mongoTemplate.find(Query.query(Criteria.where("memberId").is(memberId)),
                     AdamMemberPriceVo.class, AdamMemberPriceVo.class.getSimpleName());
         }
-        info.setAdamMemberPrice(memberPrice);
+        if (memberPrice.size() > 0) {
+            info.setAdamMemberPrice(memberPrice);
+        }
         return info;
     }
 

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

@@ -12,7 +12,7 @@ import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
 import com.liquidnet.service.adam.mapper.AdamMemberPriceMapper;
-import com.liquidnet.service.adam.service.admin.IAdamMemberService;
+import com.liquidnet.service.adam.service.admin.IAdamMemberAdminService;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
@@ -29,7 +29,7 @@ import java.util.*;
 
 @Slf4j
 @Service
-public class AdamMemberServiceImpl extends ServiceImpl<AdamMemberMapper, AdamMember> implements IAdamMemberService {
+public class AdamMemberServiceAdminImpl extends ServiceImpl<AdamMemberMapper, AdamMember> implements IAdamMemberAdminService {
 
     @Autowired
     AdamMemberMapper adamMemberMapper;