Merge remote-tracking branch 'origin/master'

admin

2019-03-06 5aeec2b48b5c3f1ed9d9ecf8b95a8ddc2031d43d

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

@@ -26,7 +26,7 @@
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;

import com.yeshi.fanli.entity.common.JumpDetailV2;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.system.SystemCoupon;

import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;

import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;

@@ -45,8 +45,6 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;

import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.push.PushCouponRecordService;

import com.yeshi.fanli.service.inter.push.PushCouponService;

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

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

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

@@ -127,13 +125,6 @@


   @Resource

   private CommonOrderCountService commonOrderCountService;

	
   @Resource

   private PushCouponService pushCouponService;

	
   @Resource

   private PushCouponRecordService pushCouponRecordService;

	
   

   @Override

   public int insertSelective(UserSystemCoupon record) {

@@ -527,6 +518,8 @@
      updateCounponInvalid(uid);

      // 退回券

      sendBackTimeOutCoupon(uid);

      // 活动领取券

      receivedCoupon(uid);



      // 订单相关的券

      List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();

@@ -554,6 +547,9 @@
      updateCounponInvalid(uid);

      // 退回券

      sendBackTimeOutCoupon(uid);

		
      // 活动领取券

      receivedCoupon(uid);



      // 商品相关的券

      List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();

@@ -914,7 +910,7 @@
      String progressMsg = "";

      String progressColor = "";

      // 跳转奖励券规则

      userRecordVO.setRuleLink(configService.get("reward_coupon_help"));

      userRecordVO.setRuleLink(configService.get("free_coupon_help"));



      // 进度： 1 灰色 2 红色 3 绿色

      String progressState1 = "3";

@@ -1488,4 +1484,6 @@
      userInfoExtraService.saveUserInfoExtra(userInfoExtra);



   }

	
	
}