From d49287202635214ca9f9aba80f4e242b7f77d0a3 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 15:12:49 +0800
Subject: [PATCH] 抽奖规则 代码bug修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 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 0767f61..c6960ce 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
@@ -45,6 +45,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;
@@ -125,7 +127,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 +195,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);
@@ -517,6 +527,8 @@
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
+ // 娲诲姩棰嗗彇鍒�
+ receivedCoupon(uid);
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
@@ -544,6 +556,9 @@
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
+
+ // 娲诲姩棰嗗彇鍒�
+ receivedCoupon(uid);
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
@@ -904,7 +919,7 @@
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
+ userRecordVO.setRuleLink(configService.get("free_coupon_help"));
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
@@ -1230,7 +1245,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) {
@@ -1342,7 +1358,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) {
@@ -1419,9 +1436,10 @@
stateActivated = 0;
}
}
-
+
// 缁撴潫鏃ユ湡
- 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);
@@ -1475,5 +1493,6 @@
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
}
-
+
+
}
--
Gitblit v1.8.0