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 | 137 ++++++++++++++++++++++++++++++++++++++-------
1 files changed, 115 insertions(+), 22 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 2e81e87..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
@@ -11,6 +11,7 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
@@ -27,6 +28,8 @@
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
@@ -47,7 +50,9 @@
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -58,6 +63,12 @@
@Service
public class UserSystemCouponServiceImpl implements UserSystemCouponService {
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
+ @Resource
+ private RedisManager redisManager;
+
@Resource
private UserSystemCouponMapper userSystemCouponMapper;
@@ -185,6 +196,22 @@
// 鎻掑叆鏁版嵁搴�
insertSelective(userCoupon);
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ // 娣诲姞涓�鏉℃秷鎭�
+ if (userInfoExtra != null) {
+ userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ try {
+ userInfoExtraService.saveUserInfoExtra(userInfoExtra);
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ });
// 娑堟伅鎺ㄩ��
try {
@@ -193,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) {
@@ -206,7 +233,7 @@
}
-
+ @Transactional
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -313,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);
@@ -399,8 +426,9 @@
Integer stateActivated = userCouponVO.getStateActivated();
if (stateActivated == null || stateActivated == 0) {
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲�
userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲诲浘鐗�
} else {
userCouponVO.setCouponPicture(systemCoupon.getPicture());
}
@@ -456,6 +484,7 @@
return hasCoupon;
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -476,10 +505,16 @@
return getEnableListByCouponId(uid, 1, couponList);
}
+ @Transactional
@Override
- public List<UserSystemCouponVO> getGoodsCouponList(Long uid) 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涓虹┖");
}
// 鏇存柊杩囨湡鍒�
@@ -493,9 +528,29 @@
return null;
}
- return getEnableListByCouponId(uid, null, couponList);
+ 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) {
+ // 鏄剧ず涓嶈兘浣跨敤
+ userCouponVO.setState(0);
+ userCouponVO.setCouponPicture(PIC_INVALID);
+ }
+ }
+ }
+ }
+
+ return list;
}
+ @Transactional
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -549,9 +604,9 @@
// 娑堟伅鎺ㄩ��
try {
if (baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon);
+// userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+// userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
}
} catch(Exception e) {
@@ -666,7 +721,7 @@
// 娑堟伅鎺ㄩ��
try {
- userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
} catch(Exception e) {
LogHelper.errorDetailInfo(e);
}
@@ -733,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>();
@@ -752,6 +807,7 @@
return userRecordVO;
}
+
@Override
public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -953,7 +1009,7 @@
return userRecordVO;
}
-
+ @Transactional
@Override
public void activatedWelfareFreeCoupon(Long uid) {
if (uid == null) {
@@ -990,11 +1046,50 @@
}
}
}
-
-
}
+ @Transactional
+ @Override
+ public void updateStateByDrawback(String orderNo) throws Exception {
+
+ if (orderNo == null || orderNo.trim().length() == 0) {
+ return;
+ }
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ if (record == null) {
+ return;
+ }
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+ record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 鍒搁��鍥�
+ sendBackCoupon(record.getUserSystemCoupon());
+ }
+
+ @Transactional
+ @Override
+ public void updateStateByArrivalAccount(String orderNo) throws Exception {
+
+ if (orderNo == null || orderNo.trim().length() == 0) {
+ return;
+ }
+
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, 2);
+ if (record == null) {
+ return;
+ }
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+ record.setState(UserSystemCouponRecord.STATE_SUCCESS);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+ }
+
+ @Transactional
@Override
public void updateCounponInvalid(Long uid) {
List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
@@ -1037,10 +1132,11 @@
}
}
+ @Transactional
@Override
public void sendBackTimeOutCoupon(Long uid) {
// 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120);
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
if (list == null || list.size() == 0) {
return;
}
@@ -1082,13 +1178,10 @@
}
}
+ @Transactional
@Override
public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
Long auctionId) throws Exception{
-
- //鍙鐞嗕粯娆鹃噾棰濆皬浜�10鐨�
- if(payment==null||payment.compareTo(new BigDecimal(10))<0)
- return false;
boolean isfree = false;
@@ -1150,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.welfareCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
} else if (baseCoupon.getType() != CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon);
+ userOtherMsgNotificationService.freeSheetCouponUsed(userSystemCoupon,orderNo);
}
}
}
--
Gitblit v1.8.0