admin
2021-05-24 c85aa240db8fa4fd53d774b58ce6a3fc0ddb3580
会员增加部分接口
11个文件已修改
1个文件已添加
141 ■■■■■ 已修改文件
facade-lijin/src/main/java/com/ks/lijin/service/LiJinExpendRecordService.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-vip/src/main/java/com/ks/vip/pojo/DO/VipCombo.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-vip/src/main/java/com/ks/vip/service/VipCenterService.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-vip/src/main/java/com/ks/vip/service/VipComboService.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinLinkServiceImpl.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/java/com/ks/vip/mapper/VipCenterRecordMapper.java 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/java/com/ks/vip/query/VipComboQuery.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/java/com/ks/vip/service/remote/VipComboServiceImpl.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/java/com/ks/vip/service/remote/VipGradeServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/resources/mapper/VipCenterRecordMapper.xml 34 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
service-vip/src/main/resources/mapper/VipComboMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
facade-lijin/src/main/java/com/ks/lijin/service/LiJinExpendRecordService.java
@@ -1,7 +1,6 @@
package com.ks.lijin.service;
import com.ks.lijin.exception.LiJinExpendRecordException;
import com.ks.lijin.pojo.DO.LiJinExpendRecord;
import java.math.BigDecimal;
facade-vip/src/main/java/com/ks/vip/pojo/DO/VipCombo.java
@@ -15,6 +15,12 @@
@Valid
public class VipCombo implements Serializable {
    //启用状态
    public final static int STATE_VALID = 1;
    //停用状态
    public final static int STATE_INVALID = 0;
    @Column(name = "cb_id")
    private Long id;
facade-vip/src/main/java/com/ks/vip/service/VipCenterService.java
@@ -7,6 +7,7 @@
import com.ks.vip.pojo.DO.VipGradePotence;
import com.ks.vip.pojo.Enums.VIPEnum;
import java.util.Date;
import java.util.List;
public interface VipCenterService {
@@ -26,6 +27,7 @@
   /**
    * 添加会员权益
     *
    * @param uid
    * @param gradeId
    * @param validDays
@@ -36,6 +38,7 @@
   /**
    * 获取当前用户会员权益
     *
    * @param uid
    * @return
    */
@@ -43,6 +46,7 @@
   /**
    * 获取当前用户会员等级信息
     *
    * @param uid
    * @return
    */
@@ -51,10 +55,21 @@
   /**
    * 获取当前用户会员等级枚举
     *
    * @param uid
    * @return
    */
   public VIPEnum getVIPEnumByUid(String uid);
    /**
     * 获取用户在某个时间点的等级
     *
     * @param uid
     * @param date
     * @return
     */
    public VIPEnum getVIPEnumByUid(String uid, Date date);
}
facade-vip/src/main/java/com/ks/vip/service/VipComboService.java
@@ -2,6 +2,7 @@
import com.ks.vip.pojo.DO.VipCombo;
import com.ks.vip.pojo.Enums.VIPEnum;
import java.util.List;
@@ -11,6 +12,16 @@
   public List<VipCombo> listByPage(int page, int pageSize, VipCombo t);
    /**
     * 获取有效的套餐列表
     *
     * @param vipGrade
     * @return
     */
    public List<VipCombo> listValid(VIPEnum vipGrade);
   public void insertSelective(VipCombo t);
   public void updateByPrimaryKeySelective(VipCombo t);
service-lijin/src/main/java/com/ks/lijin/service/remote/LiJinLinkServiceImpl.java
New file
@@ -0,0 +1,16 @@
package com.ks.lijin.service.remote;
import com.ks.lijin.pojo.DO.LiJinProviderLink;
import com.ks.lijin.service.LiJinLinkService;
import org.apache.dubbo.config.annotation.Service;
import java.util.ArrayList;
import java.util.List;
@Service(version = "1.0")
public class LiJinLinkServiceImpl implements LiJinLinkService {
    @Override
    public List<LiJinProviderLink> getValidLijinLink(Long auctionId, int page, int pageSize) {
        return new ArrayList<>();
    }
}
service-vip/src/main/java/com/ks/vip/mapper/VipCenterRecordMapper.java
@@ -1,10 +1,21 @@
package com.ks.vip.mapper;
import com.ks.lib.common.dao.BaseMapper;
import com.ks.lijin.query.BaseDaoQuery;
import com.ks.vip.pojo.DO.VipCenterRecord;
import org.apache.ibatis.annotations.Param;
import java.util.Date;
import java.util.List;
public interface VipCenterRecordMapper extends BaseMapper<VipCenterRecord> {
    public List<VipCenterRecord> list(@Param("query") DaoQuery daoQuery);
    public class DaoQuery extends BaseDaoQuery {
        public String uid;
        public Date date;
    }
}
service-vip/src/main/java/com/ks/vip/query/VipComboQuery.java
@@ -12,4 +12,7 @@
    // 名称
    public String name;
    //等级ID
    public Long gradeId;
}
service-vip/src/main/java/com/ks/vip/service/remote/VipCenterServiceImpl.java
@@ -2,6 +2,7 @@
import com.ks.vip.mapper.VipCenterMapper;
import com.ks.vip.mapper.VipCenterRecordMapper;
import com.ks.vip.mapper.VipComboMapper;
import com.ks.vip.pojo.DO.*;
import com.ks.vip.pojo.Enums.VIPEnum;
@@ -30,6 +31,9 @@
    @Resource
    private VipGradePotenceService vipGradePotenceService;
    @Resource
    private VipCenterRecordMapper vipCenterRecordMapper;
    @Override
