From 941b279c4eda537ba54e8fc3be9d2e2086155658 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 05 三月 2019 15:32:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 5265f49..383722c 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
@@ -1065,9 +1065,11 @@
for (UserSystemCoupon userSystemCoupon: list) {
// 婵�娲�
- userSystemCoupon.setStateActivated(1);
- userSystemCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+ UserSystemCoupon update=new UserSystemCoupon();
+ update.setId(userSystemCoupon.getId());
+ update.setStateActivated(1);
+ update.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(update);
Integer state = userSystemCoupon.getState();
if (UserSystemCoupon.STATE_OVERDUE == state) {
@@ -1076,7 +1078,9 @@
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, new UserInfo(uid));
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+
+ userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
} catch(Exception e) {
try {
LogHelper.errorDetailInfo(e);
@@ -1450,7 +1454,5 @@
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
}
-
-
-
}
+
--
Gitblit v1.8.0