From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 235 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 120 insertions(+), 115 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 90c43a0..ac3bb18 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
@@ -46,10 +46,10 @@
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.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -79,6 +79,7 @@
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.util.annotation.RequestSerializableByKeyService;
@@ -155,6 +156,7 @@
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
+ @Lazy
@Resource
private CommonOrderCountService commonOrderCountService;
@@ -179,7 +181,7 @@
@Resource(name = "producer")
private Producer producer;
-
+
@Resource
private UserVIPInfoService userVIPInfoService;
@@ -229,7 +231,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public UserSystemCoupon insertUserCoupon(Long uid, String couponType, String source, BigDecimal percent,
Boolean needNotify) throws UserSystemCouponException, Exception {
@@ -251,6 +253,8 @@
} else {
coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
}
+ } else if (couponType.equals(CouponTypeEnum.freeCouponGive.name())) {
+ coupon = systemCouponService.getCouponByType(couponType);
}
if (coupon == null) {
@@ -303,23 +307,18 @@
executor.execute(new Runnable() {
@Override
- public void run() {
- UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- // 娣诲姞涓�鏉℃秷鎭�
- if (userInfoExtra != null) {
- if (userInfoExtra.getCouponNews() == null) {
- userInfoExtra.setCouponNews(1);
+ public void run() { // 绂忓埄涓績绾㈢偣
+ UserInfoExtra extra = userInfoExtraService.getUserInfoExtra(uid);
+ if (extra != null) {
+ UserInfoExtra updateExtra = new UserInfoExtra();
+ updateExtra.setId(extra.getId());
+ if (extra.getCouponNews() == null) {
+ updateExtra.setCouponNews(1);
} else {
- userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ updateExtra.setCouponNews(extra.getCouponNews() + 1);
}
-
- try {
- userInfoExtraService.saveUserInfoExtra(userInfoExtra);
- } catch (UserInfoExtraException e) {
- e.printStackTrace();
- }
+ userInfoExtraService.updateByPrimaryKeySelective(updateExtra);
}
-
}
});
@@ -346,7 +345,7 @@
return userCoupon;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
throws UserSystemCouponException, Exception {
@@ -451,7 +450,7 @@
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
// 鍏嶅崟鍟嗗搧鍒楄〃
- jumpLink.put("url", configService.get("free_goods_list"));
+ jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
@@ -469,7 +468,7 @@
} else if (UserSystemCoupon.STATE_IN_USE == state) {
// 浣跨敤涓�
- userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+ userCouponVO.setInUseExplain(configService.get(ConfigKeyEnum.freeCouponUsingHelp.getKey()));
}
}
@@ -612,7 +611,7 @@
return hasCoupon;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
@@ -635,7 +634,7 @@
return getEnableListByCouponId(uid, 1, couponList);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
throws UserSystemCouponException, Exception {
@@ -703,6 +702,26 @@
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
+
+
+ @Override
+ public long countGiveFreeCoupon(Long uid) {
+ if (uid == null)
+ return 0;
+
+ List<SystemCoupon> couponList = systemCouponService.getGiveFreeCouponList();
+ if (couponList == null || couponList.size() == 0)
+ return 0;
+
+ List<Long> listCouponId = new ArrayList<Long>();
+ for (SystemCoupon systemCoupon : couponList) {
+ listCouponId.add(systemCoupon.getId());
+ }
+
+ return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
+ }
+
+
@Override
public long countUsableRewardCoupon(Long uid) {
@@ -721,7 +740,7 @@
return userSystemCouponMapper.countUsableByUid(uid, listCouponId);
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType)
throws UserSystemCouponException, Exception {
@@ -798,7 +817,7 @@
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType, AcceptData acceptData)
throws UserSystemCouponException, Exception {
@@ -851,44 +870,46 @@
throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝鍞悗缁存潈璁㈠崟涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
}
+
// 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,
- sourceType);
- if (orderVO == null)
- 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)
+ throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝璇ヨ鍗曞凡涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
+
+ CommonOrderVO orderVO = listVo.get(0);
+
+ // 2.1鏂扮増
+ Date thirdCreateTime = orderVO.getThirdCreateTime();
+ Date accountTime = orderVO.getAccountTime();
+ if (thirdCreateTime == null || accountTime == null)
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
+
+ long downOrderTime = thirdCreateTime.getTime();
+ long limitDate = TimeUtil.convertDateToTemp(Constant.VIP_ONLINE_TIME);
+ if (downOrderTime > limitDate) {
+ boolean valid = false;
+ Date endDay = DateUtil.plusDayDate(Constant.COUPON_REWARD_LIMIT_DAY, accountTime);
+ long currentTime = java.lang.System.currentTimeMillis();
+ if (endDay.getTime() > currentTime) {
+ DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
+ if (dateInfo != null) {
+ if (dateInfo.getDay() > 0)
+ valid = true;
- // 鐗堟湰鍖哄垎锛�2.0.2
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- Date thirdCreateTime = orderVO.getThirdCreateTime();
- if (thirdCreateTime != null) {
- long downOrderTime = thirdCreateTime.getTime();
- long limitDate = Long.parseLong("1573315200000"); // TODO
- // 鏃ユ湡寰呯‘瀹�2019-11-10
- if (downOrderTime > limitDate) {
- Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
- long currentTime = java.lang.System.currentTimeMillis();
- if (endDay.getTime() > currentTime) {
- boolean valid = false;
- DateInfo dateInfo = DateUtil.dateDiff3(currentTime, endDay.getTime());
- if (dateInfo != null) {
- if (dateInfo.getDay() > 0)
- valid = true;
+ if (!valid && dateInfo.getHour() > 0)
+ valid = true;
- if (!valid && dateInfo.getHour() > 0)
- valid = true;
+ if (!valid && dateInfo.getMinute() > 0)
+ valid = true;
- if (!valid && dateInfo.getMinute() > 0)
- valid = true;
-
- if (!valid && dateInfo.getSecond() >= 0)
- valid = true;
- }
-
- if (!valid)
- throw new UserSystemCouponException(1, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�");
- }
+ if (!valid && dateInfo.getSecond() > 0)
+ valid = true;
}
}
+
+ if (!valid)
+ throw new UserSystemCouponException(1, "璇ヨ鍗曚笉鑳戒娇鐢ㄥ鍔卞埜");
}
BigDecimal hongBao = orderVO.getHongBao();
@@ -935,7 +956,7 @@
}
}
- @Transactional
+ @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
@@ -1073,9 +1094,9 @@
userRecordVO.setJumpWelfare(jumpWelfare);
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
+ userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.rewardCouponHelp.getKey()));
- String rewardCouponRemark = configService.get("reward_coupon_remark");
+ String rewardCouponRemark = configService.get(ConfigKeyEnum.rewardCouponRemark.getKey());
if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
}
@@ -1134,7 +1155,7 @@
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("free_coupon_help"));
+ userRecordVO.setRuleLink(configService.get(ConfigKeyEnum.freeCouponHelp.getKey()));
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
@@ -1172,7 +1193,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get("free_coupon_back_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
// 閫�娆�
@@ -1191,7 +1212,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
- rewardCouponRemark = configService.get("free_coupon_back_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponBackRemark.getKey());
} else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
// 鍏嶅崟涓�
@@ -1205,7 +1226,7 @@
progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
}
- rewardCouponRemark = configService.get("free_coupon_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
} else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
// 鍏嶅崟鎴愬姛
@@ -1227,7 +1248,7 @@
jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
- rewardCouponRemark = configService.get("free_coupon_remark");
+ rewardCouponRemark = configService.get(ConfigKeyEnum.freeCouponRemark.getKey());
}
userRecordVO.setProgressState(progressState);
userRecordVO.setPayMoney(payMoney);
@@ -1338,7 +1359,7 @@
}
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateStateByDrawback(String orderNo) throws Exception {
@@ -1360,7 +1381,7 @@
sendBackCoupon(record.getUserSystemCoupon(), record);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public void updateStateByArrivalAccount(String orderNo) throws Exception {
@@ -1394,7 +1415,7 @@
return userSystemCouponMapper.getCounponNowInvalid(count);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
throws Exception {
@@ -1474,7 +1495,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
return;
@@ -1557,7 +1578,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void randomRewardCoupon(int num, Long uid, String source) throws Exception {
if (num < 1) {
return;
@@ -1612,13 +1633,16 @@
if (userInfoExtra == null) {
return;
}
+
+ UserInfoExtra extra = new UserInfoExtra();
+ extra.setId(userInfoExtra.getId());
Integer couponNews = userInfoExtra.getCouponNews();
if (couponNews == null) {
- userInfoExtra.setCouponNews(num);
+ extra.setCouponNews(num);
} else {
- userInfoExtra.setCouponNews(couponNews + num);
+ extra.setCouponNews(couponNews + num);
}
- userInfoExtraService.saveUserInfoExtra(userInfoExtra);
+ userInfoExtraService.saveUserInfoExtra(extra);
}
@Override
@@ -1627,7 +1651,7 @@
throws Exception {
// 娣诲姞濂栧姳鍒�
insertUserCoupon(uid, CouponTypeEnum.rebatePercentCoupon.name(), "绯荤粺璧犻��",
- new BigDecimal(configService.get("exchange_rebate_percent")), false);
+ new BigDecimal(configService.get(ConfigKeyEnum.exchangeRebatePercent.getKey())), false);
// 娣诲姞濂栧姳鍒告秷鎭�
userOtherMsgNotificationService.systemGiveRewardCoupon(uid, null, MsgOtherSystemGiveDTOFactory
.createRewardCouponGive(num, "璇锋寜鐓ц繑鍒╁鍔卞埜瑙勫垯浣跨敤", "杩斿埄濂栧姳鍒�", orderId, orderType, reason));
@@ -1694,7 +1718,7 @@
}
@Override
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent)
throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
@@ -1750,7 +1774,7 @@
insertSelective(userCoupon);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -1850,7 +1874,7 @@
// 缁熻寰呮縺娲绘暟閲�
if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
- String activateNum = configService.get("free_coupon_activate_num");
+ String activateNum = configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey());
userCouponVO.setCouponEffect(
"(" + activateCount + "/" + Integer.parseInt(activateNum) + ")寰呮縺娲�");
}
@@ -1888,7 +1912,7 @@
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
} else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
|| CouponTypeEnum.freeCouponBuy == type) {
- jumpLink.put("url", configService.get("free_goods_list"));
+ jumpLink.put("url", configService.get(ConfigKeyEnum.freeGoodsList.getKey()));
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
@@ -1916,13 +1940,13 @@
TokenTypeEnum tokenType = null;
if (CouponTypeEnum.freeCouponGive == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
tokenType = TokenTypeEnum.freeCoupon;
}
if (CouponTypeEnum.rebatePercentCoupon == type) {
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
- tips = configService.get("give_rebate_percent_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
tokenType = TokenTypeEnum.rebatePercentCoupon;
}
@@ -1938,7 +1962,7 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get("app_down_link"));
+ configService.get(ConfigKeyEnum.appDownLink.getKey()));
userCouponVO.setGiveTips(tips);
}
@@ -1997,7 +2021,7 @@
return listVO;
}
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@Override
public UserSystemCouponVO giveCoupon(Long uid, Long id) throws UserSystemCouponException {
UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
@@ -2024,10 +2048,10 @@
TokenTypeEnum tokenTypeEnum = null;
if (type == CouponTypeEnum.freeCouponGive) {
tokenTypeEnum = TokenTypeEnum.freeCoupon;
- tips = configService.get("give_free_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveFreeCouponTips.getKey());
} else if (type == CouponTypeEnum.rebatePercentCoupon) {
tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
- tips = configService.get("give_rebate_percent_coupon_tips");
+ tips = configService.get(ConfigKeyEnum.giveRebatePercentCouponTips.getKey());
} else {
throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
}
@@ -2045,19 +2069,20 @@
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}",
- configService.get("app_down_link"));
+ configService.get(ConfigKeyEnum.appDownLink.getKey()));
return createUserCouponVOo(userSystemCoupon, systemCoupon, record, tips);
}
}
Date nowDate = new Date();
+ Date endTime = DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate);
// 鎻掑叆璧犻�佽褰�
UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord();
giveRecord.setCouponId(id);
giveRecord.setGiveUid(uid);
giveRecord.setGiveTime(nowDate);
- giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate));
+ giveRecord.setEndTime(endTime);
userSystemCouponGiveRecordService.insertSelective(giveRecord);
// 鍒涘缓璁板綍
@@ -2066,7 +2091,7 @@
tokenRecord.setIdentify(giveRecord.getId() + "");
tokenRecord.setType(tokenTypeEnum);
tokenRecord.setStartTime(nowDate);
- tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate));
+ tokenRecord.setEndTime(endTime);
tokenRecord.setState(0);
tokenRecordService.insertSelective(tokenRecord);
@@ -2094,7 +2119,7 @@
while (tips.contains("{APP鍚嶇О}")) {
tips = tips.replace("{APP鍚嶇О}", projectChineseName);
}
- tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get(ConfigKeyEnum.appDownLink.getKey()));
UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
@@ -2102,6 +2127,8 @@
msg.setUserSystemCouponId(id);
msg.setCouponType(type.name());
Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg);
+ // 寤惰繜涓�鍒嗛挓
+ message.setStartDeliverTime(endTime.getTime() + 1000 * 60);
try {
producer.send(message);
} catch (Exception e) {
@@ -2294,7 +2321,7 @@
}
@Override
- @RequestSerializableByKeyService(key = "#id")
+ @RequestSerializableByKeyService(key = "#couponId")
@Transactional(rollbackFor = Exception.class)
public void sendBackByGiveId(Long couponId) {
if (couponId == null)
@@ -2461,34 +2488,16 @@
}
@Override
- public boolean getIncludeExchange(Long uid) {
+ public boolean getValidRebateCoupon(Long uid) {
// 杩囨湡鍒�
updateInvalidSate(uid);
-
- String percent = configService.get("exchange_rebate_percent");
- if (StringUtil.isNullOrEmpty(percent))
- percent = "35";
- List<UserSystemCoupon> listCoupon = userSystemCouponMapper.getIncludeExchange(uid, Integer.parseInt(percent),
- CouponTypeEnum.rebatePercentCoupon.name());
+
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());
if (listCoupon == null || listCoupon.size() == 0)
return false;
return true;
}
- @Override
- public boolean getIncludeNotExchange(Long uid) {
- // 杩囨湡鍒�
- updateInvalidSate(uid);
-
- String percent = configService.get("exchange_rebate_percent");
- if (StringUtil.isNullOrEmpty(percent))
- percent = "35";
- List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,
- Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
- if (listCoupon == null || listCoupon.size() == 0)
- return false;
- return true;
- }
@Override
public List<UserSystemCouponVO> listIncludeNotExchange(Long uid) throws Exception {
@@ -2498,12 +2507,8 @@
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
- String percent = configService.get("exchange_rebate_percent");
- if (StringUtil.isNullOrEmpty(percent))
- percent = "35";
- List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getIncludeNotExchange(uid,
- Integer.parseInt(percent), CouponTypeEnum.rebatePercentCoupon.name());
+ List<UserSystemCouponVO> listCoupon = userSystemCouponMapper.getValidByUidAndType(uid, CouponTypeEnum.rebatePercentCoupon.name());
if (listCoupon == null || listCoupon.size() == 0)
return null;
@@ -2603,7 +2608,7 @@
// 婵�娲绘暟閲�
boolean result = false;
- int limitNum = Integer.parseInt(configService.get("free_coupon_activate_num"));
+ int limitNum = Integer.parseInt(configService.get(ConfigKeyEnum.freeCouponActivateNum.getKey()));
Integer state = couponActivate.getState();
int count = couponActivate.getCount();
--
Gitblit v1.8.0