@@ -165,4 +169,18 @@
            return null;
        }
    }
    @Override
    public VIPEnum getVIPEnumByUid(String uid, Date date) {
        VipCenterRecordMapper.DaoQuery daoQuery = new VipCenterRecordMapper.DaoQuery();
        daoQuery.uid = uid;
        daoQuery.date = date;
        daoQuery.start = 0;
        daoQuery.count = 1;
        List<VipCenterRecord> list = vipCenterRecordMapper.list(daoQuery);
        if (list == null || list.size() == 0) {
            return vipGradeService.getDefaultGrade().getIdentity();
        }
        return vipGradeService.selectByPrimaryKey(list.get(0).getGradeId()).getIdentity();
    }
}
service-vip/src/main/java/com/ks/vip/service/remote/VipComboServiceImpl.java
@@ -3,8 +3,11 @@
import com.ks.vip.mapper.VipComboMapper;
import com.ks.vip.pojo.DO.VipCombo;
import com.ks.vip.pojo.DO.VipGrade;
import com.ks.vip.pojo.Enums.VIPEnum;
import com.ks.vip.query.VipComboQuery;
import com.ks.vip.service.VipComboService;
import com.ks.vip.service.VipGradeService;
import org.apache.dubbo.config.annotation.Service;
import javax.annotation.Resource;
@@ -15,6 +18,8 @@
    @Resource
    private VipComboMapper vipComboMapper;
    @Resource
    private VipGradeService vipGradeService;
    @Override
@@ -39,7 +44,6 @@
    }
    @Override
    public long count(VipCombo t) {
        VipComboQuery query = new VipComboQuery();
@@ -60,9 +64,20 @@
        return vipComboMapper.listByPage(query);
    }
    @Override
    public List<VipCombo> listValid(VIPEnum vipGrade) {
        VipGrade vipGrade1 = vipGradeService.getByVipEnum(vipGrade);
        if (vipGrade1 == null) {
            return null;
        }
        VipComboQuery query = new VipComboQuery();
        query.gradeId = vipGrade1.getId();
        query.state = VipCombo.STATE_VALID;
        query.start = 0;
        query.count = 10;
        return vipComboMapper.listByPage(query);
    }
}
service-vip/src/main/java/com/ks/vip/service/remote/VipGradeServiceImpl.java
@@ -1,14 +1,10 @@
package com.ks.vip.service.remote;
import com.ks.vip.mapper.VipComboMapper;
import com.ks.vip.mapper.VipGradeMapper;
import com.ks.vip.pojo.DO.VipCombo;
import com.ks.vip.pojo.DO.VipGrade;
import com.ks.vip.pojo.Enums.VIPEnum;
import com.ks.vip.query.VipComboQuery;
import com.ks.vip.query.VipGradeQuery;
import com.ks.vip.service.VipComboService;
import com.ks.vip.service.VipGradeService;
import org.apache.dubbo.config.annotation.Service;
service-vip/src/main/resources/mapper/VipCenterRecordMapper.xml
@@ -19,9 +19,28 @@
  <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long">select
    <include refid="Base_Column_List"/>from vip_center_record where r_id = #{id,jdbcType=BIGINT}
  </select>
  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from vip_center_record where r_id = #{id,jdbcType=BIGINT}</delete>
  <insert id="insert" parameterType="com.ks.vip.pojo.DO.VipCenterRecord" useGeneratedKeys="true" keyProperty="id">insert into vip_center_record (r_id,r_uid,r_order_id,r_grade_id,r_start_time,r_end_time,r_state,r_creator_id,r_create_time,r_updator_id,r_update_time) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=VARCHAR},#{orderId,jdbcType=BIGINT},#{gradeId,jdbcType=BIGINT},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER},#{creatorId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP},#{updatorId,jdbcType=BIGINT},#{updateTime,jdbcType=TIMESTAMP})</insert>
  <insert id="insertSelective" parameterType="com.ks.vip.pojo.DO.VipCenterRecord" useGeneratedKeys="true" keyProperty="id">insert into vip_center_record
    <select id="list" resultMap="BaseResultMap">
        select
        <include refid="Base_Column_List"/>from vip_center_record where 1=1
        <if test="query.uid!=null">
            AND r_uid= #{query.uid}
        </if>
        <if test="query.date!=null">
            AND #{query.date}>=r_start_time AND r_end_time>#{query.date};
        </if>
    </select>
    <delete id="deleteByPrimaryKey"
            parameterType="java.lang.Long">delete from vip_center_record where r_id = #{id,jdbcType=BIGINT}</delete>
    <insert id="insert" parameterType="com.ks.vip.pojo.DO.VipCenterRecord" useGeneratedKeys="true"
            keyProperty="id">insert into vip_center_record (r_id,r_uid,r_order_id,r_grade_id,r_start_time,r_end_time,r_state,r_creator_id,r_create_time,r_updator_id,r_update_time) values (#{id,jdbcType=BIGINT},#{uid,jdbcType=VARCHAR},#{orderId,jdbcType=BIGINT},#{gradeId,jdbcType=BIGINT},#{startTime,jdbcType=TIMESTAMP},#{endTime,jdbcType=TIMESTAMP},#{state,jdbcType=INTEGER},#{creatorId,jdbcType=BIGINT},#{createTime,jdbcType=TIMESTAMP},#{updatorId,jdbcType=BIGINT},#{updateTime,jdbcType=TIMESTAMP})</insert>
    <insert id="insertSelective" parameterType="com.ks.vip.pojo.DO.VipCenterRecord" useGeneratedKeys="true"
            keyProperty="id">insert into vip_center_record
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">r_id,</if>
      <if test="uid != null">r_uid,</if>
@@ -34,7 +53,8 @@
      <if test="createTime != null">r_create_time,</if>
      <if test="updatorId != null">r_updator_id,</if>
      <if test="updateTime != null">r_update_time,</if>
    </trim>values
        </trim>
        values
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="id != null">#{id,jdbcType=BIGINT},</if>
      <if test="uid != null">#{uid,jdbcType=VARCHAR},</if>
@@ -49,7 +69,8 @@
      <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
    </trim>
  </insert>
  <update id="updateByPrimaryKey" parameterType="com.ks.vip.pojo.DO.VipCenterRecord">update vip_center_record set r_uid = #{uid,jdbcType=VARCHAR},r_order_id = #{orderId,jdbcType=BIGINT},r_grade_id = #{gradeId,jdbcType=BIGINT},r_start_time = #{startTime,jdbcType=TIMESTAMP},r_end_time = #{endTime,jdbcType=TIMESTAMP},r_state = #{state,jdbcType=INTEGER},r_creator_id = #{creatorId,jdbcType=BIGINT},r_create_time = #{createTime,jdbcType=TIMESTAMP},r_updator_id = #{updatorId,jdbcType=BIGINT},r_update_time = #{updateTime,jdbcType=TIMESTAMP} where r_id = #{id,jdbcType=BIGINT}</update>
    <update id="updateByPrimaryKey"
            parameterType="com.ks.vip.pojo.DO.VipCenterRecord">update vip_center_record set r_uid = #{uid,jdbcType=VARCHAR},r_order_id = #{orderId,jdbcType=BIGINT},r_grade_id = #{gradeId,jdbcType=BIGINT},r_start_time = #{startTime,jdbcType=TIMESTAMP},r_end_time = #{endTime,jdbcType=TIMESTAMP},r_state = #{state,jdbcType=INTEGER},r_creator_id = #{creatorId,jdbcType=BIGINT},r_create_time = #{createTime,jdbcType=TIMESTAMP},r_updator_id = #{updatorId,jdbcType=BIGINT},r_update_time = #{updateTime,jdbcType=TIMESTAMP} where r_id = #{id,jdbcType=BIGINT}</update>
  <update id="updateByPrimaryKeySelective" parameterType="com.ks.vip.pojo.DO.VipCenterRecord">update vip_center_record
    <set>
      <if test="uid != null">r_uid=#{uid,jdbcType=VARCHAR},</if>
@@ -62,6 +83,7 @@
      <if test="createTime != null">r_create_time=#{createTime,jdbcType=TIMESTAMP},</if>
      <if test="updatorId != null">r_updator_id=#{updatorId,jdbcType=BIGINT},</if>
      <if test="updateTime != null">r_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>
    </set> where r_id = #{id,jdbcType=BIGINT}
        </set>
        where r_id = #{id,jdbcType=BIGINT}
  </update>
</mapper>
service-vip/src/main/resources/mapper/VipComboMapper.xml
@@ -80,6 +80,7 @@
    <if test="query.id!=null">and cb_id=#{query.id}</if>
    <if test="query.name!=null">and cb_name=#{query.name}</if>
    <if test="query.state!=null">and cb_state=#{query.state}</if>
    <if test="query.gradeId!=null">and cb_grade_id=#{query.gradeId}</if>
  </sql>