From fec4f669c779151ba6d1699c053bad4575f4060f Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 06 三月 2019 10:58:26 +0800
Subject: [PATCH] 退回天数
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 154 ++++++--------------------------------------------
1 files changed, 20 insertions(+), 134 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 d4af745..190c158 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
@@ -28,6 +28,7 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;
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;
@@ -46,6 +47,8 @@
import com.yeshi.fanli.service.inter.order.HongBaoOrderService;
import com.yeshi.fanli.service.inter.order.OrderHongBaoMapService;
import com.yeshi.fanli.service.inter.order.OrderService;
+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.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -126,7 +129,14 @@
@Resource
private CommonOrderCountService commonOrderCountService;
-
+
+ @Resource
+ private PushCouponService pushCouponService;
+
+ @Resource
+ private PushCouponRecordService pushCouponRecordService;
+
+
@Override
public int insertSelective(UserSystemCoupon record) {
return userSystemCouponMapper.insertSelective(record);
@@ -186,7 +196,8 @@
}
// 缁撴潫鏃ユ湡
- String endDay = DateUtil.plusDay(coupon.getExpiryDay(), new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(coupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
@@ -1228,7 +1239,8 @@
// 缁撴潫鏃ユ湡
Date endTime = null;
try {
- String endDay = DateUtil.plusDay(expiryDay, new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
endTime = format.parse(endDay);
} catch (ParseException e) {
@@ -1339,7 +1351,8 @@
// 缁撴潫鏃ユ湡
Date endTime = null;
try {
- String endDay = DateUtil.plusDay(expiryDay, new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(expiryDay - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
endTime = format.parse(endDay);
} catch (ParseException e) {
@@ -1419,8 +1432,8 @@
}
}
- // 缁撴潫鏃ユ湡
- String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay(), new Date());
+ // 浠婂ぉ鍦ㄥ唴 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(systemCoupon.getExpiryDay() - 1, new Date());
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
Date endTime = format.parse(endDay);
@@ -1475,134 +1488,7 @@
}
- @Override
- @Transactional
- public void randomRewardCoupon(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 {
- if (systemCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
- userOtherMsgNotificationService.welfareCouponGet(userCoupon);
- } else if (systemCoupon.getType() == CouponTypeEnum.freeCoupon) {
- userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
- } else if (systemCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
- 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);
- }
-
- /**
- * 闅忔満鍒告瘮渚�
- * @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