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

yujian

2019-08-27 d8359ddb48dab5cc797a9d552e11fde571f4920c

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

@@ -199,12 +199,13 @@
      }



      SystemCoupon coupon = null;

      if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())) {

      if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())

            | couponType.equals(CouponTypeEnum.freeCouponBuy.name())) {

         // 免单券

         coupon = systemCouponService.getCouponByType(couponType);

      } else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {

         // 随机奖励券

         if (percent == null || percent.compareTo(new BigDecimal(0)) > 0) {

         if (percent == null || percent.compareTo(new BigDecimal(0)) < 1) {

            randomRewardCoupon(1, uid, source);

            return;

         }  else {

@@ -483,11 +484,16 @@
         }



         String source = userCouponVO.getSource();

         if (source != null && "奖励券天天抽".equals(source)) {

            source = "天天抽";

         }

			
         userCouponVO.setSource("来源：" + source);



         userCouponVO.setCouponName(systemCoupon.getName());

         userCouponVO.setCouponEffect(systemCoupon.getEffect());

         userCouponVO.setCouponRule(systemCoupon.getRule());

         userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());

         userCouponVO.setCouponPicture(systemCoupon.getPicture());

         userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());



         int differentDays = 0;

@@ -504,7 +510,6 @@
               differentDays = 0;

            }

         }



         userCouponVO.setCouponTerm(couponTerm);



         // 剩余天数

@@ -517,12 +522,9 @@
            userCouponVO.setState(0);

            userCouponVO.setCouponEffect("待激活");

            userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());



            remainDaysFontColor = "#CCCCCC";



         } else {

            userCouponVO.setCouponPicture(systemCoupon.getPicture());



            remainDaysFontColor = "#F14242";

         }



@@ -533,6 +535,7 @@
      return listVO;

   }



	
   /**

    * 是否存在奖励券

    * 

@@ -600,12 +603,11 @@
      }



      List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);



		
      // 获取商品详情

      TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);

      if (taoBaoGoodsBrief != null) {

         BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);



         // 券后价 大于10元 不能免单

         if (quanPrice.compareTo(new BigDecimal(10)) > 0) {

            if (list != null && list.size() > 0) {

@@ -619,7 +621,6 @@
                     map.put("fontColor", "#CCCCCC");

                  }

                  userCouponVO.setRemainDays(map);



               }

            }

         }

@@ -667,7 +668,8 @@
      }



      if (baseCoupon.getType() != CouponTypeEnum.freeCoupon

            && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {

            && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon

            && baseCoupon.getType() != CouponTypeEnum.freeCouponBuy) {

         throw new UserSystemCouponException(1, "券类型不匹配");

      }



@@ -1207,6 +1209,8 @@
         userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);

      } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {

         userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);

      } else if (CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {

         userOtherMsgNotificationService.couponUsedFreeSheet(record.getUserSystemCoupon(), orderNo, MsgTypeOtherTypeEnum.freeCouponBuy);

      }

   }



@@ -1354,6 +1358,8 @@
               userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon, orderNo, payment);

            } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {

               userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);

            } else if (CouponTypeEnum.freeCouponBuy.name().equals(couponType)) {

               userOtherMsgNotificationService.couponUsingFreeSheet(userSystemCoupon, orderNo, payment, MsgTypeOtherTypeEnum.freeCouponBuy);

            }

         }

      }

@@ -1729,7 +1735,12 @@
            continue; // 券信息不完整

         }



         userCouponVO.setSource("来源：" + userCouponVO.getSource());

         String source = userCouponVO.getSource();

         if (source != null && "奖励券天天抽".equals(source)) {

            source = "天天抽";

         }

			
         userCouponVO.setSource("来源：" + source);

         userCouponVO.setCouponName(systemCoupon.getName());

         userCouponVO.setCouponEffect(systemCoupon.getEffect());

         userCouponVO.setCouponRule(systemCoupon.getRule());

@@ -1833,20 +1844,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名称}")) {

@@ -1865,28 +1880,41 @@
                  }

               } 

            } 

         } else if (give && UserSystemCoupon.STATE_END_USE == state) {

            userCouponVO.setCouponRule(systemCoupon.getRemark());

            if (CouponTypeEnum.freeCouponGive == type) {

               userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);

         } else if (UserSystemCoupon.STATE_END_USE == state) {

				
            if (give) {

               userCouponVO.setCouponEffect("任性0元购");

               userCouponVO.setCouponRule(systemCoupon.getRemark());

               if (CouponTypeEnum.freeCouponGive == type) {

                  userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);

               }

					
               if (CouponTypeEnum.rebatePercentCoupon == type) {

                  userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);

               }

					
               Date useTime = userCouponVO.getUseTime();

               if (useTime != null) {

                  Map<String, Object> remainDays = new HashMap<String, Object>();

                  remainDays.put("content", "于" + sdf.format(useTime) + "成功赠送");

                  remainDays.put("fontColor", "#CCCCCC");

                  userCouponVO.setRemainDays(remainDays);

               }

            } else {

               Date useTime = userCouponVO.getUseTime();

               if (useTime != null) {

                  Map<String, Object> remainDays = new HashMap<String, Object>();

                  remainDays.put("content", "于" + sdf.format(useTime) + "成功使用");

                  remainDays.put("fontColor", "#CCCCCC");

                  userCouponVO.setRemainDays(remainDays);

               }

            }

            

            if (CouponTypeEnum.rebatePercentCoupon == type) {

               userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);

            }

				
            Date useTime = userCouponVO.getUseTime();

            if (useTime != null) {

               Map<String, Object> remainDays = new HashMap<String, Object>();

               remainDays.put("content", "于" + sdf.format(useTime) + "成功赠送");

               remainDays.put("fontColor", "#999999");

               userCouponVO.setRemainDays(remainDays);

            }

         }else if (UserSystemCoupon.STATE_OVERDUE == state) {

            if (endTime != null) {

               Map<String, Object> remainDays = new HashMap<String, Object>();

               remainDays.put("content", "于" + sdf.format(endTime) + "过期");

               remainDays.put("fontColor", "#999999");

               remainDays.put("fontColor", "#CCCCCC");

               userCouponVO.setRemainDays(remainDays);

            }

            

@@ -2027,11 +2055,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);

      

@@ -2098,17 +2122,35 @@
         if (systemCoupon == null)

            continue;

         

         String couponName = systemCoupon.getName();

         if (CouponTypeEnum.freeCouponGive == systemCoupon.getType())

            couponName = "免单券";

			
         // 退回消息

         String beiZhu = "请到我的-福利中心查看";

         SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");

         MsgOtherGiveContentDTO msgOther = new MsgOtherGiveContentDTO();

         msgOther.setType(MsgOtherGiveContentDTO.TYEP_COUPON);

         msgOther.setTitle("赠送" + systemCoupon.getName() + "退回");

         msgOther.setGiveType("你赠送的"+ systemCoupon.getName() + "未被成功领取");

         msgOther.setTitle("赠送" + couponName + "退回");

         msgOther.setGiveType("你赠送的"+ couponName + "未被成功领取");

         msgOther.setGiveTime(sd.format(record.getGiveTime()));

         msgOther.setReturnTime(sd.format(new Date()));

         userOtherMsgNotificationService.tokenGiveMsg(record.getGiveUid(), beiZhu, msgOther);

      }

   }

	
	
//   @Override

//   public boolean countIncludeExchange(Long uid) {

//		
//		
//   }

//	
//	
//   @Override

//   public boolean countNotIncludeExchange(Long uid) {

//		
//		
//   }



}