From d2ee731b6a64fa002bceddebf0cc59c78b6c17ce Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期三, 27 二月 2019 10:12:31 +0800 Subject: [PATCH] 邀请成功消息提醒 --- fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 110 +++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 78 insertions(+), 32 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java index 4bec0e2..00dcf6c 100644 --- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java +++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java @@ -18,12 +18,12 @@ import com.yeshi.fanli.entity.bus.user.HongBaoV2; import com.yeshi.fanli.entity.bus.user.Order; import com.yeshi.fanli.entity.bus.user.UserInfo; +import com.yeshi.fanli.entity.bus.user.UserInfoExtra; import com.yeshi.fanli.entity.bus.user.UserSystemCoupon; import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord; import com.yeshi.fanli.entity.common.JumpDetailV2; import com.yeshi.fanli.entity.money.UserMoneyDetail; import com.yeshi.fanli.entity.order.CommonOrder; -import com.yeshi.fanli.entity.order.HongBaoOrder; import com.yeshi.fanli.entity.system.SystemCoupon; import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum; import com.yeshi.fanli.exception.user.UserSystemCouponException; @@ -36,6 +36,7 @@ import com.yeshi.fanli.service.inter.order.HongBaoOrderService; import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService; import com.yeshi.fanli.service.inter.order.OrderService; +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.UserSystemCouponRecordService; @@ -91,6 +92,9 @@ @Resource private UserMoneyMsgNotificationService userMoneyMsgNotificationService; + + @Resource + private UserInfoExtraService userInfoExtraService; // 鍒稿け鏁堝浘鐗� public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png"; @@ -121,6 +125,11 @@ } @Override + public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) { + return userSystemCouponMapper.getUserCouponBySource(uid, source); + } + + @Override public long countUserCouponList(Long uid) { return userSystemCouponMapper.countUserCouponList(uid); } @@ -139,7 +148,7 @@ } // 鏁版嵁缁勭粐 - listDataFactory(listVO); + listDataFactory(listVO, uid); return listVO; } @@ -149,7 +158,7 @@ * * @param listVO */ - public void listDataFactory(List<UserSystemCouponVO> listVO) { + public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{ for (UserSystemCouponVO userCouponVO : listVO) { @@ -170,28 +179,37 @@ userCouponVO.setCouponEffect(systemCoupon.getEffect()); userCouponVO.setCouponRule(systemCoupon.getRule()); - // 浣跨敤涓姸鎬� 鏀瑰彉涓哄凡浣跨敤 + // 浣跨敤鐘舵�� Integer state = userCouponVO.getState(); - if (UserSystemCoupon.STATE_IN_USE == state) { - state = UserSystemCoupon.STATE_END_USE; - userCouponVO.setState(state); - } // 鎸夐挳璺宠浆 - Map<String, Object> jumpBtn = null; + Integer stateActivated = userCouponVO.getStateActivated(); + if (stateActivated == null || stateActivated == 0) { // 鏄剧ず瑙勫垯 userCouponVO.setCouponRule(systemCoupon.getRemark()); - systemCoupon.setEffect("寰呮縺娲�"); + userCouponVO.setCouponEffect("寰呮縺娲�"); - // 鐘舵�佹湭婵�娲� - userCouponVO.setState(0); + // 鐘舵�佹湭婵�娲� -涓旀湭琚娇鐢� + if (UserSystemCoupon.STATE_CAN_USE == state) { + userCouponVO.setState(0); + } jumpBtn = new HashMap<String, Object>(); Map<String, Object> jumpLink = new HashMap<String, Object>(); - jumpLink.put("url", configService.get("invite_activation_url")); + + UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid); + if (userInfoExtra != null && userInfoExtra.getInviteCode() != null + && userInfoExtra.getInviteCode().trim().length() > 0) { + + jumpLink.put("url", configService.get("invite_activation_success_url" +"?alert=ture")); + } else { + + jumpLink.put("url", configService.get("invite_activation_url")); + } + jumpBtn.put("params", jumpLink); jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite")); @@ -205,25 +223,35 @@ CouponTypeEnum type = systemCoupon.getType(); if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) { // 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒� - jumpLink.put("url", configService.get("invite_activation_url")); + + // 鍏嶅崟鍟嗗搧鍒楄〃 + jumpLink.put("url", configService.get("free_goods_list")); jumpBtn = new HashMap<String, Object>(); jumpBtn.put("params", jumpLink); jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web")); } else if (CouponTypeEnum.rebatePercentCoupon == type) { - // 杩斿埄濂栧姳鍒� - jumpLink.put("url", configService.get("invite_activation_url")); - + // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈� + jumpLink.put("state", 2); + jumpBtn = new HashMap<String, Object>(); jumpBtn.put("params", jumpLink); - jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite")); + // 璺宠浆璁㈠崟鍒楄〃 + jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList")); } - } else if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) { - userCouponVO.setCouponPicture(PIC_INVALID); + + } else if (UserSystemCoupon.STATE_IN_USE == state) { + // 浣跨敤涓� + userCouponVO.setInUseExplain(configService.get("free_coupon_using-help")); } - } + + // 鍒稿け鏁堝浘鐗囨浛鎹� + if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) { + userCouponVO.setCouponPicture(PIC_INVALID); + } + userCouponVO.setJumpBtn(jumpBtn); String couponTerm = "鏈夋晥鏈燂細"; @@ -238,7 +266,8 @@ if (UserSystemCoupon.STATE_CAN_USE == state) { int differentDays = 0; if (endTime != null && startTime != null) { - differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + differentDays = DateUtil.daysBetween(sdf.format(new Date()), sdf.format(endTime)) + 1; if (differentDays < 0) { differentDays = 0; } @@ -304,8 +333,9 @@ if (endTime != null && startTime != null) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd"); couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime); - - differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1; + + SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); + differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1; if (differentDays < 0) { differentDays = 0; } @@ -402,6 +432,11 @@ throw new UserSystemCouponException(1, "鏈壘鍒板埜鍩烘湰淇℃伅"); } + if (baseCoupon.getType() != CouponTypeEnum.freeCoupon + && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) { + throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤"); + } + Date date = new Date(); // 鏇存柊鍒镐娇鐢� userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 姝e湪鍖归厤 @@ -444,6 +479,11 @@ } } + if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) { + throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤"); + } + + if (orderNo == null || orderNo.trim().length() == 0) { throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪"); } @@ -454,7 +494,6 @@ throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); } - Long commonOrderId = orderVO.getId(); BigDecimal hongBao = orderVO.getHongBao(); // 绾㈠寘鐘舵�� @@ -558,21 +597,26 @@ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝g‘"); } - List<CommonOrderVO> list = commonOrderService.getCouponHongbaoByOrderNo(userSystemCoupon.getUid(), - HongBaoV2.STATE_YILINGQU, orderNo); - - if (list == null || list.size() == 0) { + Long uid = userSystemCoupon.getUid(); + + CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), + orderNo, CommonOrder.STATE_JS); + + if (commonOrderVO == null) { throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触"); } + + // 鑾峰彇濂栧姳閲戦 + Map<String, BigDecimal> map = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid); UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO(); userRecordVO.setCouponMoneyState("宸插埌璐�"); - userRecordVO.setCommonOrder(list.get(0)); - userRecordVO.setCouponName("濂栧姳閲�: 楼" + list.get(0).getCouponMoney().setScale(2, BigDecimal.ROUND_DOWN)); + userRecordVO.setCommonOrder(commonOrderVO); + userRecordVO.setCouponName("濂栧姳閲�: 楼" + map.get("couponMoney").setScale(2, BigDecimal.ROUND_DOWN)); // 姣斾緥 BigDecimal percent = baseCoupon.getPercent(); - BigDecimal hongBao = list.get(0).getHongBao().setScale(2, BigDecimal.ROUND_DOWN); + BigDecimal hongBao = map.get("totalMoney").setScale(2, BigDecimal.ROUND_DOWN); userRecordVO.setCouponEffect("杩斿埄楼" + hongBao + "宸茶繑" + percent + "%"); // 璺宠浆绂忓埄涓績 @@ -795,4 +839,6 @@ return userRecordVO; } + + } -- Gitblit v1.8.0