Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-08-21 7f2f5ef5637a6871f4329e464eeba97eb59e94a3

 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);

         }

      }

   }