Merge remote-tracking branch 'origin/master'

admin

2018-12-13 f5b843b018ff6867f477e2d088e665ffef97ba35

Merge remote-tracking branch 'origin/master'

 fanli/src/main/java/com/yeshi/fanli/mapping/ThreeSaleMapper.xml

@@ -360,8 +360,7 @@
    <select id="listFirstTeam" resultMap="AllResultMap">
        SELECT * FROM `yeshi_ec_threesale` ts
        LEFT JOIN `yeshi_ec_threesale_extra_info` ff
        ON ts.`boss_id` = ff.`tf_boss_id` AND ts.`worker_id` =
        ff.`tf_worker_id`
            ON ts.`boss_id` = ff.`tf_boss_id` AND ts.`worker_id`=ff.`tf_worker_id`
        WHERE ts.`boss_id` = #{uid}
        ORDER BY ts.state DESC, ts.expire, ts.createTime DESC
        LIMIT ${start},${count}
@@ -378,18 +377,14 @@

    <select id="listSecondTeam" resultMap="AllResultMap">
        SELECT yet.* FROM (
        SELECT DISTINCT(ts.`id`) AS id FROM `yeshi_ec_threesale`
        ts
        LEFT JOIN yeshi_ec_threesale tf ON ts.`boss_id`=tf.`worker_id`
        WHERE tf.`boss_id` = #{uid}
        ORDER BY ts.state DESC, ts.expire, ts.createTime DESC
        LIMIT
        ${start},${count})A
            SELECT DISTINCT(ts.`id`) AS id FROM `yeshi_ec_threesale` ts
            LEFT JOIN yeshi_ec_threesale tf ON ts.`boss_id`=tf.`worker_id`
            WHERE tf.`boss_id` = #{uid})A
        LEFT JOIN yeshi_ec_threesale yet ON yet.id = A.id
        LEFT JOIN `yeshi_ec_threesale_extra_info` ff
        ON yet.`boss_id` = ff.`tf_boss_id` AND yet.`worker_id` =
        ff.`tf_worker_id`

        ON yet.`boss_id` = ff.`tf_boss_id` AND yet.`worker_id` =ff.`tf_worker_id`
        ORDER BY yet.state DESC, yet.expire, yet.createTime DESC
        LIMIT ${start},${count}
    </select>

    <select id="countSecondTeam" resultType="java.lang.Long">

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

@@ -571,7 +571,11 @@
                userShareGoodsGroup.setCreateTime(null);

                userShareGoodsGroup.setUpdateTime(null);

                userShareGoodsGroup.setRecordId(null);

                dataObject.put("group", gson.toJson(userShareGoodsGroup));

				
                dataObject.put("todayBrowse",userShareGoodsGroup.getTodayBrowse() );

                dataObject.put("totalBrowse",userShareGoodsGroup.getTotalBrowse() );

                dataObject.put("totalOrder", userShareGoodsGroup.getTotalOrder());

                dataObject.put("totalMoney", "¥"+userShareGoodsGroup.getTotalMoney());

                dataObject.put("goods", gson.toJson(TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion, null)));

                array.add(dataObject);

            }