From fec4f669c779151ba6d1699c053bad4575f4060f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 10:58:26 +0800
Subject: [PATCH] 退回天数
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 353fbb9..190c158 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
@@ -15,7 +15,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
-import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
@@ -28,6 +27,8 @@
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.push.PushCoupon;
+import com.yeshi.fanli.entity.push.PushCouponRecord;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -46,6 +47,8 @@
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.push.PushCouponRecordService;
+import com.yeshi.fanli.service.inter.push.PushCouponService;
import com.yeshi.fanli.service.inter.user.DeviceLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -126,7 +129,14 @@
@Resource
private CommonOrderCountService commonOrderCountService;
-
+
+ @Resource
+ private PushCouponService pushCouponService;
+
+ @Resource
+ private PushCouponRecordService pushCouponRecordService;
+
+
@Override
public int insertSelective(UserSystemCoupon record) {
return userSystemCouponMapper.insertSelective(record);
@@ -186,7 +196,8 @@
}
// 缁撴潫鏃ユ湡
- String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
@@ -596,6 +607,13 @@
if (userSystemCoupon == null) {
throw new UserSystemCouponException(1, "鍒告暟鎹笉姝ｇ‘");
}
+
+ Integer state = userSystemCoupon.getState();
+ Integer stateActivated = userSystemCoupon.getStateActivated();
+ if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated) {
+ throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�");
+ }
+
Long couponUid = userSystemCoupon.getUid();
if (!uid.equals(couponUid)) {
@@ -658,6 +676,12 @@
UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id);
if (userSystemCoupon == null) {
throw new UserSystemCouponException(1, "鍒镐俊鎭笉瀛樺湪");
+ }
+
+ Integer state = userSystemCoupon.getState();
+ Integer stateActivated = userSystemCoupon.getStateActivated();
+ if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated) {
+ throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�");
}
// 绯荤粺鍒镐俊鎭�
@@ -1040,9 +1064,10 @@
return userRecordVO;
}
+
@Transactional
@Override
- public void activatedWelfareFreeCoupon(Long uid) {
+ public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
LogHelper.test("鍒告縺娲�:"+uid);
if (uid == null) {
@@ -1080,7 +1105,9 @@
// 娑堟伅鎺ㄩ��
try {
- UserInfo userInfo = userInfoService.selectByPKey(uid);
+ UserInfo userInfo = new UserInfo();
+ userInfo.setId(uid);
+ userInfo.setNickName(fromNickName);
userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
} catch(Exception e) {
@@ -1212,7 +1239,8 @@
// 缁撴潫鏃ユ湡
Date endTime = null;
try {
- String endDay = DateUtil.plusDay(expiryDay, new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
endTime = format.parse(endDay);
} catch (ParseException e) {
@@ -1323,7 +1351,8 @@
// 缁撴潫鏃ユ湡
Date endTime = null;
try {
- String endDay = DateUtil.plusDay(expiryDay, new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
endTime = format.parse(endDay);
} catch (ParseException e) {
@@ -1365,6 +1394,8 @@
// 鑾峰彇棰濆淇℃伅
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+
+ // 宸茬粡鎶借繃濂栫殑鎴栬�呭凡缁忚繘鍏ヨ繃鎶藉椤甸潰鐨�
if (userInfoExtra != null && userInfoExtra.getLotteryNewbies() != null) {
return;
}
@@ -1401,8 +1432,8 @@
}
}
- // 缁撴潫鏃ユ湡
- String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay(), new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
@@ -1456,5 +1487,8 @@
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
}
+
+
+
}
--
Gitblit v1.8.0