红包H5接口修改

admin

2019-11-06 c23bccf7f39ebae903cc20d255b014d3e80c0221

红包H5接口修改

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/RedPackControllerV2.java

@@ -45,6 +45,7 @@
import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.UserInviteUtil;

import com.yeshi.fanli.vo.redpack.RedPackDetailVO;

import com.yeshi.fanli.vo.redpack.RedPackWinInviteVO;



@@ -366,6 +367,8 @@
        JSONObject data = new JSONObject();

        data.put("balance", redPackBalanceService.getBalance(uid));

        data.put("ruleLink", redPackConfigService.getValueByKey("invite_reward_rule_link"));

        data.put("shareLink", UserInviteUtil.getShareUrl(uid));



        UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

        if (userInfoExtra != null && !StringUtil.isNullOrEmpty(userInfoExtra.getInviteCode())) {

            data.put("inviteCode", userInfoExtra.getInviteCode());


 fanli/src/main/java/com/yeshi/fanli/entity/bus/help/AppPageNotification.java

@@ -25,13 +25,39 @@


    // 消息类型的枚举

    public enum AppPageNotificationTypeEnum {

        home("首页"), coupon("优惠券页"), invite("邀请有奖页"), activity("动态"), goodsDetail("详情过度页"), mine("我的"), money(

                "资金"), accountDetail("账户明细"), extract("提现"), orderFanli("返利订单"), orderTiCheng("提成订单"), orderTaoBao(

                        "淘宝订单"), coollect("收藏"), scanHistory("足迹"), team("队员"), kefu("联系客服"), taoBaoShoppingCart(

                                "淘宝购物车"), orderFind("订单申诉"), msgCenter("消息中心"), newOrder("订单"), shareHistory(

                                        "分享记录"), goodsStorage(

                                                "选品库"), tlj("分享爆款详情"), tlj_buy("自购立减详情"), hongbao_balance("红包余额"),

        goodsDetailJD("京东详情"),goodsDetailPDD("拼多多详情"),orderFindJD("拼多多订单找回"),orderFindPDD("京东订单找回");

        home("首页"),

        coupon("优惠券页"),

        invite("邀请有奖页"),

        activity("动态"),

        goodsDetail("详情过度页"),

        mine("我的"),

        money("资金"),

        accountDetail("账户明细"),

        extract("提现"),

        orderFanli("返利订单"),

        orderTiCheng("提成订单"),

        orderTaoBao("淘宝订单"),

        coollect("收藏"),

        scanHistory("足迹"),

        team("队员"),

        kefu("联系客服"),

        taoBaoShoppingCart("淘宝购物车"),

        orderFind("订单申诉"),

        msgCenter("消息中心"),

        newOrder("订单"),

        shareHistory("分享记录"),

        goodsStorage("选品库"),

        tlj("分享爆款详情"),

        tlj_buy("自购立减详情"),

        hongbao_balance("红包余额"),

        goodsDetailJD("京东详情"),

        goodsDetailPDD("拼多多详情"),

        orderFindJD("拼多多订单找回"),

        orderFindPDD("京东订单找回"),

        shareSingle("商品详情单图分享"),

        dynamicShareSingle("动态单图分享"),

        dynamicShareMulti("动态多图分享");



        private final String desc;



        private AppPageNotificationTypeEnum(String desc) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/QrCodeServiceImpl.java

@@ -21,6 +21,7 @@
import com.yeshi.fanli.util.FileUtil;

import com.yeshi.fanli.util.ImageUtil;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.UserInviteUtil;



@Service

public class QrCodeServiceImpl implements QrCodeService {

@@ -132,9 +133,9 @@
        return null;

    }

    

	
    @Override

    public String drawInviteQrCodeNew(String url, Long uid, String portrait, Integer pX, Integer pY, Integer size, String inviteCode) throws IOException {

    public String drawInviteQrCodeNew(String url, Long uid, String portrait, Integer pX, Integer pY, Integer size,

            String inviteCode) throws IOException {

        

        if (StringUtil.isNullOrEmpty(url)) {

            return null;

@@ -161,8 +162,7 @@
            targetPath = FileUtil.getCacheDir() + "/share_" + uid + "_" + System.currentTimeMillis() + ".jpg";

            erCodeTempPath = FileUtil.getCacheDir() + "/" + uid + "_" + System.currentTimeMillis() + ".jpg";

    

            String erCode = ("http://" + Constant.wxGZConfig.getLoginHost() + "/"

                    + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);

            String erCode = UserInviteUtil.getShareUrl(uid);

            // 生成

            try {

                QRCodeUtil.getInstance(250).encode(erCode, erCodeTempPath);

@@ -176,8 +176,8 @@
        }

        

        // 开始根据 url(背景图), qrCode(二维码), portrait(头像) 生成图片

        ImageUtil.inviteFriendImgWhitecustom(urlInputStream, portraitInputStream, erCodeInputStream, targetPath,

             pX, pY, size, inviteCode);

        ImageUtil.inviteFriendImgWhitecustom(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, pX, pY,

                size, inviteCode);

        

        // 删除二维码文件

        if(erCodeInputStream != null) {

@@ -211,8 +211,8 @@
    }

    

    @Override

    public String drawInviteToGreet(String url, Long uid, String portrait, String inviteCode, String content, 
            Date date) throws IOException {

    public String drawInviteToGreet(String url, Long uid, String portrait, String inviteCode, String content, Date date)

            throws IOException {

        

        if (StringUtil.isNullOrEmpty(url)) {

            return null;

@@ -249,10 +249,9 @@
            portraitInputStream = HttpUtil.getAsInputStream(portrait); // 头像

        }

        

		
        // 开始根据 url(背景图), qrCode(二维码), portrait(头像) 生成图片

        ImageUtil.drawInviteToGreet(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode, content, date);



        ImageUtil.drawInviteToGreet(urlInputStream, portraitInputStream, erCodeInputStream, targetPath, inviteCode,

                content, date);

        

        // 删除二维码文件

        if(erCodeInputStream != null) {


 fanli/src/main/java/com/yeshi/fanli/util/UserInviteUtil.java

New file
@@ -0,0 +1,16 @@
package com.yeshi.fanli.util;



public class UserInviteUtil {



    /**

     * 获取分享链接

     * @param uid

     * @return

     */

    public static String getShareUrl(Long uid) {

        String erCode = ("http://" + Constant.wxGZConfig.getLoginHost() + "/"

                + Constant.systemCommonConfig.getProjectName() + "/client/threeShareNew?uid=" + uid);

        return erCode;

    }



}


 fanli/src/main/java/com/yeshi/fanli/util/factory/RedPackDetailFactory.java

@@ -169,6 +169,7 @@
    }



    /**

     * 板栗商城使用

     * 

     * @param giveRecord

     * @return

@@ -183,7 +184,7 @@
        RedPackDetail detail = new RedPackDetail();

        detail.setDisplay(false);

        detail.setUid(uid);

        detail.setMoney(money);

        detail.setMoney(new BigDecimal(0).subtract(money));

        detail.setType(RedPackDetailTypeEnum.useByShopOrder);

        detail.setTitle(title);

        detail.setIdentifyCode(StringUtil.Md5(RedPackDetailTypeEnum.useByShopOrder.name() + "-" + orderId));

@@ -192,9 +193,9 @@
        return detail;

    }

    

	
    /**

     *  新人奖励

     * 
     * @param winInvite

     * @return

     * @throws RedPackDetailException

@@ -218,6 +219,7 @@
    

    /**

     * 立得现金

     * 
     * @param winInvite

     * @return

     * @throws RedPackDetailException

@@ -241,6 +243,7 @@
    

    /**

     * 递增奖励 + 好友完成分享订单

     * 
     * @param winInvite

     * @return

     * @throws RedPackDetailException

@@ -262,9 +265,9 @@
        return detail;

    }

    

	
    /**

     * 连续奖励 + 好友完成分享订单

     * 
     * @param winInvite

     * @return

     * @throws RedPackDetailException

@@ -285,7 +288,6 @@
        detail.setCreateTime(new Date());

        return detail;

    }

	
    

    public static RedPackDetail createShopOrderDrawBack(Long orderId, Long uid, String title, String setName,

            BigDecimal money) throws RedPackDetailException {