消息调整

yujian

2019-08-26 eaf53588747585fc2ba965f1f2ce1939165f1b8d

消息调整

 fanli/src/main/java/com/yeshi/fanli/service/impl/integral/IntegralExchangeServiceImpl.java

@@ -324,7 +324,6 @@
            if (once) // 兑换之后消失

                exchange = null;

            

			
            return exchange;

        } catch (Exception e) {

            LogHelper.errorDetailInfo(e);


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOtherMsgNotificationServiceImpl.java

@@ -235,7 +235,7 @@
                coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());

        try {

            msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),

                    coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "返利已到账后再奖励返利的" + percent + "%"));

                    coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "使用本券已到账的返利再返" + percent + "%"));

        } catch (MsgOtherDetailException e) {

            e.printStackTrace();

        }

@@ -264,7 +264,7 @@
                getLeftDay(coupon), coupon.getSource(), coupon.getStartTime(), coupon.getEndTime());

        try {

            msgOtherDetailService.addMsgOtherDetail(MsgOtherDetailFactory.createCouponMsg(coupon.getUid(),

                    coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "返利已到账后再奖励返利的" + percent + "%"));

                    coupon.getId(), dto, MsgTypeOtherTypeEnum.couponReward, "使用本券已到账的返利再返" + percent + "%"));

        } catch (MsgOtherDetailException e) {

            e.printStackTrace();

        }


 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名称}")) {


 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -781,7 +781,7 @@
            if (!StringUtil.isNullOrEmpty(dto.getTotalGold())) {

                contentList = new ArrayList<>();

                contentList.add(new ClientTextStyleVO(dto.getTotalGold() + "", COLOR_CONTENT));

                items.add(new CommonMsgItemVO(new ClientTextStyleVO("金币总数", COLOR_TITLE), contentList));

                items.add(new CommonMsgItemVO(new ClientTextStyleVO("剩余", COLOR_TITLE), contentList));

            }



            if (!StringUtil.isNullOrEmpty(dto.getThing())) {