From 4fb3f5e033c38afda6e7db013c53389732591efd Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期二, 20 八月 2019 17:19:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div --- fanli/src/main/java/com/yeshi/fanli/job/UserSystemCouponJob.java | 36 +++++------------------------------- 1 files changed, 5 insertions(+), 31 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UserSystemCouponJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UserSystemCouponJob.java index ec731fb..0aab34a 100644 --- a/fanli/src/main/java/com/yeshi/fanli/job/UserSystemCouponJob.java +++ b/fanli/src/main/java/com/yeshi/fanli/job/UserSystemCouponJob.java @@ -1,8 +1,5 @@ package com.yeshi.fanli.job; -import java.math.BigDecimal; -import java.util.Collections; -import java.util.Date; import java.util.List; import javax.annotation.Resource; @@ -10,27 +7,9 @@ import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import com.yeshi.fanli.entity.bus.tlj.UserTaoLiJinGiveRecord; import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord; -import com.yeshi.fanli.entity.taobao.ShareHotGoods; -import com.yeshi.fanli.entity.taobao.TLJBuyGoods; -import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief; -import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig; -import com.yeshi.fanli.entity.taobao.TaoKeAppInfo; -import com.yeshi.fanli.exception.taobao.TaobaoGoodsDownException; -import com.yeshi.fanli.log.LogHelper; -import com.yeshi.fanli.service.inter.taobao.ShareHotGoodsService; -import com.yeshi.fanli.service.inter.taobao.TLJBuyGoodsService; -import com.yeshi.fanli.service.inter.taobao.TaoBaoUnionConfigService; -import com.yeshi.fanli.service.inter.taobao.dataoke.DaTaoKeGoodsDetailService; -import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinGiveRecordService; -import com.yeshi.fanli.service.inter.tlj.UserTaoLiJinOriginService; import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService; import com.yeshi.fanli.util.Constant; -import com.yeshi.fanli.util.TaoBaoConstant; -import com.yeshi.fanli.util.TimeUtil; -import com.yeshi.fanli.util.taobao.TaoBaoUtil; -import com.yeshi.fanli.util.taobao.TaoKeApiUtil; @Component public class UserSystemCouponJob { @@ -54,16 +33,11 @@ } for (UserSystemCouponGiveRecord record: overdueList) { -// try { -// userTaoLiJinOriginService.giveSendBack(record.getGiveUid(), record.getAmount()); -// // 鏇存柊璁板綍 -// UserTaoLiJinGiveRecord updateRecord = new UserTaoLiJinGiveRecord(); -// updateRecord.setId(record.getId()); -// updateRecord.setState(UserTaoLiJinGiveRecord.STATE_OVERDUE); -// userTaoLiJinGiveRecordService.updateByPrimaryKeySelective(updateRecord); -// } catch (Exception e) { -// e.printStackTrace(); -// } + + UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord(); + updateRecord.setId(record.getId()); + updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE); + userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord); } } } -- Gitblit v1.8.0