Merge branch 'master' into div1

yujian

2019-01-09 9c56e822b443da4107474de914a333b8aa93bcff

Merge branch 'master' into div1

 fanli/src/main/java/com/yeshi/fanli/mapping/money/UserMoneyDetailMapper.xml

@@ -97,9 +97,14 @@
            separator="UNION ALL">
            <trim prefix="(" suffix=")">
                SELECT
                a.time as dateFormate , if(a.money is null,0,a.money) as
                c.time as dateFormate , if(a.money is null,0,a.money) as
                income ,if(b.money is null,0,b.money) as expend
                FROM

                (select #{item} as `time`) c

                left join

                (
                SELECT
                DATE_FORMAT(
@@ -115,6 +120,9 @@
                d.`umd_createtime`,'%Y-%m')=#{item} GROUP BY DATE_FORMAT(
                d.`umd_createtime`,'%Y-%m')
                ) a

                on a.time=c.time

                LEFT JOIN
                (
                SELECT DATE_FORMAT(
@@ -122,13 +130,14 @@
                `time`,SUM(d.`umd_money`) AS money
                FROM
                `yeshi_ec_user_money_detail`
                d WHERE d.`umd_uid`=#{uid} AND
                d
                WHERE d.`umd_uid`=#{uid} AND
                d.`umd_money` <![CDATA[<0]]>
                AND DATE_FORMAT(
                d.`umd_createtime`,'%Y-%m')=#{item} GROUP BY
                DATE_FORMAT(
                d.`umd_createtime`,'%Y-%m')
                ) b ON a.time=b.time
                ) b ON c.time=b.time
            </trim>
        </foreach>
    </select>

 fanli/src/main/java/com/yeshi/fanli/mapping/share/ShareMapper.xml

@@ -183,7 +183,7 @@
        AND

        yeh.`hb_uid` = #{uid}

        AND

        FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m-%d') =

        FROM_UNIXTIME(UNIX_TIMESTAMP(yeh.hb_create_time),'%Y-%m-%d') =

        FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m-%d');

    </select>



@@ -203,7 +203,7 @@
        AND

        yeh.`hb_uid` = #{uid}

        AND

        FROM_UNIXTIME(yeh.hb_create_time/1000,'%Y-%m') =

        FROM_UNIXTIME(UNIX_TIMESTAMP(yeh.hb_create_time),'%Y-%m') =

        FROM_UNIXTIME(UNIX_TIMESTAMP(),'%Y-%m');

    </select>




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

@@ -87,6 +87,7 @@
            doExtractResult();// 处理提现结果

            doTaoBaoOrders();// 处理淘宝订单

            doOrderFanLi();// 处理订单返利

            doOrderFanLiNew();//新版返利

            doOrderTiChengFanLi();// 处理订单提成返利

            doWeiQuanOrder();// 处理维权订单

            doPushIOS();// 处理发送IOS消息