oppo推送绑定

admin

2019-09-24 f54093a69938aca18ca6ba005e17afe5ee5bbfe6

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

@@ -42,13 +42,13 @@
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;

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

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

import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;

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

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

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

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

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

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

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

@@ -56,10 +56,10 @@
import com.yeshi.fanli.service.inter.user.TokenRecordService;

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

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

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

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

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

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

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.RedisManager;

@@ -1769,6 +1769,7 @@


               // 订单列表

               jumpLink.put("state", "2"); // 已收货

               jumpLink.put("showNav", false); // 不显示上方统计信息

               jumpLink.put("type", "1");  // 返利订单

               jumpLink.put("title", "返利订单"); // 标题名

               jumpLink.put("goodsType", "0"); // 订单来源

@@ -1790,7 +1791,7 @@
            

            if (CouponTypeEnum.rebatePercentCoupon == type) {

               userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);

               tips = configService.get("give_free_coupon_tips");

               tips = configService.get("give_rebate_percent_coupon_tips");

               tokenType = TokenTypeEnum.rebatePercentCoupon;

            }

            

@@ -2416,4 +2417,10 @@


      return listCoupon;

   }

	
	
   @Override

   public List<UserSystemCoupon> getFreeCouponByType(Long uid, String type) {

      return userSystemCouponMapper.getFreeCouponByType(uid, type);

   }

}