提交

yujian

2019-07-10 dceb71ba718011f759405cc7b82530c087ca54b1

提交

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

@@ -138,7 +138,6 @@
    @Resource

    private UserTaoLiJinRecordService userTaoLiJinRecordService;

    



    // 获取商品分享链接

    @RequestMapping(value = "getGoodsShareUrl")

    public void getGoodsShareUrl(AcceptData acceptData, long id, PrintWriter out) {

@@ -181,6 +180,11 @@
                && extraInfo.getRelationValid() == true)

            relationId = extraInfo.getRelationId();

        

        if (StringUtil.isNullOrEmpty(relationId)) {

            out.print(JsonUtil.loadFalseResult(3, "淘宝未授权，请前往\"我的\"绑定淘宝账号"));

            return;

        }



        if (source != null && "taolijin".equals(source)) {

            createTaoLijin(uid, auctionId, totalNum, relationId, request, out);

            return;

@@ -208,7 +212,6 @@
            String shareText = "";

            // 无券

            String shopType = taoBaoLink.getGoods().getUserType() == 0 ? "淘宝价" : "天猫价";



            

            if (StringUtil.isNullOrEmpty(taoBaoLink.getGoods().getCouponInfo())) {

                String text = shareGoodsTextTemplateService.getCommonTemplate(uid);

@@ -300,9 +303,9 @@
        }

    }

    

	
    /**

     * 淘礼金创建分享

     * 
     * @param uid

     * @param auctionId

     * @param totalNum

@@ -310,7 +313,8 @@
     * @param request

     * @param out

     */

    public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request, PrintWriter out) {

    public void createTaoLijin(Long uid, Long auctionId, int totalNum, String relationId, HttpServletRequest request,

            PrintWriter out) {

        try {

            TaoBaoLink taoBaoLink = shareGoodsService.getTaoLiJinLinkForShare(uid, auctionId, relationId);

            

@@ -351,7 +355,6 @@
            }

            data.put("clickUrl", url);

            

			
            // 创建淘口令

            if (!StringUtil.isNullOrEmpty(taoLiJinLink)) {// 通过立即推广方式获取淘口令成功

                String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoLiJinLink);

@@ -359,14 +362,16 @@
                    taoBaoLink.setTaoToken(quanToken);

                }

            } else if (!StringUtil.isNullOrEmpty(taoBaoLink.getClickUrl())) {

                String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(), taoBaoLink.getClickUrl());

                String quanToken = TaoKeApiUtil.getTKToken(goods.getPictUrl(), goods.getTitle(),

                        taoBaoLink.getClickUrl());

                if (!StringUtil.isNullOrEmpty(quanToken)) {

                    taoBaoLink.setTaoToken(quanToken);

                }

            }

            data.put("token", taoBaoLink.getTaoToken());

            

            data.put("rule", "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

            data.put("rule",

                    "http://apph5.yeshitv.com/apppage/all_help_content.html?id=148&from=singlemessage&isappinstalled=0");

            data.put("pictUrl", TbImgUtil.getTBSizeImg(taoBaoLink.getGoods().getPictUrl(), 500));



            // 无券

@@ -463,10 +468,6 @@
            businessEmergent110Service.shareTaoBaoGoodsError(StringUtil.Md5(auctionId + ""));

        }

    }

	
	
	
	


    /**

     * 分享记录统计列表

@@ -716,7 +717,6 @@
        

        String shortLink = HttpUtil.getShortLink(url);

        

		
        // 查询是否有分享

        UserShareGoodsHistory userShareHistory = shareGoodsService.getShareGoodsHistory(uid, goods.getAuctionId());

        String token = "";

@@ -844,7 +844,6 @@
                return template;

            }

            

			
        } else {

            String template = shareGoodsTextTemplateService.getCommonTemplate(uid);

            if (StringUtil.isNullOrEmpty(template))

@@ -952,7 +951,6 @@
                        title += textStyleVO.getContent();

                    }

                }

				
                

                if(StringUtil.isNullOrEmpty(title)) {

                    title = "给你推荐精选好物优惠券，购物前先领券，别错过优惠哦~";


 fanli/src/main/java/com/yeshi/fanli/mapping/order/CommonOrderMapper.xml

@@ -139,7 +139,11 @@
        co_trade_id=#{tradeId}  limit 1
    </select>


    <select id="listBySourceTypeAndTradeId" resultMap="BaseResultMap">SELECT *
        FROM
        yeshi_ec_common_order co WHERE co.co_source_type=#{sourceType} and
        co_trade_id=#{tradeId}
    </select>

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

 fanli/src/main/webapp/client/gonglue/index.html

@@ -5,19 +5,64 @@
        <meta charset="utf-8" />

        <link href="img/favicon.ico" rel="shortcut icon" type="image/x-icon"/>

        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>

        <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />

<meta name="viewport"

    content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />

        <title>新手攻略</title>

        <!--css-->

        <link rel="stylesheet" type="text/css" href="css/DOUI.min.css"/>

        <style type="text/css">

            /*图片效果*/

            .imgstyle{ width: 100%; height: auto; display: block; }

            .animt_img{ animation: imgopc 1s; animation-fill-mode: both; animation-timing-function: ease; }

            @keyframes imgopc{ 0%{ opacity: 0; } 100%{ opacity: 1; } }

.imgstyle {

    width: 100%;

    height: auto;

    display: block;

}



.animt_img {

    animation: imgopc 1s;

    animation-fill-mode: both;

    animation-timing-function: ease;

}



@

keyframes imgopc { 0%{

    opacity: 0;

}



100%{

opacity

:

 
1;

}

}

            /*APP下载*/

            .homeappwai{ width: 94%; height: 3.5rem; padding: 0 3%; position: fixed; left: 0; bottom: 0.5rem; background-color: rgba(0,0,0,0.75); z-index: 50; color: white; }

            .homeappimg{ width: 2.5rem; height: 2.5rem; margin-right: 0.3rem; }

            .homeappgo{ width: 4rem; height: 2rem; border-radius: 1rem; background-color: #E5005C; text-decoration: none; color: white; }

.homeappwai {

    width: 94%;

    height: 3.5rem;

    padding: 0 3%;

    position: fixed;

    left: 0;

    bottom: 0.5rem;

    background-color: rgba(0, 0, 0, 0.75);

    z-index: 50;

    color: white;

}



.homeappimg {

    width: 2.5rem;

    height: 2.5rem;

    margin-right: 0.3rem;

}



.homeappgo {

    width: 4rem;

    height: 2rem;

    border-radius: 1rem;

    background-color: #E5005C;

    text-decoration: none;

    color: white;

}

        </style>

        <!--js-->

        <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>

@@ -26,7 +71,8 @@
    </head>

    

    <body class="displayNone">

        <div id="allwai" class="allwai font3" style="background-color: #FDD757;">

    <div id="allwai" class="allwai font3"

        style="background-color: #FDD757;">

            

            <!--图片列表-->

            <div style="width: 100%; padding-bottom: 5rem; overflow: scroll;">

@@ -34,24 +80,43 @@
                    

                    <!--循环添加-->

                    <div v-for="item in imglist" style="width: 100%; height: auto;">

                        <img v-bind:src="item" class="imgstyle animt_img" onclick="return false"/>

                    <img v-bind:src="item" class="imgstyle animt_img"

                        onclick="return false" />

                    </div>

                    

                </div>

            </div>

            

            <!--APP下载卡片-->

            <div v-if="inapp=='false'||inapp==false" class="homeappwai fboxRow Ycenter">

        <div v-if="inapp=='false'||inapp==false"

            class="homeappwai fboxRow Ycenter">

                <img class="homeappimg" src="img/list_load.png"/>

                <div>不只领优惠券，APP客户端还返利</div>

                <div class="flex1"></div>

                <a class="homeappgo fboxRow Xcenter Ycenter" href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate">下载</a>

            <a class="homeappgo fboxRow Xcenter Ycenter"

                href="http://a.app.qq.com/o/simple.jsp?pkgname=com.yeshi.ec.rebate">下载</a>

            </div>

            

        </div>

    </body>

    

    <script type="text/javascript">

    function copyLink() {

        var href = window.location.href;

        yestv.copyText(href);

        yestv.toast("链接已复制到剪贴板");

    }



    try {

        var array = new Array();

        array.push({

            icon : 'http://img.flqapp.com/resource/icon_share.png',

            name : '复制链接',

            js : 'copyLink()'

        });

        yestv.addMenu(JSON.stringify(array));

    } catch (e) {

    }

        

        $("body").addClass("displayNone");

        

@@ -71,25 +136,32 @@
            el: "#allwai",

            data: imgdata,

            //创建完毕

            created: function () { $("body").removeClass("displayNone"); },

        created : function() {

            $("body").removeClass("displayNone");

        },

            //数据节点渲染完毕

            updated: function () { var num_all = $('img').length; console.log("图片总张数："+num_all); },

        updated : function() {

            var num_all = $('img').length;

            console.log("图片总张数：" + num_all);

        },

        });
        

        //获取地址栏传递参数

        var urldata =  doui.urlParamGet();

        //获取攻略id

        if (urldata.id) { imgdata.id = urldata.id; }

        else { doui.showToast("未获取到攻略id"); }

    if (urldata.id) {

        imgdata.id = urldata.id;

    } else {

        doui.showToast("未获取到攻略id");

    }

        //是否在app内部打开

        if (urldata.inApp) { imgdata.inapp = urldata.inApp; }

		
		
    if (urldata.inApp) {

        imgdata.inapp = urldata.inApp;

    }

        

        //======================== 数据请求 ================================

        imglistGet();

        function imglistGet ()

        {

    function imglistGet() {

            doui.showLoading("获取攻略");

            //发送数据准备
            var myurl =  "../../api/h5/v1/strategy/strategyPicture";

@@ -97,16 +169,24 @@
                id: imgdata.id,

            });

            //发起请求

            $.get({ url:myurl, data:{id: imgdata.id}, success: function(res){

        $.get({

            url : myurl,

            data : {

                id : imgdata.id

            },

            success : function(res) {

                res=JSON.parse(res);

                doui.hideLoading();

                if (res.code != 0) { doui.showToast(res.msg); }

                //向图片组中添加数据

                else { imgdata.imglist = res.data; }

              }});
                if (res.code != 0) {

                    doui.showToast(res.msg);

        }

		
		
                //向图片组中添加数据

                else {

                    imgdata.imglist = res.data;

                }

            }

        });

    }

    </script>

    

</html>