From 4ea3992530e9577e4a2919ada620542c3a6fa71d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 15 四月 2019 10:16:12 +0800
Subject: [PATCH] bug优化
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 333 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 302 insertions(+), 31 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 9978bab..0df0c57 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
@@ -26,7 +26,9 @@
import com.yeshi.fanli.entity.bus.user.UserSystemCouponRecord;
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.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;
@@ -164,7 +166,12 @@
public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) {
return userSystemCouponMapper.getUserCouponBySource(uid, source);
}
-
+
+ @Override
+ public int countTodatyUserCouponBySource(Long uid, String source) {
+ return userSystemCouponMapper.countTodatyUserCouponBySource(uid, source);
+ }
+
@Override
public long countUserCouponList(Long uid) {
return userSystemCouponMapper.countUserCouponList(uid);
@@ -179,7 +186,15 @@
throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
}
- SystemCoupon coupon = systemCouponService.getCouponByType(couponType);
+ 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));
+ }
+
if (coupon == null) {
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
@@ -256,7 +271,7 @@
@Transactional
@Override
- public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
+ public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid, boolean changeJump)
throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -274,7 +289,7 @@
}
// 鏁版嵁缁勭粐
- listDataFactory(listVO, uid);
+ listDataFactory(listVO, uid, changeJump);
return listVO;
}
@@ -284,8 +299,14 @@
*
* @param listVO
*/
- public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception {
+ public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid, boolean changeJump) throws Exception {
+ String inviteCode = null;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ inviteCode = userInfoExtra.getInviteCode();
+ }
+
for (UserSystemCouponVO userCouponVO : listVO) {
SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
@@ -321,30 +342,26 @@
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRemark());
userCouponVO.setCouponEffect("寰呮縺娲�");
-
// 鐘舵�佹湭婵�娲� -涓旀湭琚娇鐢�
if (UserSystemCoupon.STATE_CAN_USE == state) {
userCouponVO.setState(0);
}
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") +
- * "?alert=true"); } else { // 婵�娲婚個璇风爜鐣岄潰 jumpLink.put("url",
- * configService.get("invite_activation_url")); }
- * jumpBtn.put("params", jumpLink);
- */
-
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
-
+
+ // 绂忓埄鍒搁渶瑕佹縺娲荤晫闈�
+ if (!changeJump) {
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
+ } else {
+ 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());
@@ -519,6 +536,7 @@
@Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
@@ -527,6 +545,8 @@
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
+ // 娲诲姩棰嗗彇鍒�
+// receivedCoupon(uid);
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
@@ -554,6 +574,9 @@
updateCounponInvalid(uid);
// 閫�鍥炲埜
sendBackTimeOutCoupon(uid);
+
+ // 娲诲姩棰嗗彇鍒�
+ receivedCoupon(uid);
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
@@ -914,7 +937,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";
@@ -1215,8 +1238,8 @@
@Transactional
@Override
public void sendBackTimeOutCoupon(Long uid) {
- // 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
- List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
+ // 瓒呰繃10鍒嗛挓 鏈鍖归厤鐨勫埜
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid,600L);
if (list == null || list.size() == 0) {
return;
}
@@ -1400,9 +1423,9 @@
return;
}
- // 鏄惁鏈夎繃璁㈠崟锛氳繑鍒┿�佸垎浜鍗�
- boolean hasOrder = commonOrderCountService.hasRebateAndShareOrder(uid);
- if (hasOrder) {
+ // 鏄惁鏄柊鐢ㄦ埛
+ boolean isNewUser = userInfoExtraService.isNewUser(uid);
+ if (!isNewUser) {
return;
}
@@ -1440,7 +1463,7 @@
UserSystemCoupon userCoupon = new UserSystemCoupon();
userCoupon.setUid(uid);
- userCoupon.setSource(UserSystemCoupon.SOURCE_CHOUJIANG);
+ userCoupon.setSource(UserSystemCoupon.SOURCE_NEWBIES);
userCoupon.setSystemCoupon(systemCoupon);
userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
userCoupon.setStateActivated(stateActivated);
@@ -1488,4 +1511,252 @@
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);
+
+ // 鎻掑叆鍒�
+ randomRewardCouponForPush(pushCoupon, uid);
+ }
+ }
+ }
+
+ @Transactional
+ public void randomRewardCouponForPush(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());
+ // 鎻掑叆鏁版嵁搴�
+ insertSelective(userCoupon);
+
+ // 鍒告暟閲�
+ coupon ++;
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon,systemCoupon.getPercent().intValue());
+ } catch(Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+ // 鑾峰彇棰濆淇℃伅
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra == null) {
+ return;
+ }
+
+ Integer couponNews = userInfoExtra.getCouponNews();
+ if (couponNews == null) {
+ userInfoExtra.setCouponNews(coupon);
+ } else {
+ userInfoExtra.setCouponNews(couponNews + coupon);
+ }
+ userInfoExtraService.saveUserInfoExtra(userInfoExtra);
+ }
+
+
+ @Override
+ @Transactional
+ public void randomRewardCoupon(int num, Long uid, String source) throws Exception {
+ if (num < 1) {
+ return;
+ }
+
+ for (int i = 0; i < num; i++) {
+
+ // 杩斿埄姣�-闅忔満
+ BigDecimal percent = new BigDecimal(randomNum());
+ // 鏌ヨ濂栧姳鍒�
+ SystemCoupon systemCoupon = systemCouponService.getCouponByTypeAndPercent(
+ CouponTypeEnum.rebatePercentCoupon.name(),percent);
+ if (systemCoupon == null) {
+ return;
+ }
+
+ // 缁撴潫鏃ユ湡 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ 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(source);
+ userCoupon.setSystemCoupon(systemCoupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(1);
+ userCoupon.setStartTime(new Date());
+ userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(new Date());
+ userCoupon.setUpdateTime(new Date());
+ // 鎻掑叆鏁版嵁搴�
+ insertSelective(userCoupon);
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon,systemCoupon.getPercent().intValue());
+ } catch(Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+ // 绂忓埄涓績绾㈢偣
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra == null) {
+ return;
+ }
+ Integer couponNews = userInfoExtra.getCouponNews();
+ if (couponNews == null) {
+ userInfoExtra.setCouponNews(num);
+ } else {
+ userInfoExtra.setCouponNews(couponNews + num);
+ }
+ 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