福利中心修改

yujian

2019-08-26 9b4aa804ccc0b64ad5a7d85677a0b4d4fb41a606

福利中心修改

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

@@ -117,8 +117,8 @@
            throw new TokenRecordException(1, "口令不存在");



        Long uidToken = rokenRecord.getUid();

//        if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())

//            throw new TokenRecordException(1, "不能自己赠送给自己");

        if (uid != null && uidToken != null && uid.longValue() == uidToken.longValue())

            throw new TokenRecordException(1, "不能自己赠送给自己");

        

        Date now = new Date();

        Date endTimeToken = rokenRecord.getEndTime();

@@ -289,9 +289,9 @@
        if (rokenRecord == null)

            throw new TokenRecordException(1, "口令已失效");

        

//        Long uidToken = rokenRecord.getUid();

//        if (uidToken != null && uid.longValue() == uidToken.longValue())

//            throw new TokenRecordException(1, "不能自己赠送给自己");

        Long uidToken = rokenRecord.getUid();

        if (uidToken != null && uid.longValue() == uidToken.longValue())

            throw new TokenRecordException(1, "不能自己赠送给自己");

        

        Date now = new Date();

        Date endTimeToken = rokenRecord.getEndTime();


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

@@ -1874,28 +1874,40 @@
                        }

                    } 

                } 

            } 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.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);

                }