From 8e751a7ee99afce71ac615a6111228c5c785ee46 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 14 八月 2019 09:52:59 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 277 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 198 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 4e78043..558e90f 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
@@ -609,7 +609,7 @@
@Transactional
@Override
- public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
+ public void useGoodsCoupon(Long uid, Long id, Long goodId, Integer sourceType) throws UserSystemCouponException, Exception {
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
@@ -660,7 +660,7 @@
// 鎻掑叆浣跨敤鍒歌褰�
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
couponRecord.setGoodId(goodId);
- couponRecord.setGoodSource(Constant.SOURCE_TYPE_TAOBAO); // 榛樿娣樺疂
+ couponRecord.setGoodSource(sourceType); // 榛樿娣樺疂
couponRecord.setState(UserSystemCouponRecord.STATE_WAIT); // 姝ｅ湪鍖归厤
couponRecord.setUserSystemCoupon(userSystemCoupon);
couponRecord.setCouponType(baseCoupon.getType().name());
@@ -684,12 +684,16 @@
@Transactional
@Override
- public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {
+ public void useOrderCoupon(Long uid, Long id, String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
if (id == null) {
throw new UserSystemCouponException(1, "鍒竔d涓嶅瓨鍦�");
}
-
+
+ if (sourceType == null) {
+ sourceType = Constant.SOURCE_TYPE_TAOBAO;
+ }
+
// 鐢ㄦ埛鍒�
UserSystemCoupon userSystemCoupon = selectByPrimaryKey(id);
if (userSystemCoupon == null) {
@@ -724,7 +728,7 @@
}
// 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS);
+ CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS, sourceType);
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
@@ -738,7 +742,7 @@
// 鏉′欢: A:蹇呴』鏄繑鍒╄鍗� 銆丅:蹇呴』宸茬粡澶勪簬宸插埌璐︾姸鎬�
if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) {
- Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);
+ Order order = orderService.findOrderByOrderIdAndType(orderNo, sourceType);
if (order == null)
return;
@@ -760,19 +764,20 @@
hongBaoV2.setUserInfo(new UserInfo(uid));
hongBaoV2.setPreGetTime(new Date());
hongBaoV2.setGetTime(new Date());
+
hongBaoV2Service.insertSelective(hongBaoV2);
// 2.鎻掑叆鍏宠仈
orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
// 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
- UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, sourceType, money,
new UserInfo(uid));
userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
userInfoService.addMoney(new UserInfo(uid), money);
// 鎻掑叆璧勯噾閫氱煡
- userMoneyMsgNotificationService.orderReward(uid, orderNo, money,
+ userMoneyMsgNotificationService.orderReward(uid, orderNo, sourceType, money,
userInfoService.selectByPKey(uid).getMyHongBao());
/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
@@ -787,6 +792,7 @@
// 鎻掑叆浣跨敤鍒歌褰�
UserSystemCouponRecord couponRecord = new UserSystemCouponRecord();
couponRecord.setState(UserSystemCouponRecord.STATE_SUCCESS);
+ couponRecord.setGoodSource(sourceType);
couponRecord.setOrderNo(orderNo);
couponRecord.setUserSystemCoupon(userSystemCoupon);
couponRecord.setCouponType(systemCoupon.getType().name());
@@ -805,7 +811,7 @@
}
@Override
- public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
+ public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -841,7 +847,7 @@
Long uid = userSystemCoupon.getUid();
CommonOrderVO commonOrderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo,
- CommonOrder.STATE_JS);
+ CommonOrder.STATE_JS, sourceType);
if (commonOrderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
@@ -883,7 +889,7 @@
}
@Override
- public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
+ public UserSystemCouponRecordVO getFreeCouponRecord(String orderNo, Integer sourceType) throws UserSystemCouponException, Exception {
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
@@ -911,7 +917,7 @@
}
// 璁㈠崟
- CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null);
+ CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(), orderNo, null, sourceType);
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
@@ -1507,73 +1513,6 @@
}
-
- @Transactional
- public void randomRewardCouponForPush(Integer amount, Long uid) throws Exception {
- int coupon = 0;
-
- for (int i = 0; i < amount; 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(UserSystemCoupon.SOURCE_SYSTEM_PUSH);
- 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);
-
- // 鍒告暟閲�
- 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 {
@@ -1694,4 +1633,184 @@
}
}
+
+ @Override
+ @Transactional
+ public void exchangeCoupon(Long uid, String couponType, String source, boolean give, BigDecimal percent) throws UserSystemCouponException, Exception {
+ if (couponType == null || uid == null) {
+ throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+ }
+
+ SystemCoupon coupon = null;
+ if (couponType.equals(CouponTypeEnum.rebatePercentCoupon.name())) {
+ coupon = systemCouponService.getCouponByTypeAndPercent(couponType, percent);
+ } else {
+ coupon = systemCouponService.getCouponByType(couponType);
+ }
+
+ if (coupon == null) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
+ }
+
+ int stateActivated = 1;
+ if (couponType == CouponTypeEnum.freeCoupon.name()) {
+ stateActivated = 0; //
+ } else if (couponType == CouponTypeEnum.welfareFreeCoupon.name() && threeSaleSerivce.countSuccessFirstTeam(uid) <= 0) {
+ stateActivated = 0; // 鏃犱笅绾ч槦鍛� --寰呮縺娲�
+ }
+
+ // 璁＄畻缁撴潫鏃ユ湡锛氫粖澶╁湪鍐� 鍑忓幓涓�澶�
+ String endDay = DateUtil.plusDay(coupon.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.setGive(give);
+ userCoupon.setSystemCoupon(coupon);
+ userCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userCoupon.setStateActivated(stateActivated);
+ userCoupon.setStartTime(new Date());
+ userCoupon.setEndTime(endTime);
+ userCoupon.setCreateTime(new Date());
+ userCoupon.setUpdateTime(new Date());
+ insertSelective(userCoupon);
+ }
+
+
+ @Transactional
+ @Override
+ public List<UserSystemCouponVO> getCouponList(long start, int count, Long uid)throws UserSystemCouponException, Exception {
+ if (uid == null) {
+ return null;
+ }
+
+ // 鏇存柊杩囨湡鍒�
+ updateCounponInvalid(uid);
+ // 閫�鍥炲埜
+ sendBackTimeOutCoupon(uid);
+
+ List<UserSystemCouponVO> listVO = userSystemCouponMapper.getUserCouponVOList(start, count, uid);
+ if (listVO == null || listVO.size() == 0) {
+ return listVO;
+ }
+
+ // 鏄惁婵�娲婚個璇风爜
+ String inviteCode = null;
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ if (userInfoExtra != null) {
+ inviteCode = userInfoExtra.getInviteCode();
+ }
+
+ for (UserSystemCouponVO userCouponVO : listVO) {
+ SystemCoupon systemCoupon = userCouponVO.getSystemCoupon();
+ if (systemCoupon != null && systemCoupon.getId() != null) {
+ systemCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ }
+
+ if (systemCoupon == null) {
+ continue; // 鍒镐俊鎭笉瀹屾暣
+ }
+
+ userCouponVO.setSource("鏉ユ簮锛�" + userCouponVO.getSource());
+ userCouponVO.setCouponName(systemCoupon.getName());
+ 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();
+ Date endTime = userCouponVO.getEndTime();
+ if (endTime != null && startTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
+ couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
+ }
+ userCouponVO.setCouponTerm(couponTerm);
+
+ if (UserSystemCoupon.STATE_CAN_USE == state) {
+ int differentDays = 0;
+ if (endTime != null && startTime != null) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ differentDays = DateUtil.daysBetween(sdf.format(new Date()), sdf.format(endTime)) + 1;
+ if (differentDays < 0) {
+ differentDays = 0;
+ }
+ }
+ // 鍓╀綑澶╂暟
+ Map<String, Object> remainDays = new HashMap<String, Object>();
+ remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
+ remainDays.put("fontColor", "#F14242");
+ userCouponVO.setRemainDays(remainDays);
+ }
+ }
+ return listVO;
+ }
}
--
Gitblit v1.8.0