From 651a15c78f668bef3859d9ed1bb7ad0b669d3600 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 七月 2020 17:52:07 +0800
Subject: [PATCH] 多APP优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 597 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 313 insertions(+), 284 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 0eaada1..122d373 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
@@ -1,27 +1,6 @@
package com.yeshi.fanli.service.impl.user;
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.jdbc.datasource.DataSourceTransactionManager;
-import org.springframework.scheduling.annotation.Async;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.DefaultTransactionDefinition;
-import org.yeshi.utils.DateUtil;
-import org.yeshi.utils.entity.DateInfo;
-
import com.aliyun.openservices.ons.api.Message;
-import com.aliyun.openservices.ons.api.Producer;
import com.aliyun.openservices.ons.api.SendResult;
import com.aliyun.openservices.ons.api.transaction.LocalTransactionExecuter;
import com.aliyun.openservices.ons.api.transaction.TransactionProducer;
@@ -29,20 +8,14 @@
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.dto.mq.user.UserTopicTagEnum;
import com.yeshi.fanli.dto.mq.user.body.UserSystemCouponUseMQMsg;
+import com.yeshi.fanli.entity.SystemEnum;
import com.yeshi.fanli.entity.accept.AcceptData;
-import com.yeshi.fanli.entity.bus.user.HongBaoV2;
-import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.bus.user.TokenRecord;
+import com.yeshi.fanli.entity.bus.user.*;
import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum;
-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.UserSystemCouponActivate;
-import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
-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.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
@@ -55,30 +28,11 @@
import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;
import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
-import com.yeshi.fanli.service.inter.order.CommonOrderCountService;
-import com.yeshi.fanli.service.inter.order.CommonOrderService;
-import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
-import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
-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.TokenRecordService;
-import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
-import com.yeshi.fanli.service.inter.user.UserInfoService;
-import com.yeshi.fanli.service.inter.user.UserSystemCouponActivateService;
-import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
-import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
-import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
-import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.order.*;
+import com.yeshi.fanli.service.inter.user.*;
import com.yeshi.fanli.service.inter.user.invite.UserInviteService;
-import com.yeshi.fanli.util.Constant;
-import com.yeshi.fanli.util.MoneyBigDecimalUtil;
-import com.yeshi.fanli.util.RedisManager;
-import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.TokenUtil;
-import com.yeshi.fanli.util.VersionUtil;
+import com.yeshi.fanli.service.manger.msg.RocketMQManager;
+import com.yeshi.fanli.util.*;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.rocketmq.MQMsgBodyFactory;
@@ -88,8 +42,22 @@
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
import com.yeshi.fanli.vo.user.UserSystemCouponVO;
-
import net.sf.json.JSONObject;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.core.task.TaskExecutor;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+import org.yeshi.utils.DateUtil;
+import org.yeshi.utils.entity.DateInfo;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
@Service
public class UserSystemCouponServiceImpl implements UserSystemCouponService {
@@ -147,22 +115,9 @@
@Resource
private UserInfoExtraService userInfoExtraService;
- @Resource
- private ThreeSaleSerivce threeSaleSerivce;
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
-
- @Lazy
- @Resource
- private CommonOrderCountService commonOrderCountService;
-
- @Resource
- @Lazy
- private PushCouponService pushCouponService;
-
- @Resource
- private PushCouponRecordService pushCouponRecordService;
@Resource
private TokenRecordService tokenRecordService;
@@ -176,9 +131,9 @@
@Resource
private UserSystemCouponActivateService userSystemCouponActivateService;
- @Resource(name = "producer")
- private Producer producer;
-
+ @Resource
+ private RocketMQManager rocketMQManager;
+
@Resource
private UserInviteService userInviteService;
@@ -227,34 +182,33 @@
return userSystemCouponMapper.countUserCouponList(uid);
}
-
-
@Override
- @Transactional(rollbackFor=Exception.class)
- public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify) throws UserSystemCouponException, Exception{
+ @Transactional(rollbackFor = Exception.class)
+ public UserSystemCoupon freeCouponWin(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify)
+ throws UserSystemCouponException, Exception {
if (typeEnum == null || uid == null || StringUtil.isNullOrEmpty(source) || num < 1) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
-
+
SystemCoupon coupon = systemCouponService.getCouponByType(typeEnum.name());
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
-
+
// 婵�娲荤姸鎬�
int stateActivated = 0;
// 鑷喘鍏嶅崟鍒搞�佽禒閫佸厤鍗曞埜鍙洿鎺ヤ娇鐢�
if (coupon.getType() == CouponTypeEnum.freeCouponBuy || coupon.getType() == CouponTypeEnum.freeCouponGive) {
stateActivated = 1;
}
-
+
// 鏈夋晥鏃堕暱
Integer expiryDay = null;
if (stateActivated == 0)
expiryDay = coupon.getActivateDay();
if (expiryDay == null || expiryDay == 0)
expiryDay = coupon.getExpiryDay();
-
+
// 璁＄畻缁撴潫鏃ユ湡
Date nowTime = new Date();
String endDay = DateUtil.plusDay(expiryDay - 1, nowTime);
@@ -263,10 +217,10 @@
endDay += " 23:59:59";
}
Date endTime = format.parse(endDay);
-
+
UserSystemCoupon userSystemCoupon = null;
- for (int i = 0; i < num; i ++) {
- UserSystemCoupon userCoupon = new UserSystemCoupon();
+ for (int i = 0; i < num; i++) {
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
userCoupon.setSource(source);
userCoupon.setSystemCoupon(coupon);
@@ -281,28 +235,28 @@
if (typeEnum == CouponTypeEnum.freeCoupon) {
userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
}
-
+
if (num == 1) {
userSystemCoupon = userCoupon;
- }
- }
-
+ }
+ }
+
executor.execute(new Runnable() {
@Override
- public void run() {
+ public void run() {
if (notify) { // 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.freeCouponWinMsg(uid, typeEnum.getDesc(), source,
- num, "鎴愬姛鑾峰緱", nowTime, endTime);
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, typeEnum.getDesc(), source, num, "鎴愬姛鑾峰緱",
+ nowTime, endTime);
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
}
}
-
+
// 绂忓埄涓績绾㈢偣
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null) {
- UserInfoExtra updateExtra = new UserInfoExtra();
+ UserInfoExtra updateExtra = new UserInfoExtra();
updateExtra.setId(extra.getId());
if (extra.getCouponNews() == null) {
updateExtra.setCouponNews(1);
@@ -313,26 +267,114 @@
}
}
});
-
- return userSystemCoupon;
- }
-
-
+ return userSystemCoupon;
+ }
+
+
@Override
- @Transactional(rollbackFor=Exception.class)
- public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify,
- BigDecimal percent) throws UserSystemCouponException, Exception{
- if (uid == null || percent == null|| StringUtil.isNullOrEmpty(source) || num < 1) {
+ @Transactional(rollbackFor = Exception.class)
+ public UserSystemCoupon freeCouponWinBySystem(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify,
+ Integer expiryDay, Integer activated) throws UserSystemCouponException, Exception {
+ if (typeEnum == null || uid == null || StringUtil.isNullOrEmpty(source) || num < 1) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
-
+
+ SystemCoupon coupon = systemCouponService.getCouponByType(typeEnum.name());
+ if (coupon == null) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
+ }
+
+ // 婵�娲荤姸鎬�
+ // 鑷喘鍏嶅崟鍒搞�佽禒閫佸厤鍗曞埜鍙洿鎺ヤ娇鐢�
+ if (coupon.getType() == CouponTypeEnum.freeCouponBuy || coupon.getType() == CouponTypeEnum.freeCouponGive) {
+ activated = 1;
+ }
+
+ // 鏈夋晥鏃堕暱
+ if (expiryDay == null) {
+ if (activated == 0)
+ expiryDay = coupon.getActivateDay();
+ if (expiryDay == null || expiryDay == 0)
+ expiryDay = coupon.getExpiryDay();
+ }
+
+ // 璁＄畻缁撴潫鏃ユ湡
+ Date nowTime = new Date();
+ String endDay = DateUtil.plusDay(expiryDay - 1, nowTime);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (endDay != null && endDay.trim().length() > 0) {
+ endDay += " 23:59:59";
+ }
+ Date endTime = format.parse(endDay);
+
+ UserSystemCoupon userSystemCoupon = null;
+ for (int i = 0; i < num; i++) {
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUid(uid);
+ userCoupon.setSource(source);
+ userCoupon.setSystemCoupon(coupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(activated);
+ userCoupon.setStartTime(nowTime);
+ userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(nowTime);
+ userCoupon.setUpdateTime(nowTime);
+ userSystemCouponMapper.insertSelective(userCoupon);
+ // 闇�瑕佹縺娲诲埜
+ if (typeEnum == CouponTypeEnum.freeCoupon) {
+ userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
+ }
+
+ if (num == 1) {
+ userSystemCoupon = userCoupon;
+ }
+ }
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ if (notify) { // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, typeEnum.getDesc(), source, num, "鎴愬姛鑾峰緱",
+ nowTime, endTime);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ // 绂忓埄涓績绾㈢偣
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ if (extra != null) {
+ UserInfoExtra updateExtra = new UserInfoExtra();
+ updateExtra.setId(extra.getId());
+ if (extra.getCouponNews() == null) {
+ updateExtra.setCouponNews(1);
+ } else {
+ updateExtra.setCouponNews(extra.getCouponNews() + 1);
+ }
+ userInfoExtraService.updateByPrimaryKeySelective(updateExtra);
+ }
+ }
+ });
+
+ return userSystemCoupon;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public UserSystemCoupon rewardCouponWin(Long uid, String source, int num, boolean notify, BigDecimal percent)
+ throws UserSystemCouponException, Exception {
+ if (uid == null || percent == null || StringUtil.isNullOrEmpty(source) || num < 1) {
+ throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+ }
+
String name = CouponTypeEnum.rebatePercentCoupon.name();
SystemCoupon coupon = systemCouponService.getCouponByTypeAndPercent(name, percent);
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
-
+
// 璁＄畻缁撴潫鏃ユ湡
Date nowTime = new Date();
Integer expiryDay = coupon.getExpiryDay();
@@ -342,10 +384,10 @@
endDay += " 23:59:59";
}
Date endTime = format.parse(endDay);
-
+
UserSystemCoupon userSystemCoupon = null;
- for (int i = 0; i < num; i ++) {
- UserSystemCoupon userCoupon = new UserSystemCoupon();
+ for (int i = 0; i < num; i++) {
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
userCoupon.setSource(source);
userCoupon.setSystemCoupon(coupon);
@@ -358,24 +400,24 @@
userSystemCouponMapper.insertSelective(userCoupon);
if (num == 1) {
userSystemCoupon = userCoupon;
- }
- }
-
+ }
+ }
+
executor.execute(new Runnable() {
@Override
- public void run() {
+ public void run() {
if (notify) { // 娑堟伅鎺ㄩ��
try {
userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, num, "鎴愬姛鑾峰緱", nowTime, endTime);
} catch (Exception e) {
- e.printStackTrace();
+ e.printStackTrace();
}
}
-
+
// 绂忓埄涓績绾㈢偣
UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
if (extra != null) {
- UserInfoExtra updateExtra = new UserInfoExtra();
+ UserInfoExtra updateExtra = new UserInfoExtra();
updateExtra.setId(extra.getId());
if (extra.getCouponNews() == null) {
updateExtra.setCouponNews(1);
@@ -386,15 +428,11 @@
}
}
});
-
- return userSystemCoupon;
- }
-
-
-
-
- @Transactional(rollbackFor=Exception.class)
+ return userSystemCoupon;
+ }
+
+ @Transactional(rollbackFor = Exception.class)
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
throws UserSystemCouponException, Exception {
@@ -432,6 +470,8 @@
if (userInfoExtra != null) {
inviteCode = userInfoExtra.getInviteCode();
}
+
+ SystemEnum system=userInfoService.getUserSystem(uid);
for (UserSystemCouponVO userCouponVO : listVO) {
@@ -499,7 +539,7 @@
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
// 鍏嶅崟鍟嗗搧鍒楄〃
- jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
+ jumpLink.put("url", configService.getValue(ConfigKeyEnum.freeGoodsList.getKey(),system));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
@@ -517,7 +557,7 @@
} else if (UserSystemCoupon.STATE_IN_USE == state) {
// 浣跨敤涓�
- userCouponVO.setInUseExplain(configService.get(ConfigKeyEnum.freeCouponUsingHelp.getKey()));
+ userCouponVO.setInUseExplain(configService.getValue(ConfigKeyEnum.freeCouponUsingHelp.getKey(),system));
}
}
@@ -556,27 +596,24 @@
}
@Override
- public List<UserSystemCouponVO> getEnableListByCouponId(Long uid, Integer activated, List<SystemCoupon> couponList)
- throws UserSystemCouponException, Exception {
-
+ public List<UserSystemCouponVO> getEnableListByCouponId(Long uid, Integer activated, List<SystemCoupon> couponList) {
List<Long> listCouponId = new ArrayList<Long>();
for (SystemCoupon systemCoupon : couponList) {
listCouponId.add(systemCoupon.getId());
}
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated, listCouponId);
-
if (listVO == null || listVO.size() == 0) {
return null;
}
-
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
for (UserSystemCouponVO userCouponVO : listVO) {
-
SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
if (systemCoupon == null) {
continue; // 鍒镐俊鎭笉瀹屾暣
}
-
for (SystemCoupon coupon : couponList) {
if (coupon.getId().equals(systemCoupon.getId()) || coupon.getId() == systemCoupon.getId()) {
systemCoupon = coupon;
@@ -602,11 +639,15 @@
Date startTime = userCouponVO.getStartTime();
Date endTime = userCouponVO.getEndTime();
if (endTime != null && startTime != null) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+
couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
- differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
+
+ try {
+ differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
if (differentDays < 0) {
differentDays = 0;
}
@@ -660,7 +701,7 @@
return hasCoupon;
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
@@ -683,7 +724,25 @@
return getEnableListByCouponId(uid, 1, couponList);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
+ @Override
+ public List<UserSystemCouponVO> getFreeCouponList(Long uid) {
+ // 杩囨湡鍒�
+ updateInvalidSate(uid);
+
+ // 閫�鍥炲埜
+ sendBackTimeOutCoupon(uid);
+
+ // 鍟嗗搧鐩稿叧鐨勫埜
+ List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
+ if (couponList == null || couponList.size() == 0) {
+ return null;
+ }
+ return getEnableListByCouponId(uid, null, couponList);
+ }
+
+
+ @Transactional(rollbackFor = Exception.class)
@Override
public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
throws UserSystemCouponException, Exception {
@@ -734,7 +793,7 @@
return list;
}
-
+
@Override
public long countUsableFreeCouponForBuy(Long uid) {
if (uid == null)
@@ -751,8 +810,7 @@
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
-
-
+
@Override
public long countGiveFreeCoupon(Long uid) {
if (uid == null)
@@ -769,8 +827,6 @@
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
-
-
@Override
public long countUsableRewardCoupon(Long uid) {
@@ -914,26 +970,25 @@
}
}
}
-
+
if (weiquan) {
throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝鍞悗缁存潈璁㈠崟涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
}
-
// 璁㈠崟
- List<CommonOrderVO> listVo = commonOrderService.listGroupOrderNoByUid(0, 1, uid, 2, 1,1, orderNo, null,
- null, null, sourceType);
- if (listVo == null || listVo.size() == 0)
+ List<CommonOrderVO> listVo = commonOrderService.listGroupOrderNoByUid(0, 1, uid, 2, 1, 1, orderNo, null, null,
+ null, sourceType);
+ if (listVo == null || listVo.size() == 0)
throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝璇ヨ鍗曞凡涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
-
+
CommonOrderVO orderVO = listVo.get(0);
-
+
// 2.1鏂扮増
Date thirdCreateTime = orderVO.getThirdCreateTime();
Date accountTime = orderVO.getAccountTime();
- if (thirdCreateTime == null || accountTime == null)
+ if (thirdCreateTime == null || accountTime == null)
throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
-
+
long downOrderTime = thirdCreateTime.getTime();
long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
if (downOrderTime > limitDate) {
@@ -956,12 +1011,13 @@
valid = true;
}
}
-
+
if (!valid)
throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
}
BigDecimal hongBao = orderVO.getHongBao();
+
// 绾㈠寘鐘舵��
Integer hongBaoState = orderVO.getHongBaoState();
// 绾㈠寘绫诲瀷
@@ -974,6 +1030,11 @@
if (order == null)
throw new UserSystemCouponException(1, "璇ヨ鍗曚笉瀛樺湪");
+ // 浣跨敤濂栧姳鍒� 閲戦棰濋檺鍒�
+ if (hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) > 0){
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
+ }
+
/* 濂栭噾璁＄畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
// 杞崲鎴愬皬鏁扮偣
@@ -983,7 +1044,7 @@
UserSystemCouponUseMQMsg mqMsg = new UserSystemCouponUseMQMsg(userSystemCoupon.getId(), order.getOrderId(),
sourceType, systemCoupon.getType().name());
-
+
if (Constant.IS_TEST) {
useRewardCouponCore(userSystemCoupon, money, hongBao, uid, order);
} else { // 浜嬪姟娑堟伅
@@ -1009,7 +1070,7 @@
}
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
public void useRewardCouponCore(UserSystemCoupon userSystemCoupon, BigDecimal money, BigDecimal hongBao, Long uid,
Order order) throws Exception {
org.springframework.transaction.TransactionStatus transactionStatus = transactionManager
@@ -1032,9 +1093,19 @@
// 2.鎻掑叆鍏宠仈
orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
+ // 璁＄畻璇ヨ鍗曞師鏈夎繑鍒�
+ List<HongBaoOrder> hongBaoOrderlist = hongBaoOrderService
+ .listDetailByOrderIdAndSourceType(order.getOrderId(), order.getOrderType());
+ BigDecimal originalMoney = new BigDecimal(0);
+ if (hongBaoOrderlist != null)
+ for (HongBaoOrder ho : hongBaoOrderlist) {
+ if (ho.getHongBaoV2() != null && ho.getHongBaoV2().getState() == HongBaoV2.STATE_YILINGQU)
+ originalMoney = originalMoney.add(ho.getHongBaoV2().getMoney());
+ }
+
// 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(order.getOrderId(),
- order.getOrderType(), money, new UserInfo(uid));
+ order.getOrderType(), money, originalMoney, new UserInfo(uid));
userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
userInfoService.addMoney(new UserInfo(uid), money);
@@ -1060,10 +1131,22 @@
couponRecord.setUpdateTime(date);
userSystemCouponRecordService.insertSelective(couponRecord);
- // 鎻掑叆璧勯噾閫氱煡
- userMoneyMsgNotificationService.orderReward(uid, order.getOrderId(), order.getOrderType(), money,
- userInfoService.selectByPKey(uid).getMyHongBao());
- // 娑堟伅鎺ㄩ��
+ int goodsCount = 0;
+ String orderId = order.getOrderId();
+ Integer orderType = order.getOrderType();
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(orderType, orderId);
+ if (orderList != null && orderList.size() > 0) {
+ for (CommonOrder co : orderList) {
+ goodsCount += co.getCount();
+ }
+ }
+
+ // 璧勯噾娑堟伅
+ UserInfo userInfo = userInfoService.selectByPKey(uid);
+ userMoneyMsgNotificationService.rewardCounponReceived(uid, orderId, orderType, goodsCount,
+ money, userInfo.getMyHongBao(), order.getThirdCreateTime());
+
+ // 鍒镐娇鐢ㄦ垚鍔熸秷鎭�
try {
userOtherMsgNotificationService.rewardCouponEndMsg(uid, userSystemCoupon.getSource(), 1, "浣跨敤鎴愬姛");
} catch (Exception e) {
@@ -1088,7 +1171,7 @@
// 鏌ヨ璁板綍
UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,
- UserSystemCouponRecord.STATE_SUCCESS);
+ sourceType, UserSystemCouponRecord.STATE_SUCCESS);
if (record == null) {
throw new UserSystemCouponException(1, "娌℃湁浣跨敤鍒歌褰�");
}
@@ -1114,6 +1197,8 @@
}
Long uid = userSystemCoupon.getUid();
+
+ SystemEnum system=userInfoService.getUserSystem(uid);
CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo,
CommonOrder.STATE_JS, sourceType);
@@ -1147,9 +1232,8 @@
userRecordVO.setJumpWelfare(jumpWelfare);
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
-
- String rewardCouponRemark = configService.get(ConfigKeyEnum.rewardCouponRemark.getKey());
+ userRecordVO.setRuleLink(configService.getValue(ConfigKeyEnum.rewardCouponHelp.getKey(),system));
+ String rewardCouponRemark = configService.getValue(ConfigKeyEnum.rewardCouponRemark.getKey(),system);
if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
}
@@ -1166,7 +1250,7 @@
}
// 鏌ヨ璁板綍
- UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,sourceType, null);
if (record == null) {
throw new UserSystemCouponException(1, "娌℃湁浣跨敤鍒歌褰�");
}
@@ -1185,6 +1269,8 @@
if (baseCoupon == null || baseCoupon.getId() == null) {
throw new UserSystemCouponException(1, "鏈壘鍒板埜鍩烘湰淇℃伅");
}
+
+ SystemEnum system=userInfoService.getUserSystem(userSystemCoupon.getUid());
// 璁㈠崟
CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null,
@@ -1208,7 +1294,7 @@
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
+ userRecordVO.setRuleLink(configService.getValue(ConfigKeyEnum.freeCouponHelp.getKey(),system));
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
@@ -1246,7 +1332,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
+ rewardCouponRemark = configService.getValue(ConfigKeyEnum.freeCouponBackRemark.getKey(),system);
} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
// 閫�娆�
@@ -1265,7 +1351,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
+ rewardCouponRemark = configService.getValue(ConfigKeyEnum.freeCouponBackRemark.getKey(),system);
} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
// 鍏嶅崟涓�
@@ -1279,7 +1365,7 @@
progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
}
- rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
+ rewardCouponRemark = configService.getValue(ConfigKeyEnum.freeCouponRemark.getKey(),system);
} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
// 鍏嶅崟鎴愬姛
@@ -1301,7 +1387,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
- rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
+ rewardCouponRemark = configService.getValue(ConfigKeyEnum.freeCouponRemark.getKey(),system);
}
userRecordVO.setProgressState(progressState);
userRecordVO.setPayMoney(payMoney);
@@ -1360,21 +1446,18 @@
return userRecordVO;
}
-
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
- public void updateStateByDrawback(String orderNo) throws Exception {
+ public void updateStateByDrawback(String orderNo, Integer sourceType) throws Exception {
if (orderNo == null || orderNo.trim().length() == 0) {
return;
}
- UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,sourceType, null);
if (record == null) {
return;
}
-
- record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
@@ -1383,42 +1466,36 @@
sendBackCoupon(record.getUserSystemCoupon(), record);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
- public void updateStateByArrivalAccount(String orderNo) throws Exception {
-
+ public void updateStateByArrivalAccount(String orderNo, Integer sourceType) throws Exception {
if (orderNo == null || orderNo.trim().length() == 0) {
return;
}
- UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, 2);
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,sourceType, 2);
if (record == null) {
return;
}
-
- record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
record.setState(UserSystemCouponRecord.STATE_SUCCESS);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
}
-
-
+
@Override
public List<UserSystemCoupon> getCounponNowInvalid(int count) {
return userSystemCouponMapper.getCounponNowInvalid(count);
}
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
- public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
+ public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long gId,Integer sourceType)
throws Exception {
-
- boolean isfree = false;
-
- if (uid == null || payment == null || auctionId == null || orderNo == null || orderNo.trim().length() == 0) {
+ if (uid == null || payment == null || gId == null || orderNo == null || orderNo.trim().length() == 0) {
throw new Exception("浼犻�掑弬鏁颁笉鑳戒负绌�");
}
-
+
+ boolean isfree = false;
// 鏌ヨ绛夊緟鍖归厤鐨勫埜璁板綍
List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid,
UserSystemCouponRecord.STATE_WAIT);
@@ -1432,7 +1509,11 @@
for (UserSystemCouponRecord userSystemCouponRecord : list) {
Long goodId = userSystemCouponRecord.getGoodId();
- if (auctionId.equals(goodId)) {
+ Integer goodSource = userSystemCouponRecord.getGoodSource();
+ if (goodSource == null)
+ continue;
+
+ if (gId.equals(goodId) && goodSource == sourceType) {
matching = true; // 鍖归厤鎴愬姛
record = userSystemCouponRecord;
break;
@@ -1441,7 +1522,7 @@
// 鍟嗗搧鍖归厤鎴愬姛
if (matching) {
-
+ record.setGoodSource(sourceType);
record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
@@ -1477,8 +1558,6 @@
return isfree;
}
-
-
/**
* 闅忔満鍒告瘮渚�
@@ -1533,64 +1612,8 @@
}
}
- @Override
- @Transactional(rollbackFor=Exception.class)
- public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
- throws UserSystemCouponException, Exception {
- if (couponType == null || uid == null) {
- throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
- }
- SystemCoupon coupon = null;
- if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
- coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
- } else {
- coupon = systemCouponService.getCouponByType(couponType);
- }
-
- if (coupon == null) {
- throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
- }
-
- int stateActivated = 1;
- if (couponType == CouponTypeEnum.freeCoupon.name()) {
- stateActivated = 0; //
- } else if (couponType == CouponTypeEnum.welfareFreeCoupon.name()
- && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
- stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
- }
-
- Integer expiryDay = null;
- if (stateActivated == 0)
- expiryDay = coupon.getActivateDay();
-
- if (expiryDay == null || expiryDay == 0)
- expiryDay = coupon.getExpiryDay();
-
- // 璁＄畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
- String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if (endDay != null && endDay.trim().length() > 0) {
- endDay += " 23:59:59";
- }
- Date endTime = format.parse(endDay);
-
- UserSystemCoupon userCoupon = new UserSystemCoupon();
- userCoupon.setUid(uid);
- userCoupon.setSource(source);
- userCoupon.setSystemCoupon(coupon);
- userCoupon.setStateActivated(stateActivated);
- userCoupon.setStartTime(new Date());
- userCoupon.setEndTime(endTime);
- userCoupon.setGive(false);
- userCoupon.setCreateTime(new Date());
- userCoupon.setUpdateTime(new Date());
- userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
-
- insertSelective(userCoupon);
- }
-
- @Transactional(rollbackFor=Exception.class)
+ @Transactional(rollbackFor = Exception.class)
@Override
public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -1608,6 +1631,8 @@
if (listVO == null || listVO.size() == 0) {
return listVO;
}
+
+ SystemEnum system=userInfoService.getUserSystem(uid);
// 鏄惁婵�娲婚個璇风爜
String inviteCode = null;
@@ -1690,7 +1715,7 @@
// 缁熻寰呮縺娲绘暟閲�
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
- String activateNum = configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey());
+ String activateNum = configService.getValue(ConfigKeyEnum.freeCouponActivateNum.getKey(),system);
userCouponVO.setCouponEffect(
"(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
}
@@ -1728,7 +1753,7 @@
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
} else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
|| CouponTypeEnum.freeCouponBuy == type) {
- jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
+ jumpLink.put("url", configService.getValue(ConfigKeyEnum.freeGoodsList.getKey(),system));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
@@ -1756,13 +1781,13 @@
TokenTypeEnum tokenType = null;
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
+ tips = configService.getValue(ConfigKeyEnum.giveFreeCouponTips.getKey(),system);
tokenType = TokenTypeEnum.freeCoupon;
}
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
+ tips = configService.getValue(ConfigKeyEnum.giveRebatePercentCouponTips.getKey(),system);
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
@@ -1778,7 +1803,7 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get(ConfigKeyEnum.appDownLink.getKey()));
+ configService.getValue(ConfigKeyEnum.appDownLink.getKey(),system));
userCouponVO.setGiveTips(tips);
}
@@ -1860,14 +1885,16 @@
if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon)
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
+ SystemEnum system=userInfoService.getUserSystem(uid);
+
String tips = null;
TokenTypeEnum tokenTypeEnum = null;
if (type == CouponTypeEnum.freeCouponGive) {
tokenTypeEnum = TokenTypeEnum.freeCoupon;
- tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
+ tips = configService.getValue(ConfigKeyEnum.giveFreeCouponTips.getKey(),system);
} else if (type == CouponTypeEnum.rebatePercentCoupon) {
tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
- tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
+ tips = configService.getValue(ConfigKeyEnum.giveRebatePercentCouponTips.getKey(),system);
} else {
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
}
@@ -1885,7 +1912,7 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get(ConfigKeyEnum.appDownLink.getKey()));
+ configService.getValue(ConfigKeyEnum.appDownLink.getKey(),system));
return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
}
@@ -1935,7 +1962,7 @@
while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey()));
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.getValue(ConfigKeyEnum.appDownLink.getKey(),system));
UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
@@ -1944,9 +1971,8 @@
msg.setCouponType(type.name());
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg);
// 寤惰繜涓�鍒嗛挓
- message.setStartDeliverTime(endTime.getTime() + 1000 * 60);
try {
- producer.send(message);
+ rocketMQManager.sendNormalMsg(message,1000 * 60L, null);
} catch (Exception e) {
throw new UserSystemCouponException(1, "鍒涘缓璧犻�佷俊鎭け璐�");
}
@@ -2017,16 +2043,17 @@
continue;
}
-
try { // 娑堟伅鎺ㄩ��
Long uid = userCoupon.getUid();
String source = userCoupon.getSource();
- if (baseCoupon.getType() == CouponTypeEnum.freeCoupon || baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
- userOtherMsgNotificationService.freeCouponEndMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "宸茶繃鏈�");
- } else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
- userOtherMsgNotificationService.freeCouponEndMsg(uid, "璧犻�佸厤鍗曞埜", source, 1, "宸茶繃鏈�");
- } if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
- userOtherMsgNotificationService.rewardCouponEndMsg(uid, source, 1, "宸茶繃鏈�");
+ if (baseCoupon.getType() == CouponTypeEnum.freeCoupon
+ || baseCoupon.getType() == CouponTypeEnum.freeCouponBuy) {
+ userOtherMsgNotificationService.freeCouponEndMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "宸茶繃鏈�");
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCouponGive) {
+ userOtherMsgNotificationService.freeCouponEndMsg(uid, "璧犻�佸厤鍗曞埜", source, 1, "宸茶繃鏈�");
+ }
+ if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponEndMsg(uid, source, 1, "宸茶繃鏈�");
}
} catch (Exception e) {
e.printStackTrace();
@@ -2036,8 +2063,9 @@
/**
* 閫�鍥炲埜 鍒濆鏁版嵁
- *
- * @param userSystemCoupon
+ * @param userCoupon
+ * @param record
+ * @throws Exception
*/
public void sendBackCoupon(UserSystemCoupon userCoupon, UserSystemCouponRecord record) throws Exception {
if (userCoupon == null)
@@ -2071,7 +2099,7 @@
Long uid = userCoupon.getUid();
String source = userCoupon.getSource();
Date startTime = userCoupon.getStartTime();
- if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())
+ if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())
|| CouponTypeEnum.freeCouponBuy.name().equals(record.getCouponType())) {
userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "浣跨敤閫�鍥�", startTime, endTime);
}
@@ -2200,11 +2228,11 @@
String source = userCoupon.getSource();
CouponTypeEnum type = systemCoupon.getType();
if (CouponTypeEnum.freeCouponGive == type) {
- userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�",
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�",
userCoupon.getStartTime(), userCoupon.getEndTime());
} else if (CouponTypeEnum.rebatePercentCoupon == systemCoupon.getType()) {
- userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�",
- userCoupon.getStartTime(), userCoupon.getEndTime());
+ userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�", userCoupon.getStartTime(),
+ userCoupon.getEndTime());
}
}
@@ -2275,11 +2303,11 @@
String source = userCoupon.getSource();
CouponTypeEnum type = systemCoupon.getType();
if (CouponTypeEnum.freeCouponGive == type) {
- userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�",
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, type.getDesc(), source, 1, "浣跨敤閫�鍥�",
userCoupon.getStartTime(), userCoupon.getEndTime());
} else if (CouponTypeEnum.rebatePercentCoupon == systemCoupon.getType()) {
- userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�",
- userCoupon.getStartTime(), userCoupon.getEndTime());
+ userOtherMsgNotificationService.rewardCouponWinMsg(uid, source, 1, "浣跨敤閫�鍥�", userCoupon.getStartTime(),
+ userCoupon.getEndTime());
}
}
}
@@ -2288,13 +2316,13 @@
public boolean getValidRebateCoupon(Long uid) {
// 杩囨湡鍒�
updateInvalidSate(uid);
-
- List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());
+
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid,
+ CouponTypeEnum.rebatePercentCoupon.name());
if (listCoupon == null || listCoupon.size() == 0)
return false;
return true;
}
-
@Override
public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception {
@@ -2304,8 +2332,8 @@
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
- List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid,
+ CouponTypeEnum.rebatePercentCoupon.name());
if (listCoupon == null || listCoupon.size() == 0)
return null;
@@ -2403,9 +2431,11 @@
}
}
+ SystemEnum system=userInfoService.getUserSystem(uid);
+
// 婵�娲绘暟閲�
boolean result = false;
- int limitNum = Integer.parseInt(configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey()));
+ int limitNum = Integer.parseInt(configService.getValue(ConfigKeyEnum.freeCouponActivateNum.getKey(),system));
Integer state = couponActivate.getState();
int count = couponActivate.getCount();
@@ -2439,7 +2469,6 @@
* 婵�娲诲埜
*
* @param coupon
- * @param activateNum
*/
@Transactional
private void activateFreeCoupon(UserSystemCoupon coupon, int limitNum) {
@@ -2469,8 +2498,7 @@
public void run() {
Long uid = coupon.getUid();
String source = coupon.getSource();
- userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1,
- "婵�娲绘垚鍔�", nowDate, endTime);
+ userOtherMsgNotificationService.freeCouponWinMsg(uid, "鑷喘鍏嶅崟鍒�", source, 1, "婵�娲绘垚鍔�", nowDate, endTime);
}
});
} catch (Exception e) {
@@ -2479,4 +2507,5 @@
}
}
+
}
--
Gitblit v1.8.0