From e91ab3c0e8513ea917a655010e518b5508afea3d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 01 七月 2020 11:17:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 224 ++++++++++++++++++++++++++++++++++---------------------
1 files changed, 138 insertions(+), 86 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 38dc60c..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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -317,6 +318,96 @@
return userSystemCoupon;
}
+
+ @Override
+ @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)
@@ -550,27 +641,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;
@@ -596,11 +684,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;
}
@@ -679,6 +771,24 @@
@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 {
@@ -728,7 +838,7 @@
return list;
}
-
+
@Override
public long countUsableFreeCouponForBuy(Long uid) {
if (uid == null)
@@ -1106,7 +1216,7 @@
// 鏌ヨ璁板綍
UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,
- UserSystemCouponRecord.STATE_SUCCESS);
+ sourceType, UserSystemCouponRecord.STATE_SUCCESS);
if (record == null) {
throw new UserSystemCouponException(1, "娌℃湁浣跨敤鍒歌褰�");
}
@@ -1184,7 +1294,7 @@
}
// 鏌ヨ璁板綍
- UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo,sourceType, null);
if (record == null) {
throw new UserSystemCouponException(1, "娌℃湁浣跨敤鍒歌褰�");
}
@@ -1380,18 +1490,16 @@
@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);
@@ -1402,18 +1510,15 @@
@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);
@@ -1426,15 +1531,13 @@
@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);
@@ -1448,7 +1551,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;
@@ -1457,7 +1564,7 @@
// 鍟嗗搧鍖归厤鎴愬姛
if (matching) {
-
+ record.setGoodSource(sourceType);
record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
@@ -1547,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
@@ -2493,4 +2544,5 @@
}
}
+
}
--
Gitblit v1.8.0