分享奖励红包消息取消 + 查询最近30分享红包 + 分享tid加密

yujian

2019-06-26 900c0ff1cf220b47921264748ac1f1e1aa28c6f5

分享奖励红包消息取消 + 查询最近30分享红包  + 分享tid加密

 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ShareController.java

@@ -345,7 +345,7 @@
            

            String url = String.format("http://%s%s?uid=%s&id=%s&appType=flq&tid=%s", configService.getH5Host(),

                    Constant.systemCommonConfig.getShareGoodsPagePath(), AESUtil.encrypt(uid + "", Constant.UIDAESKEY),

                    auctionId + "", tljId);

                    auctionId + "",AESUtil.encrypt(tljId + "", Constant.UIDAESKEY));

            String shortLink = HttpUtil.getShortLink(url);

            if (!StringUtil.isNullOrEmpty(shortLink)) {

                url = shortLink;


 fanli/src/main/java/com/yeshi/fanli/controller/h5/H5RecommendController.java

@@ -227,7 +227,7 @@


    @SuppressWarnings("unused")

    @RequestMapping(value = "getGoodsDetail", method = RequestMethod.GET)

    public void getGoodsDetail(final AcceptData acceptData, final String id, Long tid, String uid, String callback,

    public void getGoodsDetail(final AcceptData acceptData, final String id, String tid, String uid, String callback,

            PrintWriter out) {

        long begin = java.lang.System.currentTimeMillis();

        if (StringUtil.isNullOrEmpty(id)) {

@@ -239,9 +239,10 @@
            uid = AESUtil.decrypt(uid, Constant.UIDAESKEY);

        }



        if (tid != null && tid != 0) {

        if (!StringUtil.isNullOrEmpty(tid)) {

            tid = AESUtil.decrypt(tid, Constant.UIDAESKEY);

            doTaoLiJin(callback, StringUtil.isNullOrEmpty(uid) || Long.parseLong(uid) == 0 ? null : Long.parseLong(uid),

                    tid, out);

                    Long.parseLong(tid), out);

            return;

        }




 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/HongBaoV2Mapper.java

@@ -158,5 +158,11 @@
     * @return
     */
    BigDecimal computeMoneyByUidAndState(@Param("uid") Long uid,@Param("stateList")  List<Integer> stateList);

	
    /**
     * 最近30天内产生过分享订单的用户
     * @return
     */
    List<Long> getUidByNear30DayShareSucceed();
	
}

 fanli/src/main/java/com/yeshi/fanli/mapping/hongbao/HongBaoV2Mapper.xml

@@ -64,13 +64,6 @@
    </resultMap>









    <sql id="Base_Column_List">hb_id,hb_uid,hb_urank,hb_pid,hb_money,hb_type,hb_state,hb_version,hb_beizhu,hb_pre_get_time,hb_get_time,hb_create_time,hb_update_time
    </sql>
    <select id="selectByPrimaryKey" resultMap="BaseResultMap"
@@ -289,6 +282,16 @@
    </select>


    <select id="getUidByNear30DayShareSucceed" resultType="java.lang.Long">
        SELECT v2.`hb_uid` FROM yeshi_ec_hongbao_v2 v2
        WHERE  v2.`hb_type` = 20 AND v2.`hb_state`<![CDATA[<>]]> 4
              AND DATE_SUB(CURDATE(), INTERVAL 30 DAY) <![CDATA[<=]]>DATE(v2.`hb_create_time`)
        GROUP BY v2.`hb_uid`
        ORDER BY v2.`hb_create_time`;
    </select>



    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
        yeshi_ec_hongbao_v2 where hb_id = #{id,jdbcType=BIGINT}
    </delete>

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -1034,4 +1034,9 @@
    public List<HongBaoV2> listChildrenById(Long id) {

        return hongBaoV2Mapper.listChildrenById(id);

    }

	
    @Override

    public List<Long> getUidByNear30DayShareSucceed(){

        return hongBaoV2Mapper.getUidByNear30DayShareSucceed();

    }

}


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

@@ -292,22 +292,22 @@
        UserTaoLiJinOrigin origin = saveOrigin(uid, 1, money, TaoLiJinOriginEnum.shareWin);

        // 红包明细

        userTaoLiJinDetailService.createAddDetail(origin);

        // 消息

        executor.execute(new Runnable() {

            @Override

            public void run() {

                try {

                    String beizhu = "近30天产生过分享（仅一次奖励）";

                    MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

                    content.setState("红包增加");

                    content.setSource("分享订单奖励");

                    content.setMoney(money);

                    userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);

                } catch (Exception e) {

                    LogHelper.errorDetailInfo(e);

                }

            }

        });

//        // 消息

//        executor.execute(new Runnable() {

//            @Override

//            public void run() {

//                try {

//                    String beizhu = "近30天产生过分享（仅一次奖励）";

//                    MsgOtherTaoLiJinContentDTO content = new MsgOtherTaoLiJinContentDTO();

//                    content.setState("红包增加");

//                    content.setSource("分享订单奖励");

//                    content.setMoney(money);

//                    userOtherMsgNotificationService.taoLiJinMsg(uid, beizhu, content);

//                } catch (Exception e) {

//                    LogHelper.errorDetailInfo(e);

//                }

//            }

//        });

        return origin;

    }

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/hongbao/HongBaoV2Service.java

@@ -130,4 +130,10 @@
     */

    public List<HongBaoV2> listChildrenById(Long id);



    /**

     * 最近30天内产生过分享订单的用户

     * @return

     */

    public List<Long> getUidByNear30DayShareSucceed();



}