From df300df7832cc3d24f1b09297998e8bee8cfd126 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期二, 20 八月 2019 18:06:43 +0800
Subject: [PATCH] 签到弹框bug
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 366 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 287 insertions(+), 79 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 558e90f..5db76ad 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
@@ -20,9 +20,12 @@
import com.yeshi.fanli.entity.bus.user.DeviceLotteryRecord;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.Order;
+import com.yeshi.fanli.entity.bus.user.TokenRecord;
+import com.yeshi.fanli.entity.bus.user.TokenRecord.TokenTypeEnum;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.UserInfoExtra;
import com.yeshi.fanli.entity.bus.user.UserSystemCoupon;
+import com.yeshi.fanli.entity.bus.user.UserSystemCouponGiveRecord;
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
@@ -48,14 +51,18 @@
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.TokenRecordService;
import com.yeshi.fanli.service.inter.user.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;
+import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
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.StringUtil;
+import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -77,6 +84,9 @@
@Resource
private UserSystemCouponMapper userSystemCouponMapper;
+ @Resource
+ private UserSystemCouponGiveRecordService userSystemCouponGiveRecordService;
+
@Resource
private ConfigService configService;
@@ -134,6 +144,9 @@
@Resource
private PushCouponRecordService pushCouponRecordService;
+ @Resource
+ private TokenRecordService tokenRecordService;
+
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -185,8 +198,8 @@
}
SystemCoupon coupon = null;
- if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name())) {
- // 绂忓埄鍏嶅崟鍒�
+ if (couponType.equals(CouponTypeEnum.welfareFreeCoupon.name()) || couponType.equals(CouponTypeEnum.freeCoupon.name())) {
+ // 鍏嶅崟鍒�
coupon = systemCouponService.getCouponByType(couponType);
} else if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
// 闅忔満濂栧姳鍒�
@@ -206,6 +219,8 @@
if (countSuccess == 0) {
stateActivated = 0;
}
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
+ stateActivated = 0;
}
// 缁撴潫鏃ユ湡
@@ -1636,7 +1651,7 @@
@Override
@Transactional
- public void exchangeCoupon(Long uid, String couponType, String source, boolean give, BigDecimal percent) throws UserSystemCouponException, Exception {
+ public void exchangeCoupon(Long uid, String couponType, String source, BigDecimal percent) throws UserSystemCouponException, Exception {
if (couponType == null || uid == null) {
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
@@ -1667,30 +1682,28 @@
UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
userCoupon.setSource(source);
- userCoupon.setGive(give);
userCoupon.setSystemCoupon(coupon);
- userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
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
@Override
- public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)throws UserSystemCouponException, Exception {
- if (uid == null) {
- return null;
- }
-
+ public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
+ throws UserSystemCouponException, Exception {
// 鏇存柊杩囨湡鍒�
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
-
+
List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
if (listVO == null || listVO.size() == 0) {
return listVO;
@@ -1702,7 +1715,7 @@
if (userInfoExtra != null) {
inviteCode = userInfoExtra.getInviteCode();
}
-
+
for (UserSystemCouponVO userCouponVO : listVO) {
SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
if (systemCoupon != null && systemCoupon.getId() != null) {
@@ -1718,73 +1731,6 @@
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
userCouponVO.setCouponRuleLink(systemCoupon.getRuleLink());
-
- Integer state = userCouponVO.getState();
- // 鍒稿け鏁堝浘鐗囨浛鎹�
- if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
- } else {
- userCouponVO.setCouponPicture(systemCoupon.getPicture());
- }
-
- Map<String, Object> jumpBtn = null;
- CouponTypeEnum type = systemCoupon.getType();
- Integer stateActivated = userCouponVO.getStateActivated();
-
- // 鐘舵�佸緟婵�娲� -涓斿彲浣跨敤
- if (UserSystemCoupon.STATE_CAN_USE == state && (stateActivated == null || stateActivated == 0)) {
- userCouponVO.setState(0);
- userCouponVO.setCouponEffect("寰呮縺娲�");
- if (CouponTypeEnum.freeCoupon == type) {
- List<String> listTip = new ArrayList<String>();
- listTip.add("鏈厤鍗曞埜鐢卞ソ鍙嬭禒閫侊紝浠庤幏璧犳棩璧�60澶╁唴闇�浜х敓3绗旇繑鍒╄鍗曪紱");
- listTip.add("杩斿埄璁㈠崟鈥滃凡鍒拌处鈥濆悗锛屾柟鑳借涓鸿鍗曚骇鐢熸垚鍔燂紱");
- listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
- } else if (CouponTypeEnum.welfareFreeCoupon == type) {
- // 鏈縺娲昏鍒�
- userCouponVO.setCouponRule(systemCoupon.getRemark());
-
- jumpBtn = new HashMap<String, Object>();
- if (inviteCode != null && inviteCode.trim().length() > 0) {
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_friends"));
- } else {
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
- }
- }
- } else if (stateActivated == 1) {
- // 鏄剧ず瑙勫垯
- userCouponVO.setCouponRule(systemCoupon.getRule());
-
- if (UserSystemCoupon.STATE_CAN_USE == state) {
- Map<String, Object> jumpLink = new HashMap<String, Object>();
-
- if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) {
- // 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
-
- // 鍏嶅崟鍟嗗搧鍒楄〃
- jumpLink.put("url", configService.get("free_goods_list"));
-
- jumpBtn = new HashMap<String, Object>();
- jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
-
- } 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"));
- }
- }
-
- userCouponVO.setJumpBtn(jumpBtn);
String couponTerm = "鏈夋晥鏈燂細";
Date startTime = userCouponVO.getStartTime();
@@ -1794,6 +1740,13 @@
couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
}
userCouponVO.setCouponTerm(couponTerm);
+
+ Integer state = userCouponVO.getState();
+ if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+ } else {
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
+ }
if (UserSystemCoupon.STATE_CAN_USE == state) {
int differentDays = 0;
@@ -1810,7 +1763,262 @@
remainDays.put("fontColor", "#F14242");
userCouponVO.setRemainDays(remainDays);
}
+
+ Map<String, Object> jumpBtn = null;
+ CouponTypeEnum type = systemCoupon.getType();
+ Integer stateActivated = userCouponVO.getStateActivated();
+
+ // 鏈縺娲�
+ if (stateActivated == null || stateActivated == 0) {
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponRule(systemCoupon.getRemark());
+ if (UserSystemCoupon.STATE_CAN_USE == state) {
+ state = 0;
+ userCouponVO.setState(state);
+ if (CouponTypeEnum.freeCoupon == type) {
+ List<String> listTip = new ArrayList<String>();
+ listTip.add("鏈厤鍗曞埜鐢卞ソ鍙嬭禒閫侊紝浠庤幏璧犳棩璧�60澶╁唴闇�浜х敓3绗旇繑鍒╄鍗曪紱");
+ listTip.add("杩斿埄璁㈠崟鈥滃凡鍒拌处鈥濆悗锛屾柟鑳借涓鸿鍗曚骇鐢熸垚鍔燂紱");
+ listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
+ userCouponVO.setTips(listTip);
+ userCouponVO.setPopup(true);
+ } else if (CouponTypeEnum.welfareFreeCoupon == type) {
+ jumpBtn = new HashMap<String, Object>();
+ if (inviteCode != null && inviteCode.trim().length() > 0) {
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_friends"));
+ } else {
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_activate"));
+ }
+ }
+ }
+ }
+
+ if (UserSystemCoupon.STATE_IN_USE == state && (CouponTypeEnum.freeCouponBuy == type
+ || CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type)) {
+ userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
+ }
+
+ // 鏄惁宸茶禒閫�
+ Boolean give = userCouponVO.getGive();
+ if (give == null) {
+ give = false;
+ }
+
+ if (UserSystemCoupon.STATE_CAN_USE == state) {
+ Map<String, Object> jumpLink = new HashMap<String, Object>();
+ if (CouponTypeEnum.freeCouponGive == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
+ } else if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type
+ || CouponTypeEnum.freeCouponBuy == type) {
+ jumpLink.put("url", configService.get("free_goods_list"));
+ jumpBtn = new HashMap<String, Object>();
+ jumpBtn.put("params", jumpLink);
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("web"));
+ } else if (CouponTypeEnum.rebatePercentCoupon == type) {
+ // 鍙娇鐢ㄣ�� 鍙禒閫�
+ userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
+
+ // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
+ 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 && give) {
+ userCouponVO.setCouponEffect("璧犻�佷腑");
+ String tips = null;
+ if (CouponTypeEnum.freeCouponGive == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+ tips = configService.get("give_free_coupon_tips");
+ }
+
+ if (CouponTypeEnum.rebatePercentCoupon == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_IN);
+ tips = configService.get("give_free_coupon_tips");
+ }
+
+ if (!StringUtil.isNullOrEmpty(tips)) {
+ UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, userCouponVO.getId());
+ if (record != null) {
+ TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(CouponTypeEnum.freeCoupon.name(), record.getId().toString());
+ if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
+ String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
+ while(tips.contains("{APP鍚嶇О}")) {
+ tips = tips.replace("{APP鍚嶇О}", projectChineseName);
+ }
+ tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ }
+ }
+ } else {
+ tips = "";
+ }
+ userCouponVO.setGiveTips(tips);
+
+ } else if (UserSystemCoupon.STATE_END_USE == state) {
+ if (give && CouponTypeEnum.freeCouponGive == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+ }
+
+ if (give && CouponTypeEnum.rebatePercentCoupon == type) {
+ userCouponVO.setState(UserSystemCoupon.STATE_GIVE_END);
+ }
+ }
+ userCouponVO.setJumpBtn(jumpBtn);
}
return listVO;
}
+
+
+ @Transactional
+ @Override
+ public String giveCoupon(Long uid, Long id) throws UserSystemCouponException {
+ UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
+ if (userSystemCoupon == null)
+ throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
+
+ SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+ if (systemCoupon == null)
+ throw new UserSystemCouponException(1, "璇ュ埜宸蹭笉瀛樺湪");
+
+ systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (systemCoupon == null)
+ throw new UserSystemCouponException(1, "璇ュ埜宸插け鏁�");
+
+ Integer state = userSystemCoupon.getState();
+ if (state == UserSystemCoupon.STATE_OVERDUE)
+ throw new UserSystemCouponException(1, "璇ュ埜宸茶繃鏈�");
+
+ if (state == UserSystemCoupon.STATE_END_USE)
+ throw new UserSystemCouponException(1, "璇ュ埜浣跨敤/璧犻�佹垚鍔�");
+
+ CouponTypeEnum type = systemCoupon.getType();
+ if (type != CouponTypeEnum.freeCouponGive && type != CouponTypeEnum.rebatePercentCoupon )
+ throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
+
+ String tips = null;
+ TokenTypeEnum tokenTypeEnum = null;
+ if (type == CouponTypeEnum.freeCouponGive) {
+ tokenTypeEnum = TokenTypeEnum.freeCoupon;
+ tips = configService.get("give_free_coupon_tips");
+ } else if (type == CouponTypeEnum.rebatePercentCoupon){
+ tokenTypeEnum = TokenTypeEnum.rebatePercentCoupon;
+ tips = configService.get("give_rebate_percent_coupon_tips");
+ } else {
+ throw new UserSystemCouponException(1, "璇ュ埜涓嶆敮鎸佽禒閫�");
+ }
+
+ if (StringUtil.isNullOrEmpty(tips))
+ throw new UserSystemCouponException(1, "tips鏁版嵁缂哄け");
+
+
+ // 鏄惁鏈�杩戠敓鎴愬彛浠ゆ湁鏁�
+ UserSystemCouponGiveRecord record = userSystemCouponGiveRecordService.getRecordByUidAndCouponId(uid, id);
+ if (record != null) {
+ TokenRecord tokenRecord = tokenRecordService.getNearByTypeAndIdentify(tokenTypeEnum.name(), id+"");
+ if (tokenRecord != null && !StringUtil.isNullOrEmpty(tokenRecord.getToken())) {
+ String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
+ while(tips.contains("{APP鍚嶇О}")) {
+ tips = tips.replace("{APP鍚嶇О}", projectChineseName);
+ }
+ tips = tips.replace("{鍙ｄ护}", tokenRecord.getToken()).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ return tips;
+ }
+ }
+
+
+ Long giveRecordId = null;
+ Date nowDate = new Date();
+
+ // 鎻掑叆璧犻�佽褰�
+ try {
+ UserSystemCouponGiveRecord giveRecord = new UserSystemCouponGiveRecord();
+ giveRecord.setCouponId(id);
+ giveRecord.setGiveUid(uid);
+ giveRecord.setGiveTime(nowDate);
+ giveRecord.setEndTime(DateUtil.plusDayDate(Constant.GIVE_DAYS, nowDate));
+ userSystemCouponGiveRecordService.insertSelective(giveRecord);
+ giveRecordId = giveRecord.getId();
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ throw new UserSystemCouponException(1, "璧犻�佽褰曞垱寤哄け璐�");
+ }
+
+ String token = null;
+ for (int i = 0; i < 5; i++) {
+ try {
+ // TODO 鍙ｄ护鐢熸垚瑙勫垯寰呭畾
+ long num = 10000 + (long) (Math.random() * 10000);
+ token = UserUtil.getInviteCode(num);
+
+ TokenRecord tokenRecord = new TokenRecord();
+ tokenRecord.setUid(uid);
+ tokenRecord.setIdentify(giveRecordId+"");
+ tokenRecord.setType(tokenTypeEnum);
+ tokenRecord.setStartTime(nowDate);
+ tokenRecord.setEndTime(DateUtil.plusDayDate(Constant.TOKEN_DAYS, nowDate));
+ tokenRecord.setToken(token);
+ tokenRecord.setState(0);
+ tokenRecordService.insertSelective(tokenRecord);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ token = null;
+ }
+
+ if(!StringUtil.isNullOrEmpty(token)) {
+ break;
+ }
+ }
+
+ if(StringUtil.isNullOrEmpty(token))
+ throw new UserSystemCouponException(1, "鍙ｄ护鐢熸垚澶辫触");
+
+ userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE);
+ userSystemCoupon.setGive(true);
+ userSystemCoupon.setUpdateTime(nowDate);
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ // 鎻掑叆浣跨敤鍒歌褰�
+ UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
+ couponRecord.setState(UserSystemCouponRecord.STATE_GIVE_ON);
+ couponRecord.setUserSystemCoupon(userSystemCoupon);
+ couponRecord.setCouponType(type.name());
+ couponRecord.setCreateTime(nowDate);
+ couponRecord.setUpdateTime(nowDate);
+ userSystemCouponRecordService.insertSelective(couponRecord);
+
+ String projectChineseName = Constant.systemCommonConfig.getProjectChineseName();
+ while(tips.contains("{APP鍚嶇О}")) {
+ tips = tips.replace("{APP鍚嶇О}", projectChineseName);
+ }
+ tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
+ return tips;
+ }
+
+
+ @Override
+ public void sendBackGive(Long id) {
+ UserSystemCoupon userSystemCoupon = userSystemCouponMapper.selectByPrimaryKey(id);
+ if (userSystemCoupon == null)
+ return;
+
+ Integer state = userSystemCoupon.getState();
+ if (state != UserSystemCoupon.STATE_IN_USE)
+ return;
+
+ Date now = new Date();
+ Date endTime = userSystemCoupon.getEndTime();
+ if (endTime != null && endTime.getTime() < now.getTime()) {
+
+ // TODO 杩囨湡
+ return;
+ }
+
+ userSystemCoupon.setGive(false);
+ userSystemCoupon.setUseTime(null);
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+
+ // TODO 娑堟伅
+ }
}
--
Gitblit v1.8.0