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

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

@@ -22,8 +22,8 @@ public class AdamMemberPriceParam implements Serializable {
     @NotBlank
     private String memberId;
     @ApiModelProperty(position = 3, value = "状态:0-不可用,1-上线中,2-已下线", allowableValues = "0,1,2")
-    @NonNull
-    @Min(0)
+    @NotNull
+    @Min(1)
     @Max(2)
     private Integer state;
     @ApiModelProperty(position = 4, value = "会员价格包名称", example = "年卡")

liquidnet-bus-do/liquidnet-service-adam-do/src/main/java/com/liquidnet/service/adam/mapper/AdamMemberPriceMapper.java

@@ -6,7 +6,4 @@ import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import java.util.List;
 
 public interface AdamMemberPriceMapper extends BaseMapper<AdamMemberPrice> {
-    AdamMemberPrice misMemberPriceInfo(String memberPriceId);
-
-    List<AdamMemberPrice> memberPriceList(String memberId);
 }
\ No newline at end of file

liquidnet-bus-do/liquidnet-service-adam-do/src/main/resources/com/liquidnet/service/adam/mapper/AdamMemberPriceMapper.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">
-    <resultMap id="MemberPriceResult" type="com.liquidnet.service.adam.entity.AdamMemberPrice">
-        <result column="member_price_id" property="memberPriceId" />
-        <result column="member_id" property="memberId" />
-        <result column="status" property="status" />
-        <result column="name" property="name" />
-        <result column="price" property="price" />
-        <result column="price_fixed" property="priceFixed" />
-        <result column="days" property="days" />
-        <result column="detail" property="detail" />
-        <result column="created_at" property="createdAt" />
-        <result column="updated_at" property="updatedAt" />
-    </resultMap>
 
-    <!-- sql -->
-    <sql id="Base_Column">
-        m.member_id,
-        m.status,
-        m.name,
-        m.price,
-        m.price_fixed,
-        m.days,
-        m.detail,
-        m.created_at,
-        m.updated_at,
-        m.member_price_id
-    </sql>
-    <!-- 根据会员id查询价格列表 -->
-    <select id="memberPriceList" parameterType="java.lang.String" resultMap="MemberPriceResult">
-        SELECT
-        <include refid="Base_Column"/>
-        FROM adam_member_price as m
-        <where>
-            m.member_id=#{memberId}
-        </where>
-    </select>
-    <!-- mis会员价格详情 -->
-    <select id="misMemberPriceInfo" parameterType="java.lang.String" resultMap="MemberPriceResult">
-        SELECT
-        <include refid="Base_Column"/>
-        FROM adam_member_price as m
-        <where>
-            m.member_price_id=#{memberPriceId}
-        </where>
-    </select>
 </mapper>