From 9319c42fe02d041cee260ca0db8df67bcdf1ea0a Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 28 十月 2019 13:53:16 +0800
Subject: [PATCH] 免单券激活方式调整
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 172 ++++++++++++++++++++++++++++----------------------------
1 files changed, 86 insertions(+), 86 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 b7c5883..4f3b82c 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
@@ -45,7 +45,6 @@
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.exception.money.UserMoneyDetailException;
-import com.yeshi.fanli.exception.order.HongBaoException;
import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
import com.yeshi.fanli.log.LogHelper;
@@ -66,6 +65,7 @@
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.UserSystemCouponActivateService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponGiveRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
@@ -78,7 +78,6 @@
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.factory.msg.MsgOtherSystemGiveDTOFactory;
-import com.yeshi.fanli.util.rocketmq.MQTagConstant;
import com.yeshi.fanli.util.rocketmq.MQTopicName;
import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
@@ -164,6 +163,10 @@
@Resource(name = "orderTransactionProducer")
private TransactionProducer orderTransactionProducer;
+
+ @Resource
+ private UserSystemCouponActivateService userSystemCouponActivateService;
+
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -1701,7 +1704,7 @@
@Transactional
@Override
- public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)
+ public List<UserSystemCouponVO> getCouponList(AcceptData acceptData, long start, int count, Long uid)
throws UserSystemCouponException, Exception {
// 杩囨湡鍒�
@@ -1796,15 +1799,12 @@
listTip.add("婊¤冻鏉′欢鍚庯紝绯荤粺灏嗚嚜鍔ㄦ縺娲伙紝骞跺湪娑堟伅-鍏跺畠娑堟伅涓彁閱掋��");
userCouponVO.setTips(listTip);
userCouponVO.setPopup(true);
-
- // 楠岃瘉鏄惁宸茬疮璁�3鍗�
- executor.execute(new Runnable() {
- @Override
- public void run() {
- freeCouponActivate(userCouponVO.getId(), uid, userCouponVO.getCreateTime());
- }
- });
-
+ // 缁熻寰呮縺娲绘暟閲�
+ if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ int activateCount = userSystemCouponActivateService.getActivateCount(userCouponVO.getId());
+ String activateNum = configService.get("free_coupon_activate_num");
+ userCouponVO.setCouponEffect("(" + activateCount + "/"+ Integer.parseInt(activateNum) +")寰呮縺娲�");
+ }
} else if (CouponTypeEnum.welfareFreeCoupon == type) {
jumpBtn = new HashMap<String, Object>();
if (inviteCode != null && inviteCode.trim().length() > 0) {
@@ -2079,80 +2079,6 @@
return userCouponVO;
}
- /**
- * 鍏嶅崟鍒告縺娲�
- *
- * @param uid
- */
- public void freeCouponActivate(Long id, Long uid, Date date) {
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- long count = commonOrderCountService.countValidOrderByDate(uid, sdf.format(date));
-
- String activateNum = configService.get("free_coupon_activate_num");
- int num = Integer.parseInt(activateNum);
-
- if (count >= num) {
- UserSystemCoupon coupon = userSystemCouponMapper.selectByPrimaryKey(id);
- if (coupon == null || coupon.getState() != UserSystemCoupon.STATE_CAN_USE
- || coupon.getStateActivated() != 0)
- return;
-
- Date nowDate = new Date();
- Date endTime2 = coupon.getEndTime();
- if (endTime2 != null && endTime2.getTime() <= nowDate.getTime())
- return;
-
- SystemCoupon systemCoupon = coupon.getSystemCoupon();
- if (systemCoupon == null)
- return;
-
- systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
- if (systemCoupon == null || systemCoupon.getType() != CouponTypeEnum.freeCoupon)
- return;
-
- try {
- Integer expiryDay = systemCoupon.getExpiryDay();
- String endDay = DateUtil.plusDay(expiryDay - 1, nowDate);
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
- if (endDay != null && endDay.trim().length() > 0) {
- endDay += " 23:59:59";
- }
- Date endTime = format.parse(endDay);
-
- UserSystemCoupon userCoupon = new UserSystemCoupon();
- userCoupon.setId(coupon.getId());
- userCoupon.setStateActivated(1);
- userCoupon.setEndTime(endTime);
- userCoupon.setStartTime(nowDate);
- userCoupon.setUpdateTime(new Date());
- userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
-
- // 璧犻�佽褰�
- UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByReceiveId(id);
- if (giveRecord == null)
- return;
-
- Long giveUid = giveRecord.getGiveUid();
- UserInfo userInfo = userInfoService.selectByPKey(giveUid);
- if (userInfo == null)
- return;
-
- String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績涓煡鐪�";
- SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
- MsgOtherCouponActivateDTO msgOther = new MsgOtherCouponActivateDTO();
- msgOther.setTitle("鍏嶅崟鍒告縺娲�");
- msgOther.setType("鍏嶅崟鍒哥郴缁熷凡鑷姩婵�娲�");
- msgOther.setExplain("婊¤冻" + systemCoupon.getActivateDay() + "澶╁唴浜х敓" + num + "绗斿凡鍒拌处杩斿埄璁㈠崟");
- msgOther.setGiveUser("鏄电О锛�" + userInfo.getNickName() + " ID锛�" + giveUid);
- msgOther.setReceiveTime(sd.format(giveRecord.getReceiveTime()));
- msgOther.setValidityTime(expiryDay + "澶�");
- userOtherMsgNotificationService.giveCouponActivateMsg(uid, beiZhu, msgOther);
- } catch (Exception e) {
- e.printStackTrace();
- LogHelper.errorDetailInfo(e);
- }
- }
- }
@Transactional
@Override
@@ -2496,4 +2422,78 @@
return userSystemCouponMapper.getFreeCouponByType(uid, type);
}
+
+
+ @Override
+ @Transactional
+ public void activateFreeCoupon(Long uid) {
+ List<UserSystemCoupon> list = userSystemCouponMapper.getNeedActivateFreeCouponByType(uid, CouponTypeEnum.freeCoupon.name());
+ if (list == null || list.size() == 0)
+ return;
+
+ UserSystemCoupon coupon = list.get(0);
+ Date nowDate = new Date();
+ Date endTime2 = coupon.getEndTime();
+ if (endTime2 != null && endTime2.getTime() <= nowDate.getTime())
+ return; // 宸插け鏁�
+
+ SystemCoupon systemCoupon = coupon.getSystemCoupon();
+ if (systemCoupon == null)
+ return; // 鍒稿凡涓嶅瓨鍦�
+
+ systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (systemCoupon == null || systemCoupon.getType() != CouponTypeEnum.freeCoupon)
+ return; // 鍒哥被鍨嬩笉鍖归厤
+
+
+ // 娣诲姞婵�娲绘暟閲�
+ String activateNum = configService.get("free_coupon_activate_num");
+ boolean activate = userSystemCouponActivateService.addActivateCount(coupon.getId(), Integer.parseInt(activateNum));
+
+ // 婵�娲诲埜
+ if (activate) {
+
+ try {
+ Integer expiryDay = systemCoupon.getExpiryDay();
+ String endDay = DateUtil.plusDay(expiryDay - 1, nowDate);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ if (endDay != null && endDay.trim().length() > 0) {
+ endDay += " 23:59:59";
+ }
+ Date endTime = format.parse(endDay);
+
+ UserSystemCoupon userCoupon = new UserSystemCoupon();
+ userCoupon.setId(coupon.getId());
+ userCoupon.setStateActivated(1);
+ userCoupon.setEndTime(endTime);
+ userCoupon.setStartTime(nowDate);
+ userCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(userCoupon);
+
+ // 璧犻�佽褰�
+ UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByReceiveId(coupon.getId());
+ if (giveRecord == null)
+ return;
+
+ Long giveUid = giveRecord.getGiveUid();
+ UserInfo userInfo = userInfoService.selectByPKey(giveUid);
+ if (userInfo == null)
+ return;
+
+ String beiZhu = "璇峰埌鎴戠殑-绂忓埄涓績涓煡鐪�";
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy.MM.dd HH:mm");
+ MsgOtherCouponActivateDTO msgOther = new MsgOtherCouponActivateDTO();
+ msgOther.setTitle("鍏嶅崟鍒告縺娲�");
+ msgOther.setType("鍏嶅崟鍒哥郴缁熷凡鑷姩婵�娲�");
+ msgOther.setExplain("婊¤冻" + systemCoupon.getActivateDay() + "澶╁唴浜х敓" + activateNum + "绗斿凡鍒拌处杩斿埄璁㈠崟");
+ msgOther.setGiveUser("鏄电О锛�" + userInfo.getNickName() + " ID锛�" + giveUid);
+ msgOther.setReceiveTime(sd.format(giveRecord.getReceiveTime()));
+ msgOther.setValidityTime(expiryDay + "澶�");
+ userOtherMsgNotificationService.giveCouponActivateMsg(uid, beiZhu, msgOther);
+ } catch (Exception e) {
+ e.printStackTrace();
+ LogHelper.errorDetailInfo(e);
+ }
+ }
+ }
}
--
Gitblit v1.8.0