Merge remote-tracking branch 'origin/div' into div

admin

2019-10-19 a18310725c451260bd93090d47978968c5bd5f65

Merge remote-tracking branch 'origin/div' into div

 fanli/src/main/java/com/yeshi/fanli/controller/admin/ExtractAdminController.java

@@ -1082,7 +1082,13 @@
            e.printStackTrace();

        }

    }



	
    /**

     * 下载提现红包Openid

     * @param callback

     * @param response

     * @param out

     */

    @RequestMapping(value = "downAutoExtractTxt")

    public void downAutoExtractTxt(String callback, HttpServletResponse response, PrintWriter out) {

        try {

@@ -1119,7 +1125,13 @@
            e.printStackTrace();

        }

    }



	
	
    /**

     * 上传提现红包Excel

     * @param file

     * @param out

     */

    @RequestMapping(value = "uploadExcel", method = RequestMethod.POST)

    public void uploadExcel(@RequestParam("file") CommonsMultipartFile file, PrintWriter out) {

        if (file == null) {

@@ -1138,9 +1150,16 @@
            out.print(JsonUtil.loadFalseResult("上传失败"));

        }

    }



	
	
    /**

     * 预览红包发生人

     * @param callback

     * @param pageIndex

     * @param out

     */

    @RequestMapping(value = "preAutoUser")

    public void preAutoUser(String callback, Integer pageIndex, Integer pageSize, PrintWriter out) {

    public void preAutoUser(String callback, Integer pageIndex, PrintWriter out) {

        try {

            List<UserInfo> list = extractService.preAutoUser();

            if (list == null || list.isEmpty()) {

@@ -1152,6 +1171,7 @@
                pageIndex = 1;

            }



            Integer pageSize = 100;

            if (pageSize == null || pageSize < 1) {

                pageSize = Constant.PAGE_SIZE;

            }


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

@@ -393,6 +393,7 @@
            UserInfoExtra update = new UserInfoExtra();

            update.setId(userExtra.getId());

            update.setAutoExtract(false);

            update.setCloseTimeExtract(new Date());

            try {

                userInfoExtraService.saveUserInfoExtra(update);

            } catch (UserInfoExtraException e) {


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

@@ -206,5 +206,6 @@
     * @param count

     * @return

     */

    List<UserInfo> getAutoExtractUserIds(@Param("start") int start, @Param("count") int count, @Param("money") BigDecimal money);

    List<UserInfo> getAutoExtractUser(@Param("start") int start, @Param("count") int count, @Param("money") BigDecimal money,

            @Param("beganDate") String beganDate, @Param("endDate") String endDate);

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/msg/MsgMoneyDetailMapper.java

@@ -1,26 +1,26 @@
package com.yeshi.fanli.dao.mybatis.msg;

import java.util.List;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dao.BaseMapper;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;
import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;

public interface MsgMoneyDetailMapper extends BaseMapper<MsgMoneyDetail> {

    MsgMoneyDetail selectBySourceIdAndMsgType(@Param("sourceId") Long sourceId,
            @Param("type") MsgTypeMoneyTypeEnum type);

    List<MsgMoneyDetail> listByUid(@Param("uid") Long uid, @Param("start") long start, @Param("count") int count);

    Long countByUid(@Param("uid") Long uid);
	
    /**
     * 设置消息已读时
     * 
     * @param uid
     */
    void setMsgReadByUid(Long uid);
package com.yeshi.fanli.dao.mybatis.msg;



import java.util.List;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dao.BaseMapper;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail.MsgTypeMoneyTypeEnum;



public interface MsgMoneyDetailMapper extends BaseMapper<MsgMoneyDetail> {



    MsgMoneyDetail selectBySourceIdAndMsgType(@Param("sourceId") Long sourceId,

            @Param("type") MsgTypeMoneyTypeEnum type);



    List<MsgMoneyDetail> listByUid(@Param("uid") Long uid, @Param("start") long start, @Param("count") int count);



    Long countByUid(@Param("uid") Long uid);

	
    /**

     * 设置消息已读时

     * 
     * @param uid

     */

    void setMsgReadByUid(Long uid);

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/order/CommonOrderCountMapper.java

@@ -1,89 +1,89 @@
package com.yeshi.fanli.dao.mybatis.order;

import java.math.BigDecimal;
import java.util.List;
import java.util.Map;

import org.apache.ibatis.annotations.Param;

import com.yeshi.fanli.dto.ChartTDO;

public interface CommonOrderCountMapper {

    /**
     * 当前各个状态订单数
     * 
     * @param state
     *            状态
     * @return
     */
    Long countByState(@Param("state") Integer state);

    /**
     * 统计所有订单
     * 
     * @param channel
     * @return
     */
    List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,
            @Param("startTime") String startTime, @Param("endTime") String endTime,
            @Param("sourceType") int sourceType);

    /**
     * 奖金统计
     * 
     * @param uid
     * @return
     */
    Map<String, Object> countOrderNumberBySettleTime(@Param("uid") Long uid, @Param("state") Integer state,
            @Param("day") Integer day);

    /**
     * 统计自购、分享有效订单数量
     * 
     * @param uid
     * @return
     */
    long countValidOrder(@Param("uid") Long uid);

    /**
     * 根据订单号 查询金额
     * 
     * @param orderNo
     * @return
     */
    BigDecimal getMoneyByOrderNo(@Param("orderNo") String orderNo);

    /**
     * 统计已到账返利订单
     * 
     * @param uid
     * @param dateTime
     * @return
     */
    long countValidOrderByDate(@Param("uid") Long uid, @Param("dateTime") String dateTime);

    /**
     * 查询用户在同一店铺购买超过一定数量商品的店铺数量
     * 
     * @param typeList
     *            -红包类型
     * @param uid
     *            -用户ID
     * @param minSameShopGoodsCount
     *            -同一店铺买的最小订单数
     * @return
     */
    long countSameShopOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,
            @Param("minSameShopGoodsCount") int minSameShopGoodsCount);
	
    /**
     * 查询用户购买相同商品超过一定的订单数量的商品数量
     * @param typeList
     * @param uid
     * @param minSameGoodsOrderCount
     * @return
     */
    long countSameGoodsOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,
            @Param("minSameGoodsOrderCount") int minSameGoodsOrderCount);
package com.yeshi.fanli.dao.mybatis.order;



import java.math.BigDecimal;

import java.util.List;

import java.util.Map;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dto.ChartTDO;



public interface CommonOrderCountMapper {



    /**

     * 当前各个状态订单数

     * 
     * @param state

     *            状态

     * @return

     */

    Long countByState(@Param("state") Integer state);



    /**

     * 统计所有订单

     * 
     * @param channel

     * @return

     */

    List<ChartTDO> countOrderNumber(@Param("dateType") Integer dateType, @Param("year") String year,

            @Param("startTime") String startTime, @Param("endTime") String endTime,

            @Param("sourceType") int sourceType);



    /**

     * 奖金统计

     * 
     * @param uid

     * @return

     */

    Map<String, Object> countOrderNumberBySettleTime(@Param("uid") Long uid, @Param("state") Integer state,

            @Param("day") Integer day);



    /**

     * 统计自购、分享有效订单数量

     * 
     * @param uid

     * @return

     */

    long countValidOrder(@Param("uid") Long uid);



    /**

     * 根据订单号 查询金额

     * 
     * @param orderNo

     * @return

     */

    BigDecimal getMoneyByOrderNo(@Param("orderNo") String orderNo);



    /**

     * 统计已到账返利订单

     * 
     * @param uid

     * @param dateTime

     * @return

     */

    long countValidOrderByDate(@Param("uid") Long uid, @Param("dateTime") String dateTime);



    /**

     * 查询用户在同一店铺购买超过一定数量商品的店铺数量

     * 
     * @param typeList

     *            -红包类型

     * @param uid

     *            -用户ID

     * @param minSameShopGoodsCount

     *            -同一店铺买的最小订单数

     * @return

     */

    long countSameShopOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,

            @Param("minSameShopGoodsCount") int minSameShopGoodsCount);

	
    /**

     * 查询用户购买相同商品超过一定的订单数量的商品数量

     * @param typeList

     * @param uid

     * @param minSameGoodsOrderCount

     * @return

     */

    long countSameGoodsOrderByUidAndHongBaoType(@Param("typeList") List<Integer> typeList, @Param("uid") Long uid,

            @Param("minSameGoodsOrderCount") int minSameGoodsOrderCount);

}

 fanli/src/main/java/com/yeshi/fanli/dao/mybatis/user/UserInfoExtraMapper.java

@@ -60,4 +60,10 @@
     * @return

     */

    void updateGoldCoin(@Param("id")Long id, @Param("goldCoin")Integer goldCoin);

	
    /**

     * 开启提现：超过60天关闭

     * @param days

     */

    void updateAutoExtract(@Param("days")Integer days);

}

 fanli/src/main/java/com/yeshi/fanli/entity/bus/user/UserInfoExtra.java

@@ -85,6 +85,10 @@
    @Column(name = "uie_mark")

    private  String mark;

    

    // 用户最近活跃时间

    @Column(name = "uie_active_time")

    private  Date activeTime;

	
    // 创建时间

    @Column(name = "uie_create_time")

    private Date createTime;

@@ -247,4 +251,12 @@
        this.mark = mark;

    }



    public Date getActiveTime() {

        return activeTime;

    }



    public void setActiveTime(Date activeTime) {

        this.activeTime = activeTime;

    }

	
}


 fanli/src/main/java/com/yeshi/fanli/job/UserRankingsJob.java

@@ -17,6 +17,7 @@
import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserRankingsService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -39,6 +40,9 @@


    @Resource

    private TaoBaoOrderService taoBaoOrderService;

	
    @Resource

    private UserInfoExtraService userInfoExtraService;

    



    // 1加,2减

@@ -130,4 +134,14 @@


    }

    

    /**

     * 自动提现服务端规则，关闭后，第60天系统会自动开启（从关闭日起）

     */

    @Scheduled(cron = "0 50 0 * * ? ")

    public void updateAutoExtract() {

        if (!Constant.IS_TASK) {

            return;

        }

        userInfoExtraService.updateAutoExtract(60);

    }

}


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

@@ -701,11 +701,12 @@
        where u.state=0

    </select>

    

    <select id="getAutoExtractUserIds" resultMap="BaseResultMap">

    <select id="getAutoExtractUser" resultMap="BaseResultMap">

        SELECT u.* FROM `yeshi_ec_user_info_extra` t

        LEFT JOIN  `yeshi_ec_user` u ON u.`id` = t.`uie_uid`

        WHERE t.`uie_auto_extract` = 1 AND u.`state` = 0 AND u.`my_hongBao` <![CDATA[>=]]> #{money} 
        AND u.`wx_open_id` IS NOT NULL AND LENGTH(TRIM(u.`wx_open_id`)) <![CDATA[>]]> 0

        WHERE t.`uie_auto_extract` = 1 AND t.uie_active_time <![CDATA[>=]]> #{beganDate} AND  t.uie_active_time <![CDATA[<]]> #{endDate}

            AND u.`state` = 0 AND u.`my_hongBao` <![CDATA[>=]]> #{money} 
            AND u.`wx_open_id` IS NOT NULL AND LENGTH(TRIM(u.`wx_open_id`)) <![CDATA[>]]> 0

        LIMIT #{start},#{count}

    </select>




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

@@ -1,225 +1,225 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">

<mapper namespace="com.yeshi.fanli.dao.mybatis.order.CommonOrderCountMapper">
    <resultMap id="ChartMap" type="com.yeshi.fanli.dto.ChartTDO">
        <result column="showDate" property="showDate" jdbcType="VARCHAR" />
        <result column="showValue" property="showValue" jdbcType="VARCHAR" />
    </resultMap>


    <sql id="Column_DateType">
        <if test="dateType == 1">
            DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d') AS 'showDate'
        </if>
        <if test="dateType == 2">
            DATE_FORMAT(t.`co_third_create_time`,'%m') AS 'showDate'
        </if>
        <if test="dateType == 3">
            DATE_FORMAT(t.`co_third_create_time`,'%Y') AS 'showDate'
        </if>
    </sql>

    <sql id="Count_Select_DateType">
        <if test="startTime != null and startTime != '' ">
            AND DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d')<![CDATA[ >= ]]>'${startTime}'
        </if>
        <if test="endTime != null and endTime != '' ">
            AND DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d') <![CDATA[ <= ]]>'${endTime}'
        </if>
        <if test="year != null and year != '' ">
            AND DATE_FORMAT(t.`co_third_create_time`,'%Y') = '${year}'
        </if>
    </sql>

    <sql id="Count_Group_DateType">
        <if test="dateType == 1">
            GROUP BY DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d')
        </if>
        <if test="dateType == 2">
            GROUP BY DATE_FORMAT(t.`co_third_create_time`,'%Y-%m')
        </if>
        <if test="dateType == 3">
            GROUP BY DATE_FORMAT(t.`co_third_create_time`,'%Y')
        </if>
    </sql>

    <select id="countByState" resultType="java.lang.Long">
        SELECT IFNULL(COUNT(t.`co_id`),0) FROM  `yeshi_ec_common_order` t 
        WHERE 1=1 
            <if test="type != null"> 
                AND t.`co_state` = #{state}
            </if>
    </select>
	
    <select id="countOrderNumber" resultMap="ChartMap">
        SELECT IFNULL(COUNT(t.`co_id`),0) AS showValue,<include refid="Column_DateType"/>
        FROM `yeshi_ec_common_order` t 
        WHERE t.co_source_type=#{sourceType} and t.`co_third_create_time` IS NOT NULL <include refid="Count_Select_DateType"/> 
        <include refid="Count_Group_DateType"/>
        ORDER BY t.`co_third_create_time`
    </select>
	
	
    <select id="countOrderNumberBySettleTime" resultType="java.util.HashMap">
        <!-- 统计历史订单数量  根据结算时间 -->
        SELECT SUM(A.self)AS totalSelf,SUM(A.shared)AS totalShared,SUM(A.invite)AS totalInvite
        FROM ( 
            <!-- 返利订单 -->
            SELECT IFNULL(COUNT(ho_id),0) AS self,0 AS shared,0 AS invite
            FROM  (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 
                LEFT JOIN ( 
                    SELECT * FROM yeshi_ec_hongbao_v2 v2 
                    WHERE v2.`hb_uid`= ${uid} and v2.hb_state!=4 AND (v2.`hb_type` = 1 OR v2.`hb_type` = 2)
                    ) hb  ON hb.hb_id=ho.`ho_hongbao_id` <!-- 自购订单 -->
            LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
            WHERE hb.hb_id IS NOT NULL 
                 <if test="state != null"> 
                    AND co.`co_state` = ${state} 
                </if>
				
                <if test="day != null and day == 1"> <!-- 今天 -->
                    AND TO_DAYS(co.`co_settle_time`) = TO_DAYS(NOW())
                </if>
                <if test="day != null and day == 2">  <!-- 昨天 -->
                    AND TO_DAYS(NOW()) - TO_DAYS(co.co_settle_time) = 1
                </if>
                <if test="day != null and day == 3">  <!-- 本月 -->
                    AND DATE_FORMAT(co.`co_settle_time`,'%Y%m') =
                    DATE_FORMAT(CURDATE(),'%Y%m')
                </if>
                <if test="day != null and day == 4">  <!-- 上月 -->
                    AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
                    DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
                </if>
            GROUP BY co.`co_order_no`, co.`co_source_type`)YX
			
            UNION ALL
            <!-- 分享订单 -->
            SELECT 0 AS self,IFNULL(COUNT(ho_id),0) AS shared,0 AS invite
            FROM  (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 
                    LEFT JOIN ( 
                        SELECT * FROM yeshi_ec_hongbao_v2 v2 
                        WHERE v2.`hb_uid`= ${uid} AND v2.`hb_type` = 20 and v2.hb_state!=4
                    ) hb  ON hb.hb_id=ho.`ho_hongbao_id`  <!-- 分享订单 -->
	
                LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
                WHERE hb.hb_id IS NOT NULL and hb.hb_state!=4
                    <if test="state != null"> 
                        AND co.`co_state` = ${state} 
                    </if>
					
                    <if test="day != null and day == 1"> <!-- 今天 -->
                        AND TO_DAYS(co.`co_settle_time`) = TO_DAYS(NOW())
                    </if>
                    <if test="day != null and day == 2">  <!-- 昨天 -->
                        AND TO_DAYS(NOW()) - TO_DAYS(co.`co_settle_time`) = 1
                    </if>
                    <if test="day != null and day == 3">  <!-- 本月 -->
                        AND DATE_FORMAT(co.`co_settle_time`,'%Y%m') =
                        DATE_FORMAT(CURDATE(),'%Y%m')
                    </if>
                    <if test="day != null and day == 4">  <!-- 上月 -->
                        AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
                        DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
                    </if>
                GROUP BY co.`co_order_no`, co.`co_source_type`)WQ
				
            UNION ALL
            <!-- 邀请订单 -->
            SELECT 0 AS self,0 AS shared,IFNULL(COUNT(ho_id),0) AS invite 
            FROM  (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 	
                LEFT JOIN ( 
                    SELECT * FROM yeshi_ec_hongbao_v2 v2 
                    WHERE v2.`hb_uid`= ${uid}
                         AND (v2.`hb_type` = 5 OR v2.`hb_type` = 6 OR v2.`hb_type` = 7
                               OR v2.`hb_type` = 21 OR v2.`hb_type` = 22 ) and v2.hb_state!=4
                    ) hbp  ON hbp.hb_pid=ho.`ho_hongbao_id`
                LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
                WHERE  hbp.hb_id IS NOT NULL and hbp.hb_state!=4
                    <if test="state != null"> 
                        AND co.`co_state` = ${state} 
                    </if>
                    <if test="day != null and day == 1"> <!-- 今天 -->
                        AND TO_DAYS(co.`co_settle_time`) = TO_DAYS(NOW())
                    </if>
                    <if test="day != null and day == 2">  <!-- 昨天 -->
                        AND TO_DAYS(NOW()) - TO_DAYS(co.`co_settle_time`) = 1
                    </if>
                    <if test="day != null and day == 3">  <!-- 本月 -->
                        AND DATE_FORMAT(co.`co_settle_time`,'%Y%m') =
                        DATE_FORMAT(CURDATE(),'%Y%m')
                    </if>
                    <if test="day != null and day == 4">  <!-- 上月 -->
                        AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),
                        DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1
                    </if>
                GROUP BY co.`co_order_no`, co.`co_source_type`)SX
        )A
    </select>
	
    <select id="countValidOrder" resultType="java.lang.Long">
        SELECT IFNULL(COUNT(co.`co_id`),0) FROM yeshi_ec_hongbao_order ho 
        LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2 
            WHERE v2.`hb_uid`= #{uid}  AND v2.`hb_type` IN(1,20))hb 
            ON IF(hb.hb_pid IS NULL,hb.hb_id,hb.hb_pid)=ho.`ho_hongbao_id`
        LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`
        WHERE hb.hb_id IS NOT NULL AND <![CDATA[co.`co_state` <> 4]]>
    </select>
	
    <select id="getMoneyByOrderNo" resultType="java.math.BigDecimal">
        SELECT SUM(v2.`hb_money`) FROM yeshi_ec_common_order co 
        LEFT JOIN  yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id`
        LEFT JOIN yeshi_ec_hongbao_v2 v2 ON  v2.hb_id=ho.`ho_hongbao_id` 
        WHERE co.`co_order_no` = #{orderNo}
    </select>
	
    <select id="countValidOrderByDate" resultType="Long">
        SELECT IFNULL(COUNT(co_order_no),0) FROM
            (SELECT DISTINCT co.co_order_no FROM yeshi_ec_common_order co 
             LEFT JOIN  yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id`
             LEFT JOIN yeshi_ec_hongbao_v2 v2 ON  v2.hb_id=ho.`ho_hongbao_id` 
             WHERE co.`co_uid` = #{uid} AND v2.`hb_type` = 1 
                   AND v2.`hb_state` = 3 AND  AND co.`co_third_create_time` <![CDATA[>]]> #{dateTime})A
    </select>
	
    <select id="countSameShopOrderByUidAndHongBaoType" resultType="Long">
        SELECT COUNT(*) FROM
        (
            SELECT a.*,COUNT(*) AS num FROM 
            (
                SELECT co.*,COUNT(*) AS c,g.`cog_shop_id` AS shopId FROM yeshi_ec_common_order co LEFT JOIN yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id` LEFT JOIN yeshi_ec_hongbao_v2 v ON v.`hb_id`=ho.`ho_hongbao_id` LEFT JOIN yeshi_ec_common_order_goods g  ON co.`co_order_goods_id`=g.`cog_id`  WHERE  co.`co_uid`=#{uid} 
                <if test="typeList!=null">
                    <foreach collection="typeList" item="type" open=" and (" separator=" or " close=")">
                        v.`hb_type`=#{type}
                    </foreach>
                </if>
                AND v.`hb_id` IS NOT NULL 
                AND (co.`co_state`=1 OR  co.`co_state`=2 OR co.`co_state`=3)  
                AND g.`cog_shop_id`>0 GROUP BY co.`co_order_no`,co.`co_source_type`
            ) a GROUP BY a.shopId
        ) b WHERE b.num>=#{minSameShopGoodsCount};
    </select>
	
	
    <select id="countSameGoodsOrderByUidAndHongBaoType" resultType="Long">
        SELECT COUNT(*) FROM
        (
            SELECT a.goodsId,COUNT(*) AS c FROM
            (
                SELECT co.`co_order_goods_id` AS goodsId,co.`co_order_no` FROM yeshi_ec_common_order co LEFT JOIN yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id` LEFT JOIN yeshi_ec_hongbao_v2 v ON v.`hb_id`=ho.`ho_hongbao_id` LEFT JOIN yeshi_ec_common_order_goods g  ON co.`co_order_goods_id`=g.`cog_id`  WHERE co.`co_uid`=#{uid} 
                <if test="typeList!=null">
                    <foreach collection="typeList" item="type" open=" and (" separator=" or " close=")">
                        v.`hb_type`=#{type}
                    </foreach>
                </if>
                AND v.`hb_id` IS NOT NULL
                AND (co.`co_state`=1 OR  co.`co_state`=2 OR co.`co_state`=3) 
                GROUP BY co.`co_order_no`,co.`co_order_goods_id`
            ) a GROUP BY goodsId 
        ) b WHERE b.c>=#{minSameGoodsOrderCount}
    </select>
	
	
	
</mapper>
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">



<mapper namespace="com.yeshi.fanli.dao.mybatis.order.CommonOrderCountMapper">

    <resultMap id="ChartMap" type="com.yeshi.fanli.dto.ChartTDO">

        <result column="showDate" property="showDate" jdbcType="VARCHAR" />

        <result column="showValue" property="showValue" jdbcType="VARCHAR" />

    </resultMap>





    <sql id="Column_DateType">

        <if test="dateType == 1">

            DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d') AS 'showDate'

        </if>

        <if test="dateType == 2">

            DATE_FORMAT(t.`co_third_create_time`,'%m') AS 'showDate'

        </if>

        <if test="dateType == 3">

            DATE_FORMAT(t.`co_third_create_time`,'%Y') AS 'showDate'

        </if>

    </sql>



    <sql id="Count_Select_DateType">

        <if test="startTime != null and startTime != '' ">

            AND DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d')<![CDATA[ >= ]]>'${startTime}'

        </if>

        <if test="endTime != null and endTime != '' ">

            AND DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d') <![CDATA[ <= ]]>'${endTime}'

        </if>

        <if test="year != null and year != '' ">

            AND DATE_FORMAT(t.`co_third_create_time`,'%Y') = '${year}'

        </if>

    </sql>



    <sql id="Count_Group_DateType">

        <if test="dateType == 1">

            GROUP BY DATE_FORMAT(t.`co_third_create_time`,'%Y-%m-%d')

        </if>

        <if test="dateType == 2">

            GROUP BY DATE_FORMAT(t.`co_third_create_time`,'%Y-%m')

        </if>

        <if test="dateType == 3">

            GROUP BY DATE_FORMAT(t.`co_third_create_time`,'%Y')

        </if>

    </sql>



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

        SELECT IFNULL(COUNT(t.`co_id`),0) FROM  `yeshi_ec_common_order` t 
        WHERE 1=1 
            <if test="type != null"> 
                AND t.`co_state` = #{state}

            </if>

    </select>

	
    <select id="countOrderNumber" resultMap="ChartMap">

        SELECT IFNULL(COUNT(t.`co_id`),0) AS showValue,<include refid="Column_DateType"/>

        FROM `yeshi_ec_common_order` t 
        WHERE t.co_source_type=#{sourceType} and t.`co_third_create_time` IS NOT NULL <include refid="Count_Select_DateType"/> 
        <include refid="Count_Group_DateType"/>

        ORDER BY t.`co_third_create_time`

    </select>

	
	
    <select id="countOrderNumberBySettleTime" resultType="java.util.HashMap">

        <!-- 统计历史订单数量  根据结算时间 -->

        SELECT SUM(A.self)AS totalSelf,SUM(A.shared)AS totalShared,SUM(A.invite)AS totalInvite

        FROM ( 
            <!-- 返利订单 -->

            SELECT IFNULL(COUNT(ho_id),0) AS self,0 AS shared,0 AS invite

            FROM  (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 
                LEFT JOIN ( 
                    SELECT * FROM yeshi_ec_hongbao_v2 v2 
                    WHERE v2.`hb_uid`= ${uid} and v2.hb_state!=4 AND (v2.`hb_type` = 1 OR v2.`hb_type` = 2)

                    ) hb  ON hb.hb_id=ho.`ho_hongbao_id` <!-- 自购订单 -->

            LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`

            WHERE hb.hb_id IS NOT NULL 
                 <if test="state != null"> 
                    AND co.`co_state` = ${state} 
                </if>

				
                <if test="day != null and day == 1"> <!-- 今天 -->

                    AND TO_DAYS(co.`co_settle_time`) = TO_DAYS(NOW())

                </if>

                <if test="day != null and day == 2">  <!-- 昨天 -->

                    AND TO_DAYS(NOW()) - TO_DAYS(co.co_settle_time) = 1

                </if>

                <if test="day != null and day == 3">  <!-- 本月 -->

                    AND DATE_FORMAT(co.`co_settle_time`,'%Y%m') =

                    DATE_FORMAT(CURDATE(),'%Y%m')

                </if>

                <if test="day != null and day == 4">  <!-- 上月 -->

                    AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),

                    DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1

                </if>

            GROUP BY co.`co_order_no`, co.`co_source_type`)YX

			
            UNION ALL

            <!-- 分享订单 -->

            SELECT 0 AS self,IFNULL(COUNT(ho_id),0) AS shared,0 AS invite

            FROM  (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 
                    LEFT JOIN ( 
                        SELECT * FROM yeshi_ec_hongbao_v2 v2 
                        WHERE v2.`hb_uid`= ${uid} AND v2.`hb_type` = 20 and v2.hb_state!=4

                    ) hb  ON hb.hb_id=ho.`ho_hongbao_id`  <!-- 分享订单 -->

	
                LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`

                WHERE hb.hb_id IS NOT NULL and hb.hb_state!=4

                    <if test="state != null"> 
                        AND co.`co_state` = ${state} 
                    </if>

					
                    <if test="day != null and day == 1"> <!-- 今天 -->

                        AND TO_DAYS(co.`co_settle_time`) = TO_DAYS(NOW())

                    </if>

                    <if test="day != null and day == 2">  <!-- 昨天 -->

                        AND TO_DAYS(NOW()) - TO_DAYS(co.`co_settle_time`) = 1

                    </if>

                    <if test="day != null and day == 3">  <!-- 本月 -->

                        AND DATE_FORMAT(co.`co_settle_time`,'%Y%m') =

                        DATE_FORMAT(CURDATE(),'%Y%m')

                    </if>

                    <if test="day != null and day == 4">  <!-- 上月 -->

                        AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),

                        DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1

                    </if>

                GROUP BY co.`co_order_no`, co.`co_source_type`)WQ

				
            UNION ALL

            <!-- 邀请订单 -->

            SELECT 0 AS self,0 AS shared,IFNULL(COUNT(ho_id),0) AS invite 
            FROM  (SELECT ho.`ho_id` FROM yeshi_ec_hongbao_order ho 	
                LEFT JOIN ( 
                    SELECT * FROM yeshi_ec_hongbao_v2 v2 
                    WHERE v2.`hb_uid`= ${uid}

                         AND (v2.`hb_type` = 5 OR v2.`hb_type` = 6 OR v2.`hb_type` = 7

                               OR v2.`hb_type` = 21 OR v2.`hb_type` = 22 ) and v2.hb_state!=4

                    ) hbp  ON hbp.hb_pid=ho.`ho_hongbao_id`

                LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`

                WHERE  hbp.hb_id IS NOT NULL and hbp.hb_state!=4

                    <if test="state != null"> 
                        AND co.`co_state` = ${state} 
                    </if>

                    <if test="day != null and day == 1"> <!-- 今天 -->

                        AND TO_DAYS(co.`co_settle_time`) = TO_DAYS(NOW())

                    </if>

                    <if test="day != null and day == 2">  <!-- 昨天 -->

                        AND TO_DAYS(NOW()) - TO_DAYS(co.`co_settle_time`) = 1

                    </if>

                    <if test="day != null and day == 3">  <!-- 本月 -->

                        AND DATE_FORMAT(co.`co_settle_time`,'%Y%m') =

                        DATE_FORMAT(CURDATE(),'%Y%m')

                    </if>

                    <if test="day != null and day == 4">  <!-- 上月 -->

                        AND PERIOD_DIFF(DATE_FORMAT(NOW(), '%Y%m'),

                        DATE_FORMAT(co.`co_settle_time`, '%Y%m')) = 1

                    </if>

                GROUP BY co.`co_order_no`, co.`co_source_type`)SX

        )A

    </select>

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

        SELECT IFNULL(COUNT(co.`co_id`),0) FROM yeshi_ec_hongbao_order ho 
        LEFT JOIN (SELECT * FROM yeshi_ec_hongbao_v2 v2 
            WHERE v2.`hb_uid`= #{uid}  AND v2.`hb_type` IN(1,20))hb 
            ON IF(hb.hb_pid IS NULL,hb.hb_id,hb.hb_pid)=ho.`ho_hongbao_id`

        LEFT JOIN yeshi_ec_common_order co ON co.`co_id`=ho.`ho_order_id`

        WHERE hb.hb_id IS NOT NULL AND <![CDATA[co.`co_state` <> 4]]>

    </select>

	
    <select id="getMoneyByOrderNo" resultType="java.math.BigDecimal">

        SELECT SUM(v2.`hb_money`) FROM yeshi_ec_common_order co 
        LEFT JOIN  yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id`

        LEFT JOIN yeshi_ec_hongbao_v2 v2 ON  v2.hb_id=ho.`ho_hongbao_id` 
        WHERE co.`co_order_no` = #{orderNo}

    </select>

	
    <select id="countValidOrderByDate" resultType="Long">

        SELECT IFNULL(COUNT(co_order_no),0) FROM

            (SELECT DISTINCT co.co_order_no FROM yeshi_ec_common_order co 
             LEFT JOIN  yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id`

             LEFT JOIN yeshi_ec_hongbao_v2 v2 ON  v2.hb_id=ho.`ho_hongbao_id` 
             WHERE co.`co_uid` = #{uid} AND v2.`hb_type` = 1 
                   AND v2.`hb_state` = 3 AND  AND co.`co_third_create_time` <![CDATA[>]]> #{dateTime})A

    </select>

	
    <select id="countSameShopOrderByUidAndHongBaoType" resultType="Long">

        SELECT COUNT(*) FROM

        (

            SELECT a.*,COUNT(*) AS num FROM 
            (

                SELECT co.*,COUNT(*) AS c,g.`cog_shop_id` AS shopId FROM yeshi_ec_common_order co LEFT JOIN yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id` LEFT JOIN yeshi_ec_hongbao_v2 v ON v.`hb_id`=ho.`ho_hongbao_id` LEFT JOIN yeshi_ec_common_order_goods g  ON co.`co_order_goods_id`=g.`cog_id`  WHERE  co.`co_uid`=#{uid} 
                <if test="typeList!=null">

                    <foreach collection="typeList" item="type" open=" and (" separator=" or " close=")">

                        v.`hb_type`=#{type}

                    </foreach>

                </if>

                AND v.`hb_id` IS NOT NULL 
                AND (co.`co_state`=1 OR  co.`co_state`=2 OR co.`co_state`=3)  
                AND g.`cog_shop_id`>0 GROUP BY co.`co_order_no`,co.`co_source_type`

            ) a GROUP BY a.shopId

        ) b WHERE b.num>=#{minSameShopGoodsCount};

    </select>

	
	
    <select id="countSameGoodsOrderByUidAndHongBaoType" resultType="Long">

        SELECT COUNT(*) FROM

        (

            SELECT a.goodsId,COUNT(*) AS c FROM

            (

                SELECT co.`co_order_goods_id` AS goodsId,co.`co_order_no` FROM yeshi_ec_common_order co LEFT JOIN yeshi_ec_hongbao_order ho ON co.`co_id`=ho.`ho_order_id` LEFT JOIN yeshi_ec_hongbao_v2 v ON v.`hb_id`=ho.`ho_hongbao_id` LEFT JOIN yeshi_ec_common_order_goods g  ON co.`co_order_goods_id`=g.`cog_id`  WHERE co.`co_uid`=#{uid} 
                <if test="typeList!=null">

                    <foreach collection="typeList" item="type" open=" and (" separator=" or " close=")">

                        v.`hb_type`=#{type}

                    </foreach>

                </if>

                AND v.`hb_id` IS NOT NULL

                AND (co.`co_state`=1 OR  co.`co_state`=2 OR co.`co_state`=3) 
                GROUP BY co.`co_order_no`,co.`co_order_goods_id`

            ) a GROUP BY goodsId 
        ) b WHERE b.c>=#{minSameGoodsOrderCount}

    </select>

	
	
	
</mapper>


 fanli/src/main/java/com/yeshi/fanli/mapping/user/UserInfoExtraMapper.xml

@@ -30,6 +30,7 @@
        <result column="uie_auto_extract" property="autoExtract"

            jdbcType="BOOLEAN" />

        <result column="uie_close_time_extract" property="closeTimeExtract"    jdbcType="TIMESTAMP" />

        <result column="uie_active_time" property="activeTime"    jdbcType="TIMESTAMP" />

        <result column="uie_mark" property="mark" jdbcType="VARCHAR" />

        <association property="userInfo" column="uie_uid"

            javaType="com.yeshi.fanli.entity.bus.user.UserInfo">

@@ -71,6 +72,7 @@
            jdbcType="BOOLEAN" />

            

        <result column="uie_close_time_extract" property="closeTimeExtract"    jdbcType="TIMESTAMP" />

        <result column="uie_active_time" property="activeTime"    jdbcType="TIMESTAMP" />

        <result column="uie_mark" property="mark" jdbcType="VARCHAR" />

        <association property="userInfo" column="uie_uid"

            resultMap="com.yeshi.fanli.dao.mybatis.UserInfoMapper.BaseResultMap" />

@@ -109,6 +111,7 @@
            jdbcType="BOOLEAN" />

        

        <result column="uie_close_time_extract" property="closeTimeExtract"    jdbcType="TIMESTAMP" />

        <result column="uie_active_time" property="activeTime"    jdbcType="TIMESTAMP" />

        <result column="uie_mark" property="mark" jdbcType="VARCHAR" />

        

        <association property="userInfo" column="uie_uid"

@@ -122,7 +125,7 @@






    <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract,uie_mark

    <sql id="Base_Column_List">uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract,uie_active_time,uie_mark

    </sql>



    <select id="selectByPrimaryKey" resultMap="BaseResultMap"

@@ -138,9 +141,9 @@
    <insert id="insert" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra"

        useGeneratedKeys="true" keyProperty="id">insert into

        yeshi_ec_user_info_extra

        (uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract,uie_mark)

        (uie_id,uie_uid,uie_rank_id,uie_rank_source,uie_rank_order_num,uie_rank_update_time,uie_invite_code,uie_lottery_newbies,uie_coupon_news,uie_synch_navbar,uie_first_login_time,uie_sex,uie_weixin,uie_gold_coin,uie_create_time,uie_update_time,uie_auto_extract,uie_close_time_extract,uie_active_time,uie_mark)

        values

        (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{userRank.id,jdbcType=BIGINT},#{rankSource,jdbcType=INTEGER},#{rankOrderNum,jdbcType=INTEGER},#{rankUpdateTime,jdbcType=TIMESTAMP},#{inviteCode,jdbcType=VARCHAR},#{lotteryNewbies,jdbcType=INTEGER},#{couponNews,jdbcType=INTEGER},#{synchNavbar,jdbcType=VARCHAR},#{firstLoginTime,jdbcType=TIMESTAMP},#{sex,jdbcType=INTEGER},#{weiXin,jdbcType=VARCHAR},#{goldCoin,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{autoExtract,jdbcType=BOOLEAN},#{closeTimeExtract,jdbcType=TIMESTAMP},#{mark,jdbcType=VARCHAR})

        (#{id,jdbcType=BIGINT},#{userInfo.id,jdbcType=BIGINT},#{userRank.id,jdbcType=BIGINT},#{rankSource,jdbcType=INTEGER},#{rankOrderNum,jdbcType=INTEGER},#{rankUpdateTime,jdbcType=TIMESTAMP},#{inviteCode,jdbcType=VARCHAR},#{lotteryNewbies,jdbcType=INTEGER},#{couponNews,jdbcType=INTEGER},#{synchNavbar,jdbcType=VARCHAR},#{firstLoginTime,jdbcType=TIMESTAMP},#{sex,jdbcType=INTEGER},#{weiXin,jdbcType=VARCHAR},#{goldCoin,jdbcType=INTEGER},#{createTime,jdbcType=TIMESTAMP},#{updateTime,jdbcType=TIMESTAMP},#{autoExtract,jdbcType=BOOLEAN},#{closeTimeExtract,jdbcType=TIMESTAMP},#{activeTime,jdbcType=TIMESTAMP},#{mark,jdbcType=VARCHAR})

    </insert>



    <insert id="insertSelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra"

@@ -165,6 +168,7 @@
            <if test="updateTime != null">uie_update_time,</if>

            <if test="autoExtract != null">uie_auto_extract,</if>

            <if test="closeTimeExtract != null">uie_close_time_extract,</if>

            <if test="activeTime != null">uie_active_time,</if>

            <if test="mark != null">uie_mark,</if>

        </trim>

        values

@@ -187,6 +191,7 @@
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="autoExtract != null">#{autoExtract,jdbcType=BOOLEAN},</if>

            <if test="closeTimeExtract != null">#{closeTimeExtract,jdbcType=TIMESTAMP},</if>

            <if test="activeTime != null">#{activeTime,jdbcType=TIMESTAMP},</if>

            <if test="mark != null">#{mark,jdbcType=VARCHAR},</if>

        </trim>

    </insert>

@@ -208,7 +213,8 @@
        #{createTime,jdbcType=TIMESTAMP},uie_update_time =

        #{updateTime,jdbcType=TIMESTAMP},uie_auto_extract =

        #{autoExtract,jdbcType=BOOLEAN},uie_close_time_extract =

        #{closeTimeExtract,jdbcType=TIMESTAMP},uie_mark =

        #{closeTimeExtract,jdbcType=TIMESTAMP},uie_active_time =

        #{activeTime,jdbcType=TIMESTAMP},uie_mark =

        #{mark,jdbcType=VARCHAR}  where uie_id = #{id,jdbcType=BIGINT}

    </update>

    <update id="updateByPrimaryKeySelective" parameterType="com.yeshi.fanli.entity.bus.user.UserInfoExtra">

@@ -233,6 +239,7 @@
            <if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="autoExtract != null">uie_auto_extract=#{autoExtract,jdbcType=BOOLEAN},</if>

            <if test="closeTimeExtract != null">uie_close_time_extract=#{closeTimeExtract,jdbcType=TIMESTAMP},</if>

            <if test="activeTime != null">uie_active_time=#{activeTime,jdbcType=TIMESTAMP},</if>

            <if test="mark != null">uie_mark=#{mark,jdbcType=VARCHAR},</if>

        </set>

        where uie_id = #{id,jdbcType=BIGINT}

@@ -259,6 +266,7 @@
            <if test="updateTime != null">uie_update_time=#{updateTime,jdbcType=TIMESTAMP},</if>

            <if test="autoExtract != null">uie_auto_extract=#{autoExtract,jdbcType=BOOLEAN},</if>

            <if test="closeTimeExtract != null">uie_close_time_extract=#{closeTimeExtract,jdbcType=TIMESTAMP},</if>

            <if test="activeTime != null">uie_active_time=#{activeTime,jdbcType=TIMESTAMP},</if>

            <if test="mark != null">uie_mark=#{mark,jdbcType=VARCHAR},</if>

        </set>

        where uie_uid = #{userInfo.id,jdbcType=BIGINT}

@@ -308,4 +316,9 @@
        rk.`ur_id` = ue.`uie_rank_id`

        WHERE ue.`uie_uid` = #{uid}

    </select>

	
    <update id="updateAutoExtract">

        UPDATE yeshi_ec_user_info_extra SET uie_auto_extract = 1 
        WHERE uie_auto_extract = 0 AND DATEDIFF(NOW(),uie_close_time_extract) <![CDATA[>]]> #{days}

    </update>

</mapper>


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/extract/ExtractServiceImpl.java

@@ -961,6 +961,9 @@
        int pageSize = 100;

        int maxSize = 300;

        Date nowDate = new Date();

        // 一、自动提现针对的用户群： 前提条件:用户在距今60天到90天内未活跃过的用户

        String beganDate = DateUtil.reduceDayTostring(90, nowDate);

        String endDate = DateUtil.reduceDayTostring(60, nowDate);

        // 条件3：距离上一次成功领取微信红包已经超过了30天时间，可在第31天再次下发；

        String receivedDate = DateUtil.reduceDayTostring(30, nowDate);

        // 条件4：距离上一次未成功领取微信红包已经超过了15天时间，可在第16天再次下发；

@@ -973,7 +976,7 @@
        

        while (true) {

            // 查询满足条件 1、2 的uid

            List<UserInfo> listUser = userInfoService.getAutoExtractUserIds(page * pageSize, pageSize, minSurplus);

            List<UserInfo> listUser = userInfoService.getAutoExtractUser(page * pageSize, pageSize, minSurplus, beganDate, endDate);

            if (listUser == null || listUser.isEmpty())

                break;

            

@@ -1019,6 +1022,9 @@
        int pageSize = 100;

        int maxSize = 301; // appId + 实际openid300个

        Date nowDate = new Date();

        // 一、自动提现针对的用户群： 前提条件:用户在距今60天到90天内未活跃过的用户

        String beganDate = DateUtil.reduceDayTostring(90, nowDate);

        String endDate = DateUtil.reduceDayTostring(60, nowDate);

        // 条件3：距离上一次成功领取微信红包已经超过了30天时间，可在第31天再次下发；

        String receivedDate = DateUtil.reduceDayTostring(30, nowDate);

        // 条件4：距离上一次未成功领取微信红包已经超过了15天时间，可在第16天再次下发；

@@ -1035,7 +1041,7 @@
        

        while (true) {

            // 查询满足条件 1、2 的uid

            List<UserInfo> listUser = userInfoService.getAutoExtractUserIds(page * pageSize, pageSize, minSurplus);

            List<UserInfo> listUser = userInfoService.getAutoExtractUser(page * pageSize, pageSize, minSurplus, beganDate, endDate);

            if (listUser == null || listUser.isEmpty())

                break;

            

@@ -1136,8 +1142,8 @@
            

        // 状态过滤

        String statusOld = record.getStatus();

        if (StringUtil.isNullOrEmpty(statusOld) ||ExtractWeiXinRecord.REFUND.equals(statusOld) 
                || ExtractWeiXinRecord.RFUND_ING.equals(statusOld)) 
        if (StringUtil.isNullOrEmpty(statusOld) || ExtractWeiXinRecord.REFUND.equals(statusOld) 
                || ExtractWeiXinRecord.RECEIVED.equals(statusOld)) 
            return;

        

        ExtractWeiXinRecord updeteRecord = new ExtractWeiXinRecord();

@@ -1191,25 +1197,28 @@
            }  

        }

        updeteRecord.setStatus(status);

		
        // 更新红包记录

        extractWeiXinRecordService.updateByPrimaryKeySelective(updeteRecord);

        

        if (!ExtractWeiXinRecord.REFUND.equals(status))

            return;

		
        // 资金明细

        UserMoneyDetail detail = new UserMoneyDetail();

        detail.setCreateTime(new Date());

        detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractAutoWXRefund.name() + ":" + record.getId()));

        detail.setMoney(record.getMoney());

        detail.setTitle(UserMoneyDetailTypeEnum.extractAutoWXRefund.getDesc());

        detail.setType(UserMoneyDetailTypeEnum.extractAutoWXRefund);

        detail.setUpdateTime(new Date());

        detail.setUserInfo(new UserInfo(record.getUid()));

		
        // 资金计算

        userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);

        if (ExtractWeiXinRecord.RECEIVED.equals(status)) {

            // 发送消息通知

            userMoneyMsgNotificationService.extractAuto(record, "已领取-已提现", null, null);

        } else if (ExtractWeiXinRecord.REFUND.equals(status)) {

            // 资金明细

            UserMoneyDetail detail = new UserMoneyDetail();

            detail.setCreateTime(new Date());

            detail.setIdentifyCode(StringUtil.Md5(UserMoneyDetailTypeEnum.extractAutoWXRefund.name() + ":" + record.getId()));

            detail.setMoney(record.getMoney());

            detail.setTitle(UserMoneyDetailTypeEnum.extractAutoWXRefund.getDesc());

            detail.setType(UserMoneyDetailTypeEnum.extractAutoWXRefund);

            detail.setUpdateTime(new Date());

            detail.setUserInfo(new UserInfo(record.getUid()));

			
            // 资金计算

            userMoneyService.addUserMoney(record.getUid(), record.getMoney(), detail);

			
            // 发送消息通知

            userMoneyMsgNotificationService.extractAuto(record, "已退回-余额中", null, null);

        }

    }

    

}


 fanli/src/main/java/com/yeshi/fanli/service/impl/money/msg/MsgMoneyDetailServiceImpl.java

@@ -110,10 +110,22 @@
        } else if (detail.getMsgType() == MsgTypeMoneyTypeEnum.extractAutoWX) {

            if (detail.getMoney() == null || detail.getUser() == null)

                throw new MsgMoneyDetailException(2, "消息信息不全");

            detail.setCreateTime(new Date());

            detail.setUpdateTime(new Date());

            detail.setRead(false);

            msgMoneyDetailMapper.insertSelective(detail);

			
            MsgMoneyDetail msg = msgMoneyDetailMapper.selectBySourceIdAndMsgType(detail.getExtract().getId(),

                    MsgTypeMoneyTypeEnum.extractAutoWX);

            if (msg == null) {

                detail.setCreateTime(new Date());

                detail.setUpdateTime(new Date());

                detail.setRead(false);

                msgMoneyDetailMapper.insertSelective(detail);

            } else {

                MsgMoneyDetail update = new MsgMoneyDetail();

                update.setId(msg.getId());

                update.setUpdateTime(new Date());

                update.setRead(false);

                update.setStateDesc(detail.getStateDesc());

                msgMoneyDetailMapper.updateByPrimaryKeySelective(update);

            }

        }



        userMsgReadStateService.addMoneyMsgUnReadCount(detail.getUser().getId(), 1);


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

@@ -9,12 +9,16 @@
import com.yeshi.fanli.dao.mybatis.user.UserActiveLogMapper;

import com.yeshi.fanli.entity.bus.user.UserActiveLog;

import com.yeshi.fanli.service.inter.user.UserActiveLogService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;



@Service

public class UserActiveLogServiceImpl implements UserActiveLogService {



    @Resource

    private UserActiveLogMapper userActiveLogMapper;

	
    @Resource

    private UserInfoExtraService userInfoExtraService;



    @Override

    public void addUserActiveLog(UserActiveLog userActiveLog) {

@@ -28,6 +32,8 @@
            userActiveLog.setCreateTime(new Date());

            userActiveLog.setUpdateTime(new Date());

            userActiveLogMapper.insertSelective(userActiveLog);

            // 更新最新活跃时间

            userInfoExtraService.updateActiveTime(userActiveLog.getUid() , new Date());

        } else if (latestLog != null) {

            // 如果设备 ，版本，渠道有变化则需要更改

            String oldIdentify = latestLog.getDevice() + "#" + latestLog.getVersionCode() + "#"

@@ -38,6 +44,8 @@
                userActiveLog.setCreateTime(new Date());

                userActiveLog.setUpdateTime(new Date());

                userActiveLogMapper.insertSelective(userActiveLog);

                // 更新最新活跃时间

                userInfoExtraService.updateActiveTime(userActiveLog.getUid() , new Date());

            }

        }

    }


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

@@ -648,6 +648,16 @@
        }

    }

    

	
    @Override

    public void updateActiveTime(Long uid, Date date) {

        UserInfoExtra userInfoExtra = new UserInfoExtra();

        userInfoExtra.setUserInfo(new UserInfo(uid));

        userInfoExtra.setActiveTime(date);

        userInfoExtraMapper.updateInfoExtraByUid(userInfoExtra);

    }

	
	
    @Override

    public UserInfoExtra getUserInfoExtra(Long uid) {

        return userInfoExtraMapper.getInfoExtraByUid(uid);

@@ -797,5 +807,9 @@
        }

        return inviter;

    }

	


    @Override

    public void updateAutoExtract(Integer days) {

        userInfoExtraMapper.updateAutoExtract(days);

    }

}


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

@@ -652,8 +652,8 @@
    

    

    @Override

    public List<UserInfo> getAutoExtractUserIds(int start, int count, BigDecimal minSurplus) {

        return userInfoMapper.getAutoExtractUserIds(start, count, minSurplus);

    public List<UserInfo> getAutoExtractUser(int start, int count, BigDecimal minSurplus, String beganDate,String endDate) {

        return userInfoMapper.getAutoExtractUser(start, count, minSurplus, beganDate, endDate);

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoExtraService.java

@@ -1,5 +1,9 @@
package com.yeshi.fanli.service.inter.user;



import java.util.Date;



import org.apache.ibatis.annotations.Param;



import com.yeshi.fanli.dto.wx.WXAccountInfoDTO;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.bus.user.UserInfoExtra;

@@ -145,5 +149,17 @@
     * @throws UserInfoExtraException

     */

    public void activeInviteWX(Long uid, WeiXinUser weiXinUser) throws UserInfoExtraException;



    /**

     * 根据用户id更新信息

     * @param userInfoExtra

     */

    public void updateActiveTime(Long uid, Date date);

	
    /**

     *开启自动提现： 更新超过期限的

     * @param days

     */

    void updateAutoExtract(@Param("days")Integer days);

    

}


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserInfoService.java

@@ -188,6 +188,6 @@
     * @param page

     * @param count

     */

    public List<UserInfo> getAutoExtractUserIds(int page, int count, BigDecimal minSurplus);

    public List<UserInfo> getAutoExtractUser(int page, int count, BigDecimal minSurplus, String beganDate,String endDate);



}