From dc20bf7713654341d994d568bc0b55cfd5c23614 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 29 三月 2019 10:56:33 +0800
Subject: [PATCH] 免单券退回时间 改为10分钟
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 614 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 428 insertions(+), 186 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 5149f4e..2d3ff11 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
@@ -15,7 +15,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
-import org.yeshi.utils.JsonUtil;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
@@ -28,6 +27,8 @@
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.push.PushCoupon;
+import com.yeshi.fanli.entity.push.PushCouponRecord;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
@@ -46,6 +47,8 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
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.DeviceLotteryRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -69,10 +72,10 @@
@Resource(name = "taskExecutor")
private TaskExecutor executor;
-
+
@Resource
private RedisManager redisManager;
-
+
@Resource
private UserSystemCouponMapper userSystemCouponMapper;
@@ -111,22 +114,29 @@
@Resource
private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
-
+
@Resource
private UserInfoExtraService userInfoExtraService;
-
+
@Resource
private ThreeSaleSerivce threeSaleSerivce;
-
+
@Resource
private UserOtherMsgNotificationService userOtherMsgNotificationService;
-
+
@Resource
private DeviceLotteryRecordService deviceLotteryRecordService;
-
+
@Resource
private CommonOrderCountService commonOrderCountService;
-
+
+ @Resource
+ private PushCouponService pushCouponService;
+
+ @Resource
+ private PushCouponRecordService pushCouponRecordService;
+
+
@Override
public int insertSelective(UserSystemCoupon record) {
return userSystemCouponMapper.insertSelective(record);
@@ -156,7 +166,7 @@
public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) {
return userSystemCouponMapper.getUserCouponBySource(uid, source);
}
-
+
@Override
public long countUserCouponList(Long uid) {
return userSystemCouponMapper.countUserCouponList(uid);
@@ -164,17 +174,26 @@
@Override
@Transactional
- public void insertUserCoupon(Long uid, String couponType, String source)throws UserSystemCouponException,Exception{
-
+ public void insertUserCoupon(Long uid, String couponType, String source)
+ throws UserSystemCouponException, Exception {
+
if (couponType == null || uid == null) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
- }
+ }
+
+ SystemCoupon coupon = null;
+ if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) {
+ // 绂忓埄鍏嶅崟鍒�
+ coupon = systemCouponService.getCouponByType(couponType);
+ } else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
+ // 濂栧姳鍒�10%
+ coupon = systemCouponService.getCouponByTypeAndPercent(couponType,new BigDecimal(10));
+ }
- SystemCoupon coupon= systemCouponService.getCouponByType(couponType);
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
- }
-
+ }
+
int stateActivated = 1;
if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
// 绂忓埄鍒哥姸鎬�
@@ -184,12 +203,13 @@
stateActivated = 0;
}
}
-
+
// 缁撴潫鏃ユ湡
- String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
-
+
UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
userCoupon.setSource(source);
@@ -202,7 +222,7 @@
userCoupon.setUpdateTime(new Date());
// 鎻掑叆鏁版嵁搴�
insertSelective(userCoupon);
-
+
executor.execute(new Runnable() {
@Override
public void run() {
@@ -214,18 +234,17 @@
} else {
userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
}
-
-
+
try {
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
} catch (UserInfoExtraException e) {
e.printStackTrace();
}
}
-
+
}
});
-
+
// 娑堟伅鎺ㄩ��
try {
if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
@@ -233,10 +252,10 @@
} else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
} else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon, coupon.getPercent().intValue());
}
-
- } catch(Exception e) {
+
+ } catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -245,7 +264,6 @@
}
}
-
@Transactional
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
@@ -254,12 +272,12 @@
if (uid == null) {
return null;
}
-
+
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -276,7 +294,7 @@
*
* @param listVO
*/
- public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{
+ public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception {
for (UserSystemCouponVO userCouponVO : listVO) {
@@ -300,15 +318,15 @@
// 浣跨敤鐘舵��
Integer state = userCouponVO.getState();
-
+
// 鍒哥被鍨�
CouponTypeEnum type = systemCoupon.getType();
-
+
// 鎸夐挳璺宠浆
Map<String, Object> jumpBtn = null;
-
+
Integer stateActivated = userCouponVO.getStateActivated();
-
+
if (stateActivated == null || stateActivated == 0) {
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRemark());
@@ -320,20 +338,21 @@
}
jumpBtn = new HashMap<String, Object>();
-
-
+
// 閭�璇烽槦鍛樼晫闈�
/*
* Map<String, Object> jumpLink = new HashMap<String, Object>();
- *UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
- * if (userInfoExtra != null && userInfoExtra.getInviteCode() != null &&
- * userInfoExtra.getInviteCode().trim().length() > 0) { // 閭�璇锋縺娲绘垚鍔熺晫闈�
- * jumpLink.put("url", configService.get("invite_activation_success_url") +
+ * UserInfoExtra userInfoExtra =
+ * userInfoExtraService.getUserInfoExtra(uid); if (userInfoExtra
+ * != null && userInfoExtra.getInviteCode() != null &&
+ * userInfoExtra.getInviteCode().trim().length() > 0) { //
+ * 閭�璇锋縺娲绘垚鍔熺晫闈� jumpLink.put("url",
+ * configService.get("invite_activation_success_url") +
* "?alert=true"); } else { // 婵�娲婚個璇风爜鐣岄潰 jumpLink.put("url",
* configService.get("invite_activation_url")); }
- * jumpBtn.put("params", jumpLink);
+ * jumpBtn.put("params", jumpLink);
*/
-
+
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
} else if (stateActivated == 1) {
@@ -345,7 +364,7 @@
if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) {
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
-
+
// 鍏嶅崟鍟嗗搧鍒楄〃
jumpLink.put("url", configService.get("free_goods_list"));
@@ -356,24 +375,24 @@
} else if (CouponTypeEnum.rebatePercentCoupon == type) {
// 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
jumpLink.put("state", "2");
-
+
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
// 璺宠浆璁㈠崟鍒楄〃
jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
}
-
+
} else if (UserSystemCoupon.STATE_IN_USE == state) {
// 浣跨敤涓�
userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
}
}
-
+
// 鍒稿け鏁堝浘鐗囨浛鎹�
if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
- }
-
+ }
+
userCouponVO.setJumpBtn(jumpBtn);
String couponTerm = "鏈夋晥鏈燂細";
@@ -440,7 +459,6 @@
userCouponVO.setCouponRule(systemCoupon.getRule());
userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
-
int differentDays = 0;
String couponTerm = "鏈夋晥鏈燂細";
Date startTime = userCouponVO.getStartTime();
@@ -448,7 +466,7 @@
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;
if (differentDays < 0) {
@@ -461,22 +479,22 @@
// 鍓╀綑澶╂暟
Map<String, Object> remainDays = new HashMap<String, Object>();
remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
- String remainDaysFontColor = "";
-
+ String remainDaysFontColor = "";
+
Integer stateActivated = userCouponVO.getStateActivated();
if (stateActivated == null || stateActivated == 0) {
userCouponVO.setState(0);
userCouponVO.setCouponEffect("寰呮縺娲�");
userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
-
+
remainDaysFontColor = "#CCCCCC";
-
+
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
-
+
remainDaysFontColor = "#F14242";
}
-
+
remainDays.put("fontColor", remainDaysFontColor);
userCouponVO.setRemainDays(remainDays);
}
@@ -511,15 +529,18 @@
@Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
-
+
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+ // 娲诲姩棰嗗彇鍒�
+// receivedCoupon(uid);
+
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
if (couponList == null || couponList.size() == 0) {
@@ -531,21 +552,25 @@
@Transactional
@Override
- public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {
-
+ public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId)
+ throws UserSystemCouponException, Exception {
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
-
+
if (auctionId == null) {
throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
}
-
+
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
+ // 娲诲姩棰嗗彇鍒�
+// receivedCoupon(uid);
+
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
if (couponList == null || couponList.size() == 0) {
@@ -553,31 +578,31 @@
}
List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
-
+
// 鑾峰彇鍟嗗搧璇︽儏
TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
if (taoBaoGoodsBrief != null) {
BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
-
+
// 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟
if (quanPrice.compareTo(new BigDecimal(10)) > 0) {
if (list != null && list.size() > 0) {
- for (UserSystemCouponVO userCouponVO: list) {
+ for (UserSystemCouponVO userCouponVO : list) {
// 鏄剧ず涓嶈兘浣跨敤
userCouponVO.setState(0);
userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());
-
+
Map<String, Object> map = userCouponVO.getRemainDays();
if (map != null) {
map.put("fontColor", "#CCCCCC");
}
userCouponVO.setRemainDays(map);
-
+
}
}
}
}
-
+
return list;
}
@@ -596,6 +621,16 @@
if (userSystemCoupon == null) {
throw new UserSystemCouponException(1, "鍒告暟鎹笉姝ｇ‘");
}
+
+ if (userSystemCoupon.getUid().longValue() != uid) {
+ throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
+ }
+
+ Integer state = userSystemCoupon.getState();
+ Integer stateActivated = userSystemCoupon.getStateActivated();
+ if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated) {
+ throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�");
+ }
Long couponUid = userSystemCoupon.getUid();
if (!uid.equals(couponUid)) {
@@ -613,7 +648,7 @@
&& baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
}
-
+
Date date = new Date();
// 鏇存柊鍒镐娇鐢�
userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 姝ｅ湪鍖归厤
@@ -631,19 +666,19 @@
couponRecord.setCreateTime(date);
couponRecord.setUpdateTime(date);
userSystemCouponRecordService.insertSelective(couponRecord);
-
+
// 娑堟伅鎺ㄩ��
try {
if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
- //userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);
+ // userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);
} else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
- //userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+ // userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
-
- } catch(Exception e) {
+
+ } catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
-
+
}
@Transactional
@@ -660,6 +695,16 @@
throw new UserSystemCouponException(1, "鍒镐俊鎭笉瀛樺湪");
}
+ if (userSystemCoupon.getUid().longValue() != uid) {
+ throw new UserSystemCouponException(1, "涓嶅睘浜庤鐢ㄦ埛鐨勫埜");
+ }
+
+ Integer state = userSystemCoupon.getState();
+ Integer stateActivated = userSystemCoupon.getStateActivated();
+ if (UserSystemCoupon.STATE_CAN_USE != state || 1 != stateActivated) {
+ throw new UserSystemCouponException(1, "璇ュ埜涓嶈兘琚娇鐢�");
+ }
+
// 绯荤粺鍒镐俊鎭�
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
if (systemCoupon != null && systemCoupon.getId() != null) {
@@ -673,7 +718,6 @@
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
}
-
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
}
@@ -683,7 +727,6 @@
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
-
BigDecimal hongBao = orderVO.getHongBao();
// 绾㈠寘鐘舵��
@@ -749,11 +792,11 @@
couponRecord.setCreateTime(date);
couponRecord.setUpdateTime(date);
userSystemCouponRecordService.insertSelective(couponRecord);
-
+
// 娑堟伅鎺ㄩ��
try {
userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
- } catch(Exception e) {
+ } catch (Exception e) {
LogHelper.errorDetailInfo(e);
}
}
@@ -795,17 +838,17 @@
}
Long uid = userSystemCoupon.getUid();
-
- CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(),
- orderNo, CommonOrder.STATE_JS);
-
+
+ CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo,
+ CommonOrder.STATE_JS);
+
if (commonOrderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
-
+
// 鑾峰彇濂栧姳閲戦
BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
-
+
UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
userRecordVO.setCouponMoneyState("宸插埌璐�");
userRecordVO.setCommonOrder(commonOrderVO);
@@ -838,7 +881,6 @@
return userRecordVO;
}
-
@Override
public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -888,7 +930,7 @@
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
- userRecordVO.setRuleLink(configService.get("reward_coupon_help"));
+ userRecordVO.setRuleLink(configService.get("free_coupon_help"));
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
@@ -1039,47 +1081,53 @@
return userRecordVO;
}
-
+
@Transactional
@Override
- public void activatedWelfareFreeCoupon(Long uid) {
+ public void activatedWelfareFreeCoupon(Long uid, String fromNickName) {
+
+ LogHelper.test("鍒告縺娲�:" + uid);
if (uid == null) {
return;
}
// 绂忓埄鍏嶅崟鍒�
String welfareFree = CouponTypeEnum.welfareFreeCoupon.name();
-
+
SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree);
if (systemCoupon == null) {
return;
}
-
+
// 楠岃瘉鏄惁澶辨晥
updateCounponInvalid(uid);
-
+
// 寰呮椿绂忓埄鍏嶅崟鍒�
List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
if (list == null || list.size() == 0) {
return;
}
-
- for (UserSystemCoupon userSystemCoupon: list) {
+
+ for (UserSystemCoupon userSystemCoupon : list) {
// 婵�娲�
- UserSystemCoupon update=new 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) {
continue; // 宸插け鏁堜笉鍋氭秷鎭帹閫�
}
-
+
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, new UserInfo(uid));
- } catch(Exception e) {
+ UserInfo userInfo = new UserInfo();
+ userInfo.setId(uid);
+ userInfo.setNickName(fromNickName);
+
+ userOtherMsgNotificationService.welfareCouponActive(userSystemCoupon, userInfo);
+ } catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -1088,11 +1136,11 @@
}
}
}
-
+
@Transactional
@Override
public void updateStateByDrawback(String orderNo) throws Exception {
-
+
if (orderNo == null || orderNo.trim().length() == 0) {
return;
}
@@ -1101,20 +1149,20 @@
if (record == null) {
return;
}
-
+
record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
-
+
// 鍒搁��鍥�
sendBackCoupon(record.getUserSystemCoupon(), record);
}
-
+
@Transactional
@Override
public void updateStateByArrivalAccount(String orderNo) throws Exception {
-
+
if (orderNo == null || orderNo.trim().length() == 0) {
return;
}
@@ -1123,18 +1171,18 @@
if (record == null) {
return;
}
-
+
record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
record.setState(UserSystemCouponRecord.STATE_SUCCESS);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
-
+
// 娑堟伅鎺ㄩ��
if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);
} else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);
- }
+ }
}
@Transactional
@@ -1144,22 +1192,22 @@
if (list == null || list.size() == 0) {
return;
}
-
- for (UserSystemCoupon userSystemCoupon: list) {
+
+ for (UserSystemCoupon userSystemCoupon : list) {
// 鏇存柊鍒稿凡杩囨湡
userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
if (systemCoupon == null) {
continue;
}
-
+
SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (baseCoupon == null || baseCoupon.getId() == null) {
continue;
}
-
+
// 娑堟伅鎺ㄩ��
try {
if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
@@ -1169,8 +1217,8 @@
} else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
}
-
- } catch(Exception e) {
+
+ } catch (Exception e) {
try {
LogHelper.errorDetailInfo(e);
} catch (Exception e1) {
@@ -1179,36 +1227,37 @@
}
}
}
-
+
@Transactional
@Override
- public void sendBackTimeOutCoupon(Long uid) {
- // 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
+ public void sendBackTimeOutCoupon(Long uid) {
+ // 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫埜
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid,600L);
if (list == null || list.size() == 0) {
return;
}
-
- for (UserSystemCouponRecord couponRecord: list) {
+
+ for (UserSystemCouponRecord couponRecord : list) {
// 鏇存柊鐘舵�侊細鍖归厤瓒呮椂
couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
couponRecord.setUpdateTime(new Date());
userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
-
+
UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
-
+
int expiryDay = 15;
-
+
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
- SystemCoupon coupon= systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (coupon != null) {
expiryDay = coupon.getExpiryDay();
- }
-
+ }
+
// 缁撴潫鏃ユ湡
Date endTime = null;
try {
- String endDay = DateUtil.plusDay(expiryDay, new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
endTime = format.parse(endDay);
} catch (ParseException e) {
@@ -1217,7 +1266,7 @@
// 鐘舵�佸垵濮嬪寲
userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userSystemCoupon.setUseTime(null);
-
+
// 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
userSystemCoupon.setStartTime(new Date());
userSystemCoupon.setEndTime(endTime);
@@ -1225,29 +1274,29 @@
userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
}
}
-
+
@Transactional
@Override
- public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
- Long auctionId) throws Exception{
-
+ public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment, Long auctionId)
+ throws Exception {
+
boolean isfree = false;
-
- if (uid == null || payment == null || auctionId == null || orderNo == null ||
- orderNo.trim().length() == 0 ) {
+
+ if (uid == null || payment == null || auctionId == null || orderNo == null || orderNo.trim().length() == 0) {
throw new Exception("浼犻�掑弬鏁颁笉鑳戒负绌�");
}
-
+
// 鏌ヨ绛夊緟鍖归厤鐨勫埜璁板綍
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid, UserSystemCouponRecord.STATE_WAIT);
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid,
+ UserSystemCouponRecord.STATE_WAIT);
if (list == null || list.size() == 0) {
- return isfree;
+ return isfree;
}
-
+
// 鍖归厤
boolean matching = false;
UserSystemCouponRecord record = null;
-
+
for (UserSystemCouponRecord userSystemCouponRecord : list) {
Long goodId = userSystemCouponRecord.getGoodId();
if (auctionId.equals(goodId)) {
@@ -1256,57 +1305,58 @@
break;
}
}
-
+
// 鍟嗗搧鍖归厤鎴愬姛
if (matching) {
-
+
record.setOrderNo(orderNo);
record.setUpdateTime(new Date());
-
+
UserSystemCoupon userSystemCoupon = record.getUserSystemCoupon();
-
+
if (payment.compareTo(new BigDecimal(10)) > 0) {
- // 鏇存柊璁板綍 -- 閲戦涓嶅尮閰� 澶�10鍏�
+ // 鏇存柊璁板綍 -- 閲戦涓嶅尮閰� 澶�10鍏�
record.setState(UserSystemCouponRecord.STATE_FAIL_RULE);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
-
+
// 閫�鍥炲埜
sendBackCoupon(userSystemCoupon, record);
-
+
} else {
// 鍏嶅崟鍖归厤鎴愬姛
isfree = true;
-
- //鏇存柊璁板綍--鍏嶅崟涓�
+
+ // 鏇存柊璁板綍--鍏嶅崟涓�
record.setState(UserSystemCouponRecord.STATE_FREE_ON);
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
-
+
// 鍒哥粨鏉熶娇鐢�
userSystemCoupon.setState(UserSystemCoupon.STATE_END_USE);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
-
+
String couponType = record.getCouponType();
if (couponType == null || couponType.trim().length() == 0) {
throw new Exception("鍒哥被鍨嬫湭琚褰�");
}
-
- if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
- userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
+
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon, orderNo, payment);
} else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
- }
+ }
}
}
-
+
return isfree;
}
-
+
/**
* 閫�鍥炲埜 鍒濆鏁版嵁
+ *
* @param userSystemCoupon
*/
- public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception{
+ public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception {
int expiryDay = 15;
@@ -1319,7 +1369,8 @@
// 缁撴潫鏃ユ湡
Date endTime = null;
try {
- String endDay = DateUtil.plusDay(expiryDay, new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
endTime = format.parse(endDay);
} catch (ParseException e) {
@@ -1331,53 +1382,53 @@
// 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
userSystemCoupon.setStartTime(new Date());
userSystemCoupon.setEndTime(endTime);
-
+
userSystemCoupon.setUpdateTime(new Date());
-
+
userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
-
-
+
if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
} else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
- }
+ }
}
-
-
+
@Override
@Transactional
public void copyLotteryPrize(Long uid, int platform, String device) throws Exception {
-
+
if (uid == null || device == null) {
return;
}
-
+
// 鏈櫥闄嗕箣鍓嶆娊濂栬褰�
List<DeviceLotteryRecord> list = deviceLotteryRecordService.listByPlatformAndDevice(platform, device);
if (list == null || list.size() == 0) {
return;
}
-
+
// 鑾峰彇棰濆淇℃伅
UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+
+ // 宸茬粡鎶借繃濂栫殑鎴栬�呭凡缁忚繘鍏ヨ繃鎶藉椤甸潰鐨�
if (userInfoExtra != null && userInfoExtra.getLotteryNewbies() != null) {
return;
}
-
+
// 鏄惁鏈夎繃璁㈠崟锛氳繑鍒┿�佸垎浜鍗�
boolean hasOrder = commonOrderCountService.hasRebateAndShareOrder(uid);
if (hasOrder) {
return;
}
-
+
int coupon = 0;
-
- for (DeviceLotteryRecord reviceLotteryRecord: list) {
-
+
+ for (DeviceLotteryRecord reviceLotteryRecord : list) {
+
// 鍒犻櫎璁板綍
deviceLotteryRecordService.deleteByPrimaryKey(reviceLotteryRecord.getId());
-
+
Long systemCouponId = reviceLotteryRecord.getSystemCouponId();
if (systemCouponId == null) {
continue;
@@ -1386,7 +1437,7 @@
if (systemCoupon == null) {
continue;
}
-
+
int stateActivated = 1;
if (systemCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
// 绂忓埄鍒哥姸鎬�
@@ -1398,10 +1449,11 @@
}
// 缁撴潫鏃ユ湡
- String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay(), new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
-
+
UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
userCoupon.setSource(UserSystemCoupon.SOURCE_CHOUJIANG);
@@ -1410,6 +1462,141 @@
userCoupon.setStateActivated(stateActivated);
userCoupon.setStartTime(new Date());
userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(new Date());
+ userCoupon.setUpdateTime(new Date());
+ // 鎻掑叆鏁版嵁搴�
+ insertSelective(userCoupon);
+
+ // 鍒告暟閲�
+ coupon++;
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ if (systemCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ userOtherMsgNotificationService.welfareCouponGet(userCoupon);
+ } else if (systemCoupon.getType() == CouponTypeEnum.freeCoupon) {
+ userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
+ } else if (systemCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon, systemCoupon.getPercent().intValue());
+ }
+
+ } catch (Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+ if (userInfoExtra == null) {
+ userInfoExtra = new UserInfoExtra();
+ userInfoExtra.setUserInfo(new UserInfo(uid));
+ }
+
+ userInfoExtra.setLotteryNewbies(Constant.MAX_COUNT_LOTTERY_NEWBIES - list.size());
+ Integer couponNews = userInfoExtra.getCouponNews();
+ if (couponNews == null) {
+ userInfoExtra.setCouponNews(coupon);
+ } else {
+ userInfoExtra.setCouponNews(couponNews + coupon);
+ }
+ userInfoExtraService.saveUserInfoExtra(userInfoExtra);
+
+ }
+
+ @Override
+ @Transactional
+ public void receivedCoupon(Long uid) throws Exception {
+
+ List<PushCoupon> list = pushCouponService.listQueryEffective();
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ List<PushCouponRecord> listRecord = pushCouponRecordService.listByUid(uid);
+
+ for (PushCoupon pushCoupon: list) {
+
+ boolean receive = false;
+
+ String uids = pushCoupon.getUids();
+ if (uids == null || uids.trim().length() == 0) {
+ receive = true;
+ } else {
+ String[] uidArray = uids.split(",");
+
+ if (uidArray != null) {
+ for (int i = 0; i < uidArray.length; i++) {
+ String str_uid = uidArray[i];
+ if (str_uid != null && str_uid.trim().length() > 0) {
+ if(str_uid.equals(uid.toString())) {
+ receive = true;
+ }
+ }
+ }
+ }
+ }
+
+ if (!receive) {
+ continue;
+ }
+
+ if (listRecord != null && listRecord.size() > 0) {
+ for (PushCouponRecord PushCouponRecord: listRecord) {
+ PushCoupon pushCoupon2 = PushCouponRecord.getPushCoupon();
+
+ if (pushCoupon.getId().equals(pushCoupon2.getId()) ) {
+ receive = false;
+ break;
+ }
+ }
+ }
+
+ if (receive) {
+ // 鎻掑叆璁板綍
+ PushCouponRecord pushCouponRecord = new PushCouponRecord();
+ pushCouponRecord.setPushCoupon(pushCoupon);
+ pushCouponRecord.setUid(uid);
+ pushCouponRecord.setCreateTime(new Date());
+ pushCouponRecordService.insertSelective(pushCouponRecord);
+
+ // 鎻掑叆鍒�
+ randomRewardCoupon(pushCoupon, uid);
+ }
+ }
+ }
+
+ @Override
+ @Transactional
+ public void randomRewardCoupon(PushCoupon pushCoupon, Long uid) throws Exception {
+ int coupon = 0;
+
+ Integer amount = pushCoupon.getAmount();
+ for (int i = 0; i < amount; i++) {
+
+ BigDecimal percent = pushCoupon.getPercent();
+ if (percent == null) {
+ // 杩斿埄姣�-闅忔満
+ percent = new BigDecimal(randomNum());
+ }
+
+ // 鏌ヨ濂栧姳鍒�
+ SystemCoupon systemCoupon = systemCouponService.getCouponByTypeAndPercent(
+ CouponTypeEnum.rebatePercentCoupon.name(),percent);
+
+ if (systemCoupon == null) {
+ return;
+ }
+
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setUid(uid);
+ userCoupon.setSource(UserSystemCoupon.SOURCE_SYSTEM_PUSH);
+ userCoupon.setSystemCoupon(systemCoupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(1);
+ userCoupon.setStartTime(pushCoupon.getStartTime());
+ userCoupon.setEndTime(pushCoupon.getEndTime());
userCoupon.setCreateTime(new Date());
userCoupon.setUpdateTime(new Date());
// 鎻掑叆鏁版嵁搴�
@@ -1437,12 +1624,12 @@
}
}
- if(userInfoExtra == null) {
- userInfoExtra = new UserInfoExtra();
- userInfoExtra.setUserInfo(new UserInfo(uid));
+ // 鑾峰彇棰濆淇℃伅
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra == null) {
+ return;
}
- userInfoExtra.setLotteryNewbies(Constant.MAX_COUNT_LOTTERY_NEWBIES-list.size());
Integer couponNews = userInfoExtra.getCouponNews();
if (couponNews == null) {
userInfoExtra.setCouponNews(coupon);
@@ -1450,9 +1637,64 @@
userInfoExtra.setCouponNews(couponNews + coupon);
}
userInfoExtraService.saveUserInfoExtra(userInfoExtra);
-
+ }
+
+ /**
+ * 闅忔満鍒告瘮渚�
+ * @return
+ */
+ public int randomNum() {
+
+ int result = 1;
+
+ List<RandomProportion> list = new ArrayList<RandomProportion>();
+ list.add(new RandomProportion(1,2,30));
+ list.add(new RandomProportion(2,4,25));
+ list.add(new RandomProportion(4,6,20));
+ list.add(new RandomProportion(6,8,6));
+ list.add(new RandomProportion(8,10,6));
+ list.add(new RandomProportion(10,20,6));
+ list.add(new RandomProportion(20,30,2));
+ list.add(new RandomProportion(30,40,2));
+ list.add(new RandomProportion(40,50,2));
+ list.add(new RandomProportion(50,60,1));
+
+ int minRange = 0;
+ int maxRange = 0;
+ int randomNum = (int) (1 + Math.round(Math.random() * (99)));
+
+ for (int i = 0; i < list.size(); i++) {
+
+ RandomProportion proportion = list.get(i);
+ int probability = proportion.probability;
+
+ maxRange = maxRange + probability;
+ minRange = maxRange - probability;
+
+ if (i == list.size() && randomNum > minRange && randomNum <= maxRange) {
+ result = proportion.minNum + (int) (Math.random() * ((proportion.maxNum - proportion.minNum) + 1));
+ break;
+ } else if(randomNum > minRange && randomNum <= maxRange) {
+ result = proportion.minNum + (int) (Math.random() * ((proportion.maxNum - proportion.minNum)));
+ break;
+ }
+ }
+
+ return result;
}
-
+ class RandomProportion {
+ public int minNum;// 鏈�灏�
+ public int maxNum;// 鏈�澶�
+ public int probability; // 姒傜巼
+
+ RandomProportion () {}
+
+ RandomProportion (int minNum, int maxNum, int probability) {
+ this.minNum = minNum;
+ this.maxNum = maxNum;
+ this.probability = probability;
+ }
+ }
}
--
Gitblit v1.8.0