From be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 29 六月 2020 16:41:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 65 ++------------------------------
1 files changed, 4 insertions(+), 61 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 4f8aa92..c4abba5 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
@@ -322,7 +322,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
public UserSystemCoupon freeCouponWinBySystem(Long uid, CouponTypeEnum typeEnum, String source, int num, boolean notify,
- Integer expiryDay) throws UserSystemCouponException, Exception {
+ Integer expiryDay, Integer activated) throws UserSystemCouponException, Exception {
if (typeEnum == null || uid == null || StringUtil.isNullOrEmpty(source) || num < 1) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
@@ -333,15 +333,14 @@
}
// 婵�娲荤姸鎬�
- int stateActivated = 0;
// 鑷喘鍏嶅崟鍒搞�佽禒閫佸厤鍗曞埜鍙洿鎺ヤ娇鐢�
if (coupon.getType() == CouponTypeEnum.freeCouponBuy || coupon.getType() == CouponTypeEnum.freeCouponGive) {
- stateActivated = 1;
+ activated = 1;
}
// 鏈夋晥鏃堕暱
if (expiryDay == null) {
- if (stateActivated == 0)
+ if (activated == 0)
expiryDay = coupon.getActivateDay();
if (expiryDay == null || expiryDay == 0)
expiryDay = coupon.getExpiryDay();
@@ -363,7 +362,7 @@
userCoupon.setSource(source);
userCoupon.setSystemCoupon(coupon);
userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userCoupon.setStateActivated(stateActivated);
+ userCoupon.setStateActivated(activated);
userCoupon.setStartTime(nowTime);
userCoupon.setEndTime(endTime);
userCoupon.setCreateTime(nowTime);
@@ -1655,62 +1654,6 @@
}
}
- @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.countFirstTeam(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)
@Override
--
Gitblit v1.8.0