From af8a0900ec7b545d00dd794caf4c72dc0d53d9bc Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 08:58:21 +0800
Subject: [PATCH] 券优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 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 00dcf6c..e7f8f74 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
@@ -31,6 +31,7 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
@@ -95,6 +96,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
// 鍒稿け鏁堝浘鐗�
public final static String PIC_INVALID = "http://192.168.1.200/icon/mian_invalid.png";
@@ -134,6 +138,49 @@
return userSystemCouponMapper.countUserCouponList(uid);
}
+ @Override
+ public void insertUserCoupon(Long uid, String couponType,String source)throws UserSystemCouponException,Exception{
+
+ if (couponType == null || uid == null) {
+ throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+ }
+
+ SystemCoupon coupon= systemCouponService.getCouponByType(couponType);
+ if (coupon == null) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
+ }
+
+ int stateActivated = 1;
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ // 绂忓埄鍒哥姸鎬�
+ long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid);
+ // 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲�
+ if (countSuccess == 0) {
+ stateActivated = 0;
+ }
+ }
+
+ // 缁撴潫鏃ユ湡
+ String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ Date endTime = format.parse(endDay);
+
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUid(uid);
+ userCoupon.setSource(source);
+ userCoupon.setSystemCoupon(coupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(stateActivated);
+ userCoupon.setStartTime(new Date());
+ userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(new Date());
+ userCoupon.setUpdateTime(new Date());
+ // 鎻掑叆鏁版嵁搴�
+ insertSelective(userCoupon);
+ }
+
+
+
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -201,17 +248,19 @@
Map<String, Object> jumpLink = new HashMap<String, Object>();
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"));
+ // 閭�璇锋縺娲绘垚鍔熺晫闈�
+ jumpLink.put("url", configService.get("invite_activation_success_url") + "?alert=true");
} else {
-
+ // 婵�娲婚個璇风爜鐣岄潰
jumpLink.put("url", configService.get("invite_activation_url"));
}
jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));
} else if (stateActivated == 1) {
// 鏄剧ず瑙勫垯
@@ -272,7 +321,6 @@
differentDays = 0;
}
}
-
// 鍓╀綑澶╂暟
Map<String, Object> remainDays = new HashMap<String, Object>();
remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
--
Gitblit v1.8.0