Merge remote-tracking branch 'origin/master'

admin

2019-07-17 b27598f5c370ef74d74f5459eeeda4c403f1ff4b

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/tlj/UserTaoLiJinOriginMapper.java

@@ -55,12 +55,20 @@
    
    
    /**
     * 查询过期的红包
     * 查询过期的红包 排除等级

     * @param date
     * @return
     */
    List<UserTaoLiJinOrigin> getOverdueTaoLiJin(@Param("uid")long uid, @Param("date")Date date);
    
	
    /**

     * 查询过期的红包-等级

     * @param date

     * @return

     */

    List<UserTaoLiJinOrigin> getOverdueTaoLiJinByRank(@Param("uid")long uid, @Param("date")Date date);

	
    /**
     * 查询剩余淘礼金
     * @param uid

 fanli/src/main/java/com/yeshi/fanli/mapping/tlj/UserTaoLiJinOriginMapper.xml

@@ -105,9 +105,14 @@
  <select id="getOverdueTaoLiJin" resultMap="BaseResultMap" >
     SELECT * FROM yeshi_ec_user_taolijin_origin t
    WHERE t.`uto_uid` = #{uid} AND t.`uto_create_time`<![CDATA[<=]]> #{date}
          AND t.`uto_money_surplus`<![CDATA[>]]> 0
          AND t.`uto_money_surplus`<![CDATA[>]]> 0 AND t.`uto_origin`<![CDATA[<>]]>'rankWin'

  </select>
  
  <select id="getOverdueTaoLiJinByRank" resultMap="BaseResultMap" >

     SELECT * FROM yeshi_ec_user_taolijin_origin t

    WHERE t.`uto_uid` = #{uid} AND t.`uto_create_time`<![CDATA[<=]]> #{date}

          AND t.`uto_money_surplus`<![CDATA[>]]> 0 AND t.`uto_origin`= 'rankWin'

  </select>

  
  <select id="getSurplusLiJin" resultMap="BaseResultMap" >
     SELECT * FROM yeshi_ec_user_taolijin_origin t

 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinOriginServiceImpl.java

@@ -404,19 +404,31 @@


    @Override

    public void overdueHongBao(Long uid) {

        // 15天前过期

        Date date = null;

        if (uid == null) {

            return;

        }

		
        // 15天前过期- 非等级红包

        try {

            date = DateUtil.reduceDay(14, new Date());

            Date date = DateUtil.reduceDay(14, new Date());

            List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJin(uid, date);

            executeOverdueHongBao(uid, date, list);

        } catch (ParseException e) {

            e.printStackTrace();

        }

        

        if (date == null) {

            return;

        // 30天前过期 - 等级红包

        try {

            Date date = DateUtil.reduceDay(29, new Date());

            List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJinByRank(uid, date);

            executeOverdueHongBao(uid, date, list);

        } catch (ParseException e) {

            e.printStackTrace();

        }

        }

        

        List<UserTaoLiJinOrigin> list = userTaoLiJinOriginMapper.getOverdueTaoLiJin(uid, date);

	
    public void executeOverdueHongBao(Long uid, Date date, List<UserTaoLiJinOrigin> list) {

        if (list == null || list.size() == 0) {

            return;

        }

@@ -497,7 +509,6 @@
        updateExtra.setUpdateTime(new Date());

        userMoneyExtraService.updateByPrimaryKeySelective(updateExtra);

        

		
        // 插入明细

        UserTaoLiJinDetail detail = new UserTaoLiJinDetail();

        detail.setUid(uid);

@@ -508,6 +519,7 @@
        userTaoLiJinDetailService.insertSelective(detail);

    }



	
    @Override

    public List<UserTaoLiJinOrigin> getSurplusLiJin(long uid) {

        return userTaoLiJinOriginMapper.getSurplusLiJin(uid);


 fanli/src/main/java/com/yeshi/fanli/service/impl/tlj/UserTaoLiJinRecordServiceImpl.java

@@ -374,7 +374,7 @@
                

                // 使用成功消息

                try {

                    String beizhu = "未被领取/使用的部分将会退回";

                    String beizhu = "未被领取或领取后未使用部分退回";

                    SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH.mm");

                    String time = sd.format(new Date());

                    MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();