admin
2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java
@@ -1838,20 +1838,24 @@
            userCouponVO.setCouponEffect("赠送中");
            userCouponVO.setCouponRule(systemCoupon.getRemark());
            String tips = null;
            TokenTypeEnum tokenType = null;
            if (CouponTypeEnum.freeCouponGive == type) {
               userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
               tips = configService.get("give_free_coupon_tips");
               tokenType = TokenTypeEnum.freeCoupon;
            }
            
            if (CouponTypeEnum.rebatePercentCoupon == type) {
               userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
               tips = configService.get("give_free_coupon_tips");
               tokenType = TokenTypeEnum.rebatePercentCoupon;
            }
            
            if (!StringUtil.isNullOrEmpty(tips)) {
            if (!StringUtil.isNullOrEmpty(tips) && tokenType != null) {
               UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, userCouponVO.getId());
               if (record != null) {
                  TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(CouponTypeEnum.freeCoupon.name(), record.getId().toString());
                  TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenType.name(), record.getId().toString());
                  if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
                     String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
                     while(tips.contains("{APP名称}")) {
@@ -2032,11 +2036,7 @@
      userCouponVO.setCouponTerm(couponTerm);
      
      Map<String, Object> remainDays = new HashMap<String, Object>();
      try {
         remainDays.put("content", "剩余" + DateUtil.dateDiff2(new Date(), record.getGiveTime()) + "过期");
      } catch (Exception e) {
      }
      remainDays.put("content", "剩余23时59分过期");
      remainDays.put("fontColor", "#F14242");
      userCouponVO.setRemainDays(remainDays);