fanli-server.git

parent: f94a5a1d | 补丁 | 提交 | show whitespace

admin

2020-06-29 941271bb52d26e484e2fe9c82d19bd9f94b84838

拉新与免单JOB修改

8个文件已修改

	fanli/src/main/java/com/yeshi/fanli/controller/client/v2/SearchControllerV2.java	26 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/goods/FreeGoodsCouponJob.java	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -31,7 +31,6 @@
import com.yeshi.fanli.dto.vip.VIPSearchResult;

import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;

import com.yeshi.fanli.entity.accept.AcceptData;

import com.yeshi.fanli.entity.bus.activity.RecommendActivity;

import com.yeshi.fanli.entity.bus.help.AppPageNotification;

import com.yeshi.fanli.entity.goods.CommonGoods;

import com.yeshi.fanli.entity.jd.JDGoods;

@@ -88,7 +87,6 @@
import com.yeshi.fanli.vo.recommend.RecommendJumpInfoVO;

import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;



import net.sf.json.JSON;

import net.sf.json.JSONArray;

import net.sf.json.JSONObject;



@@ -296,7 +294,7 @@
                                                                        acceptData.getPlatform(),

                                                                        acceptData.getVersion()))));

                                        // 跳转详情

                                        if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),

                                        if (VersionUtil.greaterThan_2_1_3(acceptData.getPlatform(),

                                                acceptData.getVersion())) {

                                            buildGoodsClick(data, goods, acceptData, gson);

                                        }

@@ -315,9 +313,11 @@
                                                            orderHongBaoMoneyComputeService.getShowComputeRate(

                                                                    acceptData.getPlatform(),

                                                                    acceptData.getVersion()))));

//                                    if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),

                                    // if

                                    // (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),

//                                            acceptData.getVersion())) {

//                                        buildGoodsClick(data, goods, acceptData, gson);

                                    // buildGoodsClick(data, goods, acceptData,

                                    // gson);

//                                    }

                                    out.print(JsonUtil.loadTrueResult(data));

                                    return;

@@ -406,20 +406,26 @@
        

        }



        RecommendJumpInfoVO left = new RecommendJumpInfoVO(

                "去看看", jumpDetailV2Service.getByTypeCache(type,

                        Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())),

                params);

        RecommendJumpInfoVO left = new RecommendJumpInfoVO("去看看", jumpDetailV2Service.getByTypeCache(type,

                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params);

        data.put("left", gson.toJson(left));

        

        // 去网页

        String rightValue = configService.getByVersion(ConfigKeyEnum.clipboardRecommendGoodsMakeMore.name(),

                acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));



        if (StringUtil.isNullOrEmpty(rightValue)) {

            data.remove("left");

        } else {

        params = new JSONObject();

        params.put("url", "http://www.baidu.com");



        RecommendJumpInfoVO right = new RecommendJumpInfoVO("有更高返利？", jumpDetailV2Service.getByTypeCache("web",

                Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params);

                    Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())),

                    params);

        data.put("right", gson.toJson(right));

    }

    }



    /**

     * 口令领取


 fanli/src/main/java/com/yeshi/fanli/entity/system/ConfigKeyEnum.java

@@ -225,7 +225,10 @@
    
    cloudAlipayJumpLink("cloud_alipay_jump_link","云发单支付跳转地址"),
    cloudAlipayReturnLink("cloud_alipay_return_link","云发单支付成功后返回哪个前端页面"),
    cloudAlipayNotifyLink("cloud_alipay_notify_link","云发单支付成功后回调地址");
    cloudAlipayNotifyLink("cloud_alipay_notify_link","云发单支付成功后回调地址"),
	
    clipboardRecommendGoodsMakeMore("clipboard_recommend_goods_make_more_link","根据粘贴板推荐商品赚更多链接")
    ;
    
    
    

 fanli/src/main/java/com/yeshi/fanli/job/goods/FreeGoodsCouponJob.java

@@ -2,6 +2,7 @@


import java.math.BigDecimal;

import java.util.ArrayList;

import java.util.Date;

import java.util.List;



import javax.annotation.Resource;

@@ -9,6 +10,8 @@
import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;



import com.xxl.job.core.biz.model.ReturnT;

import com.xxl.job.core.handler.annotation.XxlJob;

import com.yeshi.fanli.dto.ConfigParamsDTO;

import com.yeshi.fanli.dto.jd.JDCommissionInfo;

import com.yeshi.fanli.dto.jd.JDFilter;

@@ -28,6 +31,7 @@
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;

import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;

import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;

@@ -55,17 +59,14 @@
    @Resource

    private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;



    @Scheduled(cron = "0 5 0/1 * * ? ")

    public void addFreeGoods() {

        if (!Constant.IS_TASK) {

            return;

        }

        



    @XxlJob("freeGoodsCouponJob-addFreeGoods")

    public ReturnT<String> startPreOrderTeamIncome(String param) throws Exception {

        updateGoodsTB();

		
        updateGoodsPDD();

        return ReturnT.SUCCESS;

    }

	
    

    /**

     * 更新淘宝商品-免单

@@ -101,7 +102,7 @@
                    

                    TaoBaoGoodsBrief tbGoods = TaoBaoGoodsFactory.create(itemDetail);

                    GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(tbGoods, params);

                    if (detailVO.getCouponPrice() == null) {

                    if (detailVO.getCouponPrice() != null) {

                        if (detailVO.getCouponPrice().compareTo(limitPrice) > 0)

                            continue;

                    } else if (detailVO.getZkPrice().compareTo(limitPrice) > 0) {

@@ -211,13 +212,12 @@


                    GoodsDetailVO detailVO = GoodsDetailVOFactory.convertJDGoods(goodsInfo, params);

                    

                    if (detailVO.getCouponPrice() == null) {

                    if (detailVO.getCouponPrice() != null) {

                        if (detailVO.getCouponPrice().compareTo(limitPrice) > 0)

                            continue;

                    } else if (detailVO.getZkPrice().compareTo(limitPrice) > 0) {

                        continue;

                    }

					
                    

                    boolean saveResult = freeGoodsCouponService.saveFreeGoods(detailVO);

                    if (saveResult) {

@@ -320,7 +320,7 @@
                        continue;



                    GoodsDetailVO detailVO = GoodsDetailVOFactory.convertPDDGoods(goodsInfo, params);

                    if (detailVO.getCouponPrice() == null) {

                    if (detailVO.getCouponPrice() != null) {

                        if (detailVO.getCouponPrice().compareTo(limitPrice) > 0)

                            continue;

                    } else if (detailVO.getZkPrice().compareTo(limitPrice) > 0) {


 fanli/src/main/java/com/yeshi/fanli/job/goods/PullNewJob.java

@@ -8,17 +8,17 @@
import javax.annotation.Resource;



import org.apache.commons.beanutils.PropertyUtils;

import org.springframework.scheduling.annotation.Scheduled;

import org.springframework.stereotype.Component;

import org.yeshi.utils.DateUtil;



import com.xxl.job.core.biz.model.ReturnT;

import com.xxl.job.core.handler.annotation.XxlJob;

import com.yeshi.fanli.dto.taobao.haodanku.HDKGoodsListResultDTO;

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

import com.yeshi.fanli.entity.goods.PullNewGoods;

import com.yeshi.fanli.entity.taobao.haodanku.HDKGoodsDetail;

import com.yeshi.fanli.service.inter.goods.PullNewGoodsService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;



@Component

@@ -31,15 +31,24 @@
    @Resource

    private PullNewGoodsService pullNewGoodsService;



	
    @XxlJob("pullNewJob-addPullNewGoods")

    public ReturnT<String> addPullNewGoods(String param) throws Exception {

        addPullNewGoods();

        return ReturnT.SUCCESS;

    }

	
	
    @XxlJob("pullNewJob-updateReward")

    public ReturnT<String> updateReward(String param) throws Exception {

        updateReward();

        return ReturnT.SUCCESS;

    }



    /**

     * 拉新商品

     */

    @Scheduled(cron = "0 30 1 * * ? ")

    private void addPullNewGoods() {

        if (!Constant.IS_TASK) {

            return;

        }

			
        Integer array[] = {1,2,3,4,5,6,7,8,9,10,11,12,15};

        for (Integer catId: array) {

            Integer minId = 1;

@@ -81,11 +90,7 @@
    

    

    // 每天00点10执行 ： 更改排行榜上的奖金

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

    public void updateReward() {

        if (!Constant.IS_TASK) {

            return;

        }

        

        // 更新人数

        int showNum = 15;


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java

@@ -320,7 +320,7 @@
            if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {

                if (mianDan) {

                    try {

                        userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                        userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

                    } catch (Exception e) {

                        e.printStackTrace();

                        throw new HongBaoException(12, "免单券退款出错");

@@ -666,7 +666,7 @@
                    if (goods != null) {

                        try {

                            if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),

                                    commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))

                                    commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))

                                mianDanMoney = payMent;

                        } catch (NumberFormatException e) {

                            throw new HongBaoException(10, "免单商品处理出错");

@@ -679,7 +679,7 @@
            } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效

                commonOrder.setPayment(new BigDecimal(0));// 订单失效后的付款金额设置为0

                try {

                    userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                    userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

                } catch (Exception e) {

                    e.printStackTrace();

                }


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderMoneySettleServiceImpl.java

@@ -642,7 +642,7 @@
        }

        // 通知免单到账

        try {

            userSystemCouponService.updateStateByArrivalAccount(orderId);

            userSystemCouponService.updateStateByArrivalAccount(orderId,sourceType);

        } catch (Exception e) {

            e.printStackTrace();

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderRepairServiceImpl.java

@@ -472,7 +472,7 @@
                hongBao.setMoney(new BigDecimal(0));

                if (mianDan) {

                    try {

                        userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                        userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

                    } catch (Exception e) {

                        e.printStackTrace();

                        throw new HongBaoException(12, "免单券退款出错");

@@ -658,7 +658,7 @@


                        try {

                            if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),

                                    commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))

                                    commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))

                                mianDanMoney = payMent;

                        } catch (NumberFormatException e) {

                            throw new HongBaoException(10, "免单商品处理出错");

@@ -670,7 +670,7 @@
                }

            } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效

                try {

                    userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                    userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

                } catch (Exception e) {

                    e.printStackTrace();

                }


 fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java

@@ -293,7 +293,7 @@
            BigDecimal money = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, buyerLevel);

            // 免单处理

            boolean mianDan = false;

            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,

            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(),

                    commonOrder.getOrderNo());

            if (orderList != null && orderList.size() == 1) {// 只有1个订单才参与免单

                BigDecimal payMent = commonOrder.getPayment();

@@ -316,7 +316,7 @@
            if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {

                if (mianDan) {

                    try {

                        userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                        userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

                    } catch (Exception e) {

                        e.printStackTrace();

                        throw new HongBaoException(12, "免单券退款出错");

@@ -518,7 +518,7 @@
                    if (goods != null) {

                        try {

                            if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),

                                    commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))

                                    commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))

                                mianDanMoney = payMent;

                        } catch (NumberFormatException e) {

                            throw new HongBaoException(10, "免单商品处理出错");

@@ -531,7 +531,7 @@
            } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效

                commonOrder.setPayment(new BigDecimal(0));// 订单失效后的付款金额设置为0

                try {

                    userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

                    userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());

                } catch (Exception e) {

                    e.printStackTrace();

                }

			@@ -31,7 +31,6 @@
			import com.yeshi.fanli.dto.vip.VIPSearchResult;
			import com.yeshi.fanli.dto.vip.goods.VIPGoodsInfo;
			import com.yeshi.fanli.entity.accept.AcceptData;
			import com.yeshi.fanli.entity.bus.activity.RecommendActivity;
			import com.yeshi.fanli.entity.bus.help.AppPageNotification;
			import com.yeshi.fanli.entity.goods.CommonGoods;
			import com.yeshi.fanli.entity.jd.JDGoods;
			@@ -88,7 +87,6 @@
			import com.yeshi.fanli.vo.recommend.RecommendJumpInfoVO;
			import com.yeshi.fanli.vo.search.GoodsDocParseResultVO;

			import net.sf.json.JSON;
			import net.sf.json.JSONArray;
			import net.sf.json.JSONObject;

			@@ -296,7 +294,7 @@
			acceptData.getPlatform(),
			acceptData.getVersion()))));
			// 跳转详情
			if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),
			if (VersionUtil.greaterThan_2_1_3(acceptData.getPlatform(),
			acceptData.getVersion())) {
			buildGoodsClick(data, goods, acceptData, gson);
			}
			@@ -315,9 +313,11 @@
			orderHongBaoMoneyComputeService.getShowComputeRate(
			acceptData.getPlatform(),
			acceptData.getVersion()))));
			// if (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),
			// if
			// (VersionUtil.greaterThan_2_1_2(acceptData.getPlatform(),
			// acceptData.getVersion())) {
			// buildGoodsClick(data, goods, acceptData, gson);
			// buildGoodsClick(data, goods, acceptData,
			// gson);
			// }
			out.print(JsonUtil.loadTrueResult(data));
			return;
			@@ -406,20 +406,26 @@

			}

			RecommendJumpInfoVO left = new RecommendJumpInfoVO(
			"去看看", jumpDetailV2Service.getByTypeCache(type,
			Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())),
			params);
			RecommendJumpInfoVO left = new RecommendJumpInfoVO("去看看", jumpDetailV2Service.getByTypeCache(type,
			Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params);
			data.put("left", gson.toJson(left));

			// 去网页
			String rightValue = configService.getByVersion(ConfigKeyEnum.clipboardRecommendGoodsMakeMore.name(),
			acceptData.getPlatform(), Integer.parseInt(acceptData.getVersion()));

			if (StringUtil.isNullOrEmpty(rightValue)) {
			data.remove("left");
			} else {
			params = new JSONObject();
			params.put("url", "http://www.baidu.com");

			RecommendJumpInfoVO right = new RecommendJumpInfoVO("有更高返利？", jumpDetailV2Service.getByTypeCache("web",
			Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())), params);
			Constant.getPlatformCode(acceptData.getPlatform()), Integer.parseInt(acceptData.getVersion())),
			params);
			data.put("right", gson.toJson(right));
			}
			}

			/**
			* 口令领取

			@@ -225,7 +225,10 @@

			cloudAlipayJumpLink("cloud_alipay_jump_link","云发单支付跳转地址"),
			cloudAlipayReturnLink("cloud_alipay_return_link","云发单支付成功后返回哪个前端页面"),
			cloudAlipayNotifyLink("cloud_alipay_notify_link","云发单支付成功后回调地址");
			cloudAlipayNotifyLink("cloud_alipay_notify_link","云发单支付成功后回调地址"),

			clipboardRecommendGoodsMakeMore("clipboard_recommend_goods_make_more_link","根据粘贴板推荐商品赚更多链接")
			;

			@@ -2,6 +2,7 @@

			import java.math.BigDecimal;
			import java.util.ArrayList;
			import java.util.Date;
			import java.util.List;

			import javax.annotation.Resource;
			@@ -9,6 +10,8 @@
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;

			import com.xxl.job.core.biz.model.ReturnT;
			import com.xxl.job.core.handler.annotation.XxlJob;
			import com.yeshi.fanli.dto.ConfigParamsDTO;
			import com.yeshi.fanli.dto.jd.JDCommissionInfo;
			import com.yeshi.fanli.dto.jd.JDFilter;
			@@ -28,6 +31,7 @@
			import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.MoneyBigDecimalUtil;
			import com.yeshi.fanli.util.TimeUtil;
			import com.yeshi.fanli.util.cache.JDGoodsCacheUtil;
			import com.yeshi.fanli.util.cache.PinDuoDuoCacheUtil;
			import com.yeshi.fanli.util.factory.goods.GoodsDetailVOFactory;
			@@ -55,17 +59,14 @@
			@Resource
			private PinDuoDuoCacheUtil pinDuoDuoCacheUtil;

			@Scheduled(cron = "0 5 0/1 * * ? ")
			public void addFreeGoods() {
			if (!Constant.IS_TASK) {
			return;
			}


			@XxlJob("freeGoodsCouponJob-addFreeGoods")
			public ReturnT<String> startPreOrderTeamIncome(String param) throws Exception {
			updateGoodsTB();

			updateGoodsPDD();
			return ReturnT.SUCCESS;
			}


			/**
			* 更新淘宝商品-免单
			@@ -101,7 +102,7 @@

			TaoBaoGoodsBrief tbGoods = TaoBaoGoodsFactory.create(itemDetail);
			GoodsDetailVO detailVO = GoodsDetailVOFactory.convertTaoBao(tbGoods, params);
			if (detailVO.getCouponPrice() == null) {
			if (detailVO.getCouponPrice() != null) {
			if (detailVO.getCouponPrice().compareTo(limitPrice) > 0)
			continue;
			} else if (detailVO.getZkPrice().compareTo(limitPrice) > 0) {
			@@ -211,13 +212,12 @@

			GoodsDetailVO detailVO = GoodsDetailVOFactory.convertJDGoods(goodsInfo, params);

			if (detailVO.getCouponPrice() == null) {
			if (detailVO.getCouponPrice() != null) {
			if (detailVO.getCouponPrice().compareTo(limitPrice) > 0)
			continue;
			} else if (detailVO.getZkPrice().compareTo(limitPrice) > 0) {
			continue;
			}


			boolean saveResult = freeGoodsCouponService.saveFreeGoods(detailVO);
			if (saveResult) {
			@@ -320,7 +320,7 @@
			continue;

			GoodsDetailVO detailVO = GoodsDetailVOFactory.convertPDDGoods(goodsInfo, params);
			if (detailVO.getCouponPrice() == null) {
			if (detailVO.getCouponPrice() != null) {
			if (detailVO.getCouponPrice().compareTo(limitPrice) > 0)
			continue;
			} else if (detailVO.getZkPrice().compareTo(limitPrice) > 0) {

			@@ -8,17 +8,17 @@
			import javax.annotation.Resource;

			import org.apache.commons.beanutils.PropertyUtils;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Component;
			import org.yeshi.utils.DateUtil;

			import com.xxl.job.core.biz.model.ReturnT;
			import com.xxl.job.core.handler.annotation.XxlJob;
			import com.yeshi.fanli.dto.taobao.haodanku.HDKGoodsListResultDTO;
			import com.yeshi.fanli.entity.bus.user.UserRankings;
			import com.yeshi.fanli.entity.goods.PullNewGoods;
			import com.yeshi.fanli.entity.taobao.haodanku.HDKGoodsDetail;
			import com.yeshi.fanli.service.inter.goods.PullNewGoodsService;
			import com.yeshi.fanli.service.inter.user.UserRankingsService;
			import com.yeshi.fanli.util.Constant;
			import com.yeshi.fanli.util.taobao.HaoDanKuApiUtil;

			@Component
			@@ -31,15 +31,24 @@
			@Resource
			private PullNewGoodsService pullNewGoodsService;


			@XxlJob("pullNewJob-addPullNewGoods")
			public ReturnT<String> addPullNewGoods(String param) throws Exception {
			addPullNewGoods();
			return ReturnT.SUCCESS;
			}


			@XxlJob("pullNewJob-updateReward")
			public ReturnT<String> updateReward(String param) throws Exception {
			updateReward();
			return ReturnT.SUCCESS;
			}

			/**
			* 拉新商品
			*/
			@Scheduled(cron = "0 30 1 * * ? ")
			private void addPullNewGoods() {
			if (!Constant.IS_TASK) {
			return;
			}

			Integer array[] = {1,2,3,4,5,6,7,8,9,10,11,12,15};
			for (Integer catId: array) {
			Integer minId = 1;
			@@ -81,11 +90,7 @@


			// 每天00点10执行：更改排行榜上的奖金
			@Scheduled(cron = "0 15 0 * * ? ")
			public void updateReward() {
			if (!Constant.IS_TASK) {
			return;
			}

			// 更新人数
			int showNum = 15;

			@@ -320,7 +320,7 @@
			if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
			if (mianDan) {
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
			} catch (Exception e) {
			e.printStackTrace();
			throw new HongBaoException(12, "免单券退款出错");
			@@ -666,7 +666,7 @@
			if (goods != null) {
			try {
			if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
			commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
			commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))
			mianDanMoney = payMent;
			} catch (NumberFormatException e) {
			throw new HongBaoException(10, "免单商品处理出错");
			@@ -679,7 +679,7 @@
			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效
			commonOrder.setPayment(new BigDecimal(0));// 订单失效后的付款金额设置为0
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
			} catch (Exception e) {
			e.printStackTrace();
			}

			@@ -642,7 +642,7 @@
			}
			// 通知免单到账
			try {
			userSystemCouponService.updateStateByArrivalAccount(orderId);
			userSystemCouponService.updateStateByArrivalAccount(orderId,sourceType);
			} catch (Exception e) {
			e.printStackTrace();
			}

			@@ -472,7 +472,7 @@
			hongBao.setMoney(new BigDecimal(0));
			if (mianDan) {
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
			} catch (Exception e) {
			e.printStackTrace();
			throw new HongBaoException(12, "免单券退款出错");
			@@ -658,7 +658,7 @@

			try {
			if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
			commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
			commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))
			mianDanMoney = payMent;
			} catch (NumberFormatException e) {
			throw new HongBaoException(10, "免单商品处理出错");
			@@ -670,7 +670,7 @@
			}
			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
			} catch (Exception e) {
			e.printStackTrace();
			}

			@@ -293,7 +293,7 @@
			BigDecimal money = orderHongBaoMoneyComputeService.computeFanliMoney(commonOrder, buyerLevel);
			// 免单处理
			boolean mianDan = false;
			List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
			List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(),
			commonOrder.getOrderNo());
			if (orderList != null && orderList.size() == 1) {// 只有1个订单才参与免单
			BigDecimal payMent = commonOrder.getPayment();
			@@ -316,7 +316,7 @@
			if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
			if (mianDan) {
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
			} catch (Exception e) {
			e.printStackTrace();
			throw new HongBaoException(12, "免单券退款出错");
			@@ -518,7 +518,7 @@
			if (goods != null) {
			try {
			if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
			commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
			commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId()),commonOrder.getSourceType()))
			mianDanMoney = payMent;
			} catch (NumberFormatException e) {
			throw new HongBaoException(10, "免单商品处理出错");
			@@ -531,7 +531,7 @@
			} else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效
			commonOrder.setPayment(new BigDecimal(0));// 订单失效后的付款金额设置为0
			try {
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
			userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo(),commonOrder.getSourceType());
			} catch (Exception e) {
			e.printStackTrace();
			}