From 9d401723afe4fd680f60f97b8d927efea6344a6f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 27 二月 2019 14:54:22 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 182 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 168 insertions(+), 14 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 8554d68..e9cff22 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
@@ -218,7 +218,7 @@
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
- sendBackCoupon(uid);
+ sendBackTimeOutCoupon(uid);
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
if (listVO == null || listVO.size() == 0) {
@@ -465,7 +465,7 @@
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
- sendBackCoupon(uid);
+ sendBackTimeOutCoupon(uid);
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
@@ -485,7 +485,7 @@
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
- sendBackCoupon(uid);
+ sendBackTimeOutCoupon(uid);
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
@@ -718,17 +718,20 @@
}
// 鑾峰彇濂栧姳閲戦
- Map<String, BigDecimal> map = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
-
+ BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
+
UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
userRecordVO.setCouponMoneyState("宸插埌璐�");
userRecordVO.setCommonOrder(commonOrderVO);
- userRecordVO.setCouponName("濂栧姳閲�: 楼" + map.get("couponMoney").setScale(2, BigDecimal.ROUND_DOWN));
+ userRecordVO.setCouponName("濂栧姳閲�: 楼" + couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
// 姣斾緥
BigDecimal percent = baseCoupon.getPercent();
- BigDecimal hongBao = map.get("totalMoney").setScale(2, BigDecimal.ROUND_DOWN);
- userRecordVO.setCouponEffect("杩斿埄楼" + hongBao + "宸茶繑" + percent + "%");
+ BigDecimal hongBao = commonOrderVO.getHongBao();
+ if (hongBao == null) {
+ hongBao = new BigDecimal(0);
+ }
+ userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
// 璺宠浆绂忓埄涓績
JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore");
@@ -949,6 +952,48 @@
return userRecordVO;
}
+
+
+ @Override
+ public void activatedWelfareFreeCoupon(Long uid) {
+ if (uid == null) {
+ return;
+ }
+ // 绂忓埄鍏嶅崟鍒�
+ String welfareFree = CouponTypeEnum.welfareFreeCoupon.name();
+
+ SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree);
+ if (systemCoupon == null) {
+ return;
+ }
+
+ // 寰呮椿绂忓埄鍏嶅崟鍒�
+ List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ for (UserSystemCoupon userSystemCoupon: list) {
+ // 婵�娲�
+ userSystemCoupon.setStateActivated(1);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.welfareCouponGet(userSystemCoupon);
+ } catch(Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+
+ }
+
@Override
public void updateCounponInvalid(Long uid) {
@@ -993,7 +1038,7 @@
}
@Override
- public void sendBackCoupon(Long uid) {
+ public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);
if (list == null || list.size() == 0) {
@@ -1007,9 +1052,6 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
- // 鐘舵�佸垵濮嬪寲
- userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
- userSystemCoupon.setUseTime(null);
int expiryDay = 15;
@@ -1028,16 +1070,128 @@
} catch (ParseException e) {
e.printStackTrace();
}
-
+ // 鐘舵�佸垵濮嬪寲
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUseTime(null);
+
// 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
userSystemCoupon.setStartTime(new Date());
userSystemCoupon.setEndTime(endTime);
userSystemCoupon.setUpdateTime(new Date());
userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
}
-
}
+ @Override
+ 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 ) {
+ throw new Exception("浼犻�掑弬鏁颁笉鑳戒负绌�");
+ }
+
+ // 鏌ヨ绛夊緟鍖归厤鐨勫埜璁板綍
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid, UserSystemCouponRecord.STATE_WAIT);
+ if (list == null || list.size() == 0) {
+ return isfree;
+ }
+
+ // 鍖归厤
+ boolean matching = false;
+ UserSystemCouponRecord record = null;
+
+ for (UserSystemCouponRecord userSystemCouponRecord : list) {
+ Long goodId = userSystemCouponRecord.getGoodId();
+ if (auctionId.equals(goodId)) {
+ matching = true; // 鍖归厤鎴愬姛
+ record = userSystemCouponRecord;
+ break;
+ }
+ }
+
+ // 鍟嗗搧鍖归厤鎴愬姛
+ if (matching) {
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+
+ UserSystemCoupon userSystemCoupon = record.getUserSystemCoupon();
+
+ if (payment.compareTo(new BigDecimal(10)) > 0) {
+ // 鏇存柊璁板綍 -- 閲戦涓嶅尮閰� 澶�10鍏�
+ record.setState(UserSystemCouponRecord.STATE_FAIL_RULE);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 閫�鍥炲埜
+ sendBackCoupon(userSystemCoupon);
+
+ } 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);
+
+ SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+
+ SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (baseCoupon == null) {
+ // 鍒稿凡浣跨敤
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ } else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ userOtherMsgNotificationService.welfareCouponUsed(userSystemCoupon);
+ } else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ }
+ }
+ }
+
+ return isfree;
+ }
+
+ /**
+ * 閫�鍥炲埜 鍒濆鏁版嵁
+ * @param userSystemCoupon
+ */
+ public void sendBackCoupon(UserSystemCoupon userSystemCoupon) throws Exception{
+
+ int expiryDay = 15;
+
+ SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+ SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (coupon != null) {
+ expiryDay = coupon.getExpiryDay();
+ }
+
+ // 缁撴潫鏃ユ湡
+ Date endTime = null;
+ try {
+ String endDay = DateUtil.plusDay(expiryDay, new Date());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ endTime = format.parse(endDay);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ // 鐘舵�佸垵濮嬪寲
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUseTime(null);
+ // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
+ userSystemCoupon.setStartTime(new Date());
+ userSystemCoupon.setEndTime(endTime);
+
+ userSystemCoupon.setUpdateTime(new Date());
+
+ userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+ }
--
Gitblit v1.8.0