From 70c9043f312a52a922cb15490d90a172b3515060 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期四, 28 二月 2019 14:07:00 +0800
Subject: [PATCH] 奖励详情跳转地址调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 502436e..65905f6 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
@@ -220,7 +220,7 @@
} else if (coupon.getType() != CouponTypeEnum.freeCoupon) {
userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
} else if (coupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
- userOtherMsgNotificationService.rewardCouponGet(userCoupon);
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
}
} catch(Exception e) {
@@ -233,7 +233,7 @@
}
-
+ @Transactional
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -340,7 +340,7 @@
} else if (CouponTypeEnum.rebatePercentCoupon == type) {
// 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
- jumpLink.put("state", 2);
+ jumpLink.put("state", "2");
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
@@ -484,6 +484,7 @@
return hasCoupon;
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -504,6 +505,7 @@
return getEnableListByCouponId(uid, 1, couponList);
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {
@@ -548,6 +550,7 @@
return list;
}
+ @Transactional
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -603,7 +606,7 @@
if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
} catch(Exception e) {
@@ -718,7 +721,7 @@
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
} catch(Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -785,8 +788,8 @@
}
userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
- // 璺宠浆绂忓埄涓績
- JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore");
+ // 璧勯噾鏄庣粏
+ JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
Map<String, Object> jumpWelfare = new HashMap<String, Object>();
jumpWelfare.put("jumpDetail", welfareCore);
Map<String, Object> jumpparms = new HashMap<String, Object>();
@@ -804,6 +807,7 @@
return userRecordVO;
}
+
@Override
public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -1005,7 +1009,7 @@
return userRecordVO;
}
-
+ @Transactional
@Override
public void activatedWelfareFreeCoupon(Long uid) {
if (uid == null) {
@@ -1044,6 +1048,7 @@
}
}
+ @Transactional
@Override
public void updateStateByDrawback(String orderNo) throws Exception {
@@ -1065,6 +1070,7 @@
sendBackCoupon(record.getUserSystemCoupon());
}
+ @Transactional
@Override
public void updateStateByArrivalAccount(String orderNo) throws Exception {
@@ -1083,6 +1089,7 @@
userSystemCouponRecordService.updateByPrimaryKeySelective(record);
}
+ @Transactional
@Override
public void updateCounponInvalid(Long uid) {
List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
@@ -1125,6 +1132,7 @@
}
}
+ @Transactional
@Override
public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
@@ -1170,6 +1178,7 @@
}
}
+ @Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
Long auctionId) throws Exception{
@@ -1234,11 +1243,11 @@
SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (baseCoupon == null) {
// 鍒稿凡浣跨敤
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon, orderNo);
} else if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);
}
}
}
--
Gitblit v1.8.0