From 4cf31a2a8a01ba1a7c375b6cb6a7fff36960ba70 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 01 三月 2019 16:29:14 +0800
Subject: [PATCH] Merge branch 'div'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 797 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 679 insertions(+), 118 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 2446abf..48a3737 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
@@ -1,6 +1,7 @@
package com.yeshi.fanli.service.impl.user;
import java.math.BigDecimal;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -10,30 +11,48 @@
import javax.annotation.Resource;
+import org.springframework.core.task.TaskExecutor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.user.UserSystemCouponMapper;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.Order;
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.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.HongBaoOrder;
import com.yeshi.fanli.entity.system.SystemCoupon;
import com.yeshi.fanli.entity.system.SystemCoupon.CouponTypeEnum;
+import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
+import com.yeshi.fanli.exception.user.UserInfoExtraException;
import com.yeshi.fanli.exception.user.UserSystemCouponException;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.config.SystemCouponService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
+import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;
+import com.yeshi.fanli.service.inter.msg.UserOtherMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
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.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.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.factory.UserMoneyDetailFactory;
+import com.yeshi.fanli.util.taobao.TaoBaoUtil;
import com.yeshi.fanli.vo.msg.ClientTextStyleVO;
import com.yeshi.fanli.vo.order.CommonOrderVO;
import com.yeshi.fanli.vo.user.UserSystemCouponRecordVO;
@@ -44,6 +63,12 @@
@Service
public class UserSystemCouponServiceImpl implements UserSystemCouponService {
+ @Resource(name = "taskExecutor")
+ private TaskExecutor executor;
+
+ @Resource
+ private RedisManager redisManager;
+
@Resource
private UserSystemCouponMapper userSystemCouponMapper;
@@ -67,10 +92,30 @@
@Resource
private HongBaoOrderService hongBaoOrderService;
+
+ @Resource
+ private OrderHongBaoMapService orderHongBaoMapService;
+
+ @Resource
+ private OrderService orderService;
+
+ @Resource
+ private UserMoneyDetailService userMoneyDetailService;
+
+ @Resource
+ private UserInfoService userInfoService;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
- // 鍒稿け鏁堝浘鐗�
- public final static String PIC_INVALID= "http://192.168.1.200/icon/mian_invalid.png";
+ @Resource
+ private UserInfoExtraService userInfoExtraService;
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserOtherMsgNotificationService userOtherMsgNotificationService;
@Override
@@ -99,10 +144,99 @@
}
@Override
+ public List<UserSystemCoupon> getUserCouponBySource(Long uid, String source) {
+ return userSystemCouponMapper.getUserCouponBySource(uid, source);
+ }
+
+ @Override
public long countUserCouponList(Long uid) {
return userSystemCouponMapper.countUserCouponList(uid);
}
+ @Override
+ public void insertUserCoupon(Long uid, String couponType,String source)throws UserSystemCouponException,Exception{
+
+ if (couponType == null || uid == null) {
+ throw new UserSystemCouponException(1, "鍙傛暟涓嶆纭�");
+ }
+
+ SystemCoupon coupon= systemCouponService.getCouponByType(couponType);
+ if (coupon == null) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
+ }
+
+ int stateActivated = 1;
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ // 绂忓埄鍒哥姸鎬�
+ long countSuccess = threeSaleSerivce.countSuccessFirstTeam(uid);
+ // 娌℃湁涓嬬骇闃熷憳 --寰呮縺娲�
+ if (countSuccess == 0) {
+ stateActivated = 0;
+ }
+ }
+
+ // 缁撴潫鏃ユ湡
+ String endDay = DateUtil.plusDay(coupon.getExpiryDay(), 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(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);
+
+ executor.execute(new Runnable() {
+ @Override
+ public void run() {
+ UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);
+ // 娣诲姞涓�鏉℃秷鎭�
+ if (userInfoExtra != null) {
+ if (userInfoExtra.getCouponNews() == null) {
+ userInfoExtra.setCouponNews(1);
+ } else {
+ userInfoExtra.setCouponNews(userInfoExtra.getCouponNews() + 1);
+ }
+
+
+ try {
+ userInfoExtraService.saveUserInfoExtra(userInfoExtra);
+ } catch (UserInfoExtraException e) {
+ e.printStackTrace();
+ }
+ }
+
+ }
+ });
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ if (coupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ userOtherMsgNotificationService.welfareCouponGet(userCoupon);
+ } else if (coupon.getType() == CouponTypeEnum.freeCoupon) {
+ userOtherMsgNotificationService.freeSheetCouponGet(userCoupon);
+ } else if (coupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponGet(userCoupon,coupon.getPercent().intValue());
+ }
+
+ } catch(Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+
+
+ @Transactional
@Override
public List<UserSystemCouponVO> getUserCouponVOList(long start, int count, Long uid)
throws UserSystemCouponException, Exception {
@@ -110,14 +244,19 @@
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;
}
// 鏁版嵁缁勭粐
- listDataFactory(listVO);
+ listDataFactory(listVO, uid);
return listVO;
}
@@ -127,7 +266,7 @@
*
* @param listVO
*/
- public void listDataFactory(List<UserSystemCouponVO> listVO) {
+ public void listDataFactory(List<UserSystemCouponVO> listVO, Long uid) throws Exception{
for (UserSystemCouponVO userCouponVO : listVO) {
@@ -147,32 +286,46 @@
userCouponVO.setCouponPicture(systemCoupon.getPicture());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
-
- // 浣跨敤涓姸鎬� 鏀瑰彉涓哄凡浣跨敤
+ userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
+
+ // 浣跨敤鐘舵��
Integer state = userCouponVO.getState();
- if (UserSystemCoupon.STATE_IN_USE == state) {
- state = UserSystemCoupon.STATE_END_USE;
- userCouponVO.setState(state);
- }
+ // 鍒哥被鍨�
+ CouponTypeEnum type = systemCoupon.getType();
// 鎸夐挳璺宠浆
-
Map<String, Object> jumpBtn = null;
+
Integer stateActivated = userCouponVO.getStateActivated();
+
if (stateActivated == null || stateActivated == 0) {
// 鏄剧ず瑙勫垯
userCouponVO.setCouponRule(systemCoupon.getRemark());
- systemCoupon.setEffect("寰呮縺娲�");
-
- // 鐘舵�佹湭婵�娲�
- userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+
+ // 鐘舵�佹湭婵�娲� -涓旀湭琚娇鐢�
+ if (UserSystemCoupon.STATE_CAN_USE == state) {
+ userCouponVO.setState(0);
+ }
jumpBtn = new HashMap<String, Object>();
Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("url", configService.get("invite_activation_url"));
+
+ 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"));
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite_web"));
} else if (stateActivated == 1) {
// 鏄剧ず瑙勫垯
@@ -181,28 +334,37 @@
if (UserSystemCoupon.STATE_CAN_USE == state) {
Map<String, Object> jumpLink = new HashMap<String, Object>();
- CouponTypeEnum type = systemCoupon.getType();
if (CouponTypeEnum.freeCoupon == type || CouponTypeEnum.welfareFreeCoupon == type) {
// 鍏嶅崟鍒搞�� 绂忓埄鍏嶅崟鍒�
- jumpLink.put("url", configService.get("invite_activation_url"));
+
+ // 鍏嶅崟鍟嗗搧鍒楄〃
+ 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("url", configService.get("invite_activation_url"));
-
+ // 杩斿埄濂栧姳鍒�- 璺宠浆鑷宠鍗曞埌璐︾晫闈�
+ jumpLink.put("state", "2");
+
jumpBtn = new HashMap<String, Object>();
jumpBtn.put("params", jumpLink);
- jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("invite"));
+ // 璺宠浆璁㈠崟鍒楄〃
+ jumpBtn.put("jumpDetail", jumpDetailV2Service.getByTypeCache("orderList"));
}
- } else if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
- userCouponVO.setCouponPicture(PIC_INVALID);
+
+ } else if (UserSystemCoupon.STATE_IN_USE == state) {
+ // 浣跨敤涓�
+ userCouponVO.setInUseExplain(configService.get("free_coupon_using-help"));
}
-
}
+
+ // 鍒稿け鏁堝浘鐗囨浛鎹�
+ if (UserSystemCoupon.STATE_END_USE == state || UserSystemCoupon.STATE_OVERDUE == state) {
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+ }
+
userCouponVO.setJumpBtn(jumpBtn);
String couponTerm = "鏈夋晥鏈燂細";
@@ -217,12 +379,12 @@
if (UserSystemCoupon.STATE_CAN_USE == state) {
int differentDays = 0;
if (endTime != null && startTime != null) {
- differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1;
+ 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 + "澶╄繃鏈�");
@@ -241,9 +403,8 @@
listCouponId.add(systemCoupon.getId());
}
- List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated,
- listCouponId);
-
+ List<UserSystemCouponVO> listVO = userSystemCouponMapper.getEnableListByCouponId(uid, activated, listCouponId);
+
if (listVO == null || listVO.size() == 0) {
return null;
}
@@ -268,14 +429,8 @@
userCouponVO.setCouponName(systemCoupon.getName());
userCouponVO.setCouponEffect(systemCoupon.getEffect());
userCouponVO.setCouponRule(systemCoupon.getRule());
-
- Integer stateActivated = userCouponVO.getStateActivated();
- if (stateActivated == null || stateActivated == 0) {
- userCouponVO.setCouponPicture(PIC_INVALID); // 鏈縺娲�
- userCouponVO.setState(0);
- } else {
- userCouponVO.setCouponPicture(systemCoupon.getPicture());
- }
+ userCouponVO.setCouponPictureInvalid(systemCoupon.getPictureInvalid());
+
int differentDays = 0;
String couponTerm = "鏈夋晥鏈燂細";
@@ -284,8 +439,9 @@
if (endTime != null && startTime != null) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
couponTerm = couponTerm + sdf.format(startTime) + "-" + sdf.format(endTime);
-
- differentDays = DateUtil.differentDaysByMillisecond(new Date(), endTime) + 1;
+
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
+ differentDays = DateUtil.daysBetween(sdf2.format(new Date()), sdf2.format(endTime)) + 1;
if (differentDays < 0) {
differentDays = 0;
}
@@ -296,7 +452,23 @@
// 鍓╀綑澶╂暟
Map<String, Object> remainDays = new HashMap<String, Object>();
remainDays.put("content", "杩樺墿" + differentDays + "澶╄繃鏈�");
- remainDays.put("fontColor", "#F14242");
+ String remainDaysFontColor = "";
+
+ Integer stateActivated = userCouponVO.getStateActivated();
+ if (stateActivated == null || stateActivated == 0) {
+ userCouponVO.setState(0);
+ userCouponVO.setCouponEffect("寰呮縺娲�");
+ userCouponVO.setCouponPicture(systemCoupon.getPictureInvalid());
+
+ remainDaysFontColor = "#CCCCCC";
+
+ } else {
+ userCouponVO.setCouponPicture(systemCoupon.getPicture());
+
+ remainDaysFontColor = "#F14242";
+ }
+
+ remainDays.put("fontColor", remainDaysFontColor);
userCouponVO.setRemainDays(remainDays);
}
@@ -327,11 +499,18 @@
return hasCoupon;
}
+ @Transactional
@Override
public List<UserSystemCouponVO> getOrderCouponList(Long uid) throws UserSystemCouponException, Exception {
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
+
+ // 鏇存柊杩囨湡鍒�
+ updateCounponInvalid(uid);
+ // 閫�鍥炲埜
+ sendBackTimeOutCoupon(uid);
+
// 璁㈠崟鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getOrderCouponList();
if (couponList == null || couponList.size() == 0) {
@@ -341,20 +520,59 @@
return getEnableListByCouponId(uid, 1, couponList);
}
+ @Transactional
@Override
- public List<UserSystemCouponVO> getGoodsCouponList(Long uid) throws UserSystemCouponException, Exception {
+ public List<UserSystemCouponVO> getGoodsCouponList(Long uid, Long auctionId) throws UserSystemCouponException, Exception {
+
if (uid == null) {
throw new UserSystemCouponException(1, "鐢ㄦ埛鏈櫥褰�");
}
+
+ if (auctionId == null) {
+ throw new UserSystemCouponException(1, "鍟嗗搧ID涓虹┖");
+ }
+
+ // 鏇存柊杩囨湡鍒�
+ updateCounponInvalid(uid);
+ // 閫�鍥炲埜
+ sendBackTimeOutCoupon(uid);
+
// 鍟嗗搧鐩稿叧鐨勫埜
List<SystemCoupon> couponList = systemCouponService.getGoodsCouponList();
if (couponList == null || couponList.size() == 0) {
return null;
}
- return getEnableListByCouponId(uid, null, couponList);
+ List<UserSystemCouponVO> list = getEnableListByCouponId(uid, null, couponList);
+
+ // 鑾峰彇鍟嗗搧璇︽儏
+ TaoBaoGoodsBrief taoBaoGoodsBrief = redisManager.getTaoBaoGoodsBrief(auctionId);
+ if (taoBaoGoodsBrief != null) {
+ BigDecimal quanPrice = TaoBaoUtil.getAfterUseCouplePrice(taoBaoGoodsBrief);
+
+ // 鍒稿悗浠� 澶т簬10鍏� 涓嶈兘鍏嶅崟
+ if (quanPrice.compareTo(new BigDecimal(10)) > 0) {
+ if (list != null && list.size() > 0) {
+ for (UserSystemCouponVO userCouponVO: list) {
+ // 鏄剧ず涓嶈兘浣跨敤
+ userCouponVO.setState(0);
+ userCouponVO.setCouponPicture(userCouponVO.getCouponPictureInvalid());
+
+ Map<String, Object> map = userCouponVO.getRemainDays();
+ if (map != null) {
+ map.put("fontColor", "#CCCCCC");
+ }
+ userCouponVO.setRemainDays(map);
+
+ }
+ }
+ }
+ }
+
+ return list;
}
+ @Transactional
@Override
public void useGoodsCoupon(Long uid, Long id, Long goodId) throws UserSystemCouponException, Exception {
if (uid == null) {
@@ -374,14 +592,19 @@
if (!uid.equals(couponUid)) {
throw new UserSystemCouponException(1, "浼犻�掑弬鏁颁笉鍖归厤");
}
-
+
SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
-
+
SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
if (baseCoupon == null || baseCoupon.getId() == null) {
throw new UserSystemCouponException(1, "鏈壘鍒板埜鍩烘湰淇℃伅");
}
+ if (baseCoupon.getType() != CouponTypeEnum.freeCoupon
+ && baseCoupon.getType() != CouponTypeEnum.welfareFreeCoupon) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
+ }
+
Date date = new Date();
// 鏇存柊鍒镐娇鐢�
userSystemCoupon.setState(UserSystemCoupon.STATE_IN_USE); // 姝ｅ湪鍖归厤
@@ -399,8 +622,22 @@
couponRecord.setCreateTime(date);
couponRecord.setUpdateTime(date);
userSystemCouponRecordService.insertSelective(couponRecord);
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ //userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,order.get);
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
+ //userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon);
+ }
+
+ } catch(Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+
}
+ @Transactional
@Override
public void useOrderCoupon(Long uid, Long id, String orderNo) throws UserSystemCouponException, Exception {
@@ -423,6 +660,11 @@
}
}
+ if (systemCoupon.getType() != CouponTypeEnum.rebatePercentCoupon) {
+ throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉鍖归厤");
+ }
+
+
if (orderNo == null || orderNo.trim().length() == 0) {
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
}
@@ -433,7 +675,6 @@
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
- Long commonOrderId = orderVO.getId();
BigDecimal hongBao = orderVO.getHongBao();
// 绾㈠寘鐘舵��
@@ -443,6 +684,10 @@
// 鏉′欢: A:蹇呴』鏄繑鍒╄鍗� 銆丅:蹇呴』宸茬粡澶勪簬宸插埌璐︾姸鎬�
if (HongBaoV2.TYPE_ZIGOU == hongBaoType && HongBaoV2.STATE_YILINGQU == hongBaoState || hongBao != null) {
+
+ Order order = orderService.findOrderByOrderIdAndType(orderNo, Order.ORDER_TYPE_TAOBAO);
+ if (order == null)
+ return;
/* 濂栭噾璁＄畻 浠ュ強鐩稿叧绾㈠寘淇℃伅澶勭悊 */
@@ -460,15 +705,22 @@
hongBaoV2.setCreateTime(new Date());
hongBaoV2.setUpdateTime(new Date());
hongBaoV2.setUserInfo(new UserInfo(uid));
+ hongBaoV2.setPreGetTime(new Date());
+ hongBaoV2.setGetTime(new Date());
hongBaoV2Service.insertSelective(hongBaoV2);
- // 2銆佽鍗曞叧鑱旂孩鍖呰〃
- HongBaoOrder hongBaoOrder = new HongBaoOrder();
- hongBaoOrder.setHongBaoV2(hongBaoV2);
- hongBaoOrder.setCommonOrder(new CommonOrder(commonOrderId));
- hongBaoOrderService.insertSelective(hongBaoOrder);
+ // 2.鎻掑叆鍏宠仈
+ orderHongBaoMapService.addOrderHongBaoMap(hongBaoV2, order);
- // TODO 绾㈠寘鐩稿叧淇℃伅鎻掑叆浠ュ強閫氱煡
+ // 3.鎻掑叆璧勯噾鏄庣粏,鐢ㄦ埛浣欓
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createOrderReward(orderNo, money,
+ new UserInfo(uid));
+ userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);
+ userInfoService.addMoney(new UserInfo(uid), money);
+
+ // 鎻掑叆璧勯噾閫氱煡
+ userMoneyMsgNotificationService.orderReward(uid, orderNo, money,
+ userInfoService.selectByPKey(uid).getMyHongBao());
/* 鐢ㄦ埛鍒镐俊鎭姸鎬佸強璁板綍澶勭悊 */
@@ -488,11 +740,17 @@
couponRecord.setCreateTime(date);
couponRecord.setUpdateTime(date);
userSystemCouponRecordService.insertSelective(couponRecord);
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.rewardCouponUsed(userSystemCoupon, hongBao, money, orderNo);
+ } catch(Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
}
}
-
@Override
public UserSystemCouponRecordVO getRewardCouponRecord(String orderNo) throws UserSystemCouponException, Exception {
@@ -527,25 +785,33 @@
throw new UserSystemCouponException(1, "鍒哥被鍨嬩笉姝ｇ‘");
}
- List<CommonOrderVO> list = commonOrderService.getCouponHongbaoByOrderNo(userSystemCoupon.getUid(),
- HongBaoV2.STATE_YILINGQU, orderNo);
-
- if (list == null || list.size() == 0) {
+ Long uid = userSystemCoupon.getUid();
+
+ CommonOrderVO commonOrderVO= commonOrderService.getCommonOrderByOrderNo(userSystemCoupon.getUid(),
+ orderNo, CommonOrder.STATE_JS);
+
+ if (commonOrderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
-
+
+ // 鑾峰彇濂栧姳閲戦
+ BigDecimal couponMoney = orderHongBaoMapService.getCouponHongbaoByOrderNo(orderNo, uid);
+
UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
userRecordVO.setCouponMoneyState("宸插埌璐�");
- userRecordVO.setCommonOrder(list.get(0));
- userRecordVO.setCouponName("濂栧姳閲�: 楼" + list.get(0).getCouponMoney().setScale(2, BigDecimal.ROUND_DOWN));
+ userRecordVO.setCommonOrder(commonOrderVO);
+ userRecordVO.setCouponName("濂栧姳閲�: 楼" + couponMoney.setScale(2, BigDecimal.ROUND_DOWN));
// 姣斾緥
BigDecimal percent = baseCoupon.getPercent();
- BigDecimal hongBao = list.get(0).getHongBao().setScale(2, BigDecimal.ROUND_DOWN);
- userRecordVO.setCouponEffect("杩斿埄楼" + hongBao + "宸茶繑" + percent + "%");
+ BigDecimal hongBao = commonOrderVO.getHongBao();
+ if (hongBao == null) {
+ hongBao = new BigDecimal(0);
+ }
+ userRecordVO.setCouponEffect("杩斿埄楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN) + "宸茶繑" + percent + "%");
- // 璺宠浆绂忓埄涓績
- JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("welfareCore");
+ // 璧勯噾鏄庣粏
+ JumpDetailV2 welfareCore = jumpDetailV2Service.getByTypeCache("capitalDetails");
Map<String, Object> jumpWelfare = new HashMap<String, Object>();
jumpWelfare.put("jumpDetail", welfareCore);
Map<String, Object> jumpparms = new HashMap<String, Object>();
@@ -597,20 +863,19 @@
if (orderVO == null) {
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
}
-
+
UserSystemCouponRecordVO userRecordVO = new UserSystemCouponRecordVO();
userRecordVO.setCommonOrder(orderVO);
-
+
ClientTextStyleVO fanMoney = new ClientTextStyleVO();
- fanMoney.setContent("杩斿埄: 楼" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
+ fanMoney.setContent("杩斿埄: 楼" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
fanMoney.setColor("#000000"); // 榛樿榛戣壊
userRecordVO.setFanMoney(fanMoney);
-
+
ClientTextStyleVO payMoney = new ClientTextStyleVO();
- payMoney.setContent("瀹炰粯娆�:楼"+ orderVO.getPayment().setScale(2, BigDecimal.ROUND_DOWN));
+ payMoney.setContent("瀹炰粯娆�:楼" + orderVO.getPayment().setScale(2, BigDecimal.ROUND_DOWN));
payMoney.setColor("#000000"); // 榛樿榛戣壊
-
-
+
String progressMsg = "";
String progressColor = "";
// 璺宠浆濂栧姳鍒歌鍒�
@@ -618,62 +883,62 @@
// 杩涘害锛� 1 鐏拌壊 2 绾㈣壊 3 缁胯壊
String progressState1 = "3";
- String progressState2 = "1";
+ String progressState2 = "1";
String progressState3 = "1";
String progressState4 = "1";
-
+
String goodsState = "鍟嗗搧鏀惰揣";
// 鏂囧瓧鐘舵��
String text2Color = "#999999";
String text3Color = "#999999";
String text4Color = "#999999";
-
+
// 搴曢儴澶囨敞
String rewardCouponRemark = "";
// 鐘舵�佽烦杞�
JumpDetailV2 jumpDetail = null;
- // 杩涘害鐘舵�� 1绛夊緟 2 澶辫触 3鎴愬姛
+ // 杩涘害鐘舵�� 1绛夊緟 2 澶辫触 3鎴愬姛
int progressState = 1;
-
+
Integer stateRecord = record.getState();
if (UserSystemCouponRecord.STATE_FAIL_RULE == stateRecord) {
// 瑙勫垯涓嶅尮閰�
progressState = 2;
-
+
progressColor = "#E41212";
- progressMsg = "鎶辨瓑涓嶇鍚堝厤鍗曡鍒欙紝鍏嶅崟澶辫触" ;
-
- progressState1 = "2"; //涓嶅尮閰�
-
+ progressMsg = "鎶辨瓑涓嶇鍚堝厤鍗曡鍒欙紝鍏嶅崟澶辫触";
+
+ progressState1 = "2"; // 涓嶅尮閰�
+
payMoney.setColor("#E41212");
-
+
userRecordVO.setCouponMoneyState("宸查��鍥�");
userRecordVO.setCouponName(baseCoupon.getName());
-
+
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
-
+
rewardCouponRemark = configService.get("free_coupon_back_remark");
-
+
} else if (UserSystemCouponRecord.STATE_FAIL_DRAWBACK == stateRecord) {
// 閫�娆�
progressState = 2;
-
+
progressColor = "#E41212";
progressMsg = "鍟嗗搧宸查��娆撅紝鍏嶅崟澶辫触";
-
+
text2Color = "#E41212";
goodsState = "鍟嗗搧宸查��娆�";
-
+
progressState2 = "2";
-
+
userRecordVO.setCouponMoneyState("宸查��鍥�");
userRecordVO.setCouponName(baseCoupon.getName());
-
+
jumpDetail = jumpDetailV2Service.getByTypeCache("welfareCore");
-
+
rewardCouponRemark = configService.get("free_coupon_back_remark");
-
- } else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
+
+ } else if (UserSystemCouponRecord.STATE_FREE_ON == stateRecord) {
// 鍏嶅崟涓�
if (CommonOrder.STATE_JS == orderVO.getState()) {
progressColor = "#ECA01B";
@@ -684,65 +949,65 @@
progressColor = "#ECA01B";
progressMsg = "鍏嶅崟鍙戣捣锛岀瓑寰呮敹璐�";
}
-
+
rewardCouponRemark = configService.get("free_coupon_remark");
-
- } else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
+
+ } else if (UserSystemCouponRecord.STATE_SUCCESS == stateRecord) {
// 鍏嶅崟鎴愬姛
progressState = 3;
-
+
progressColor = "#3EBF13";
progressMsg = "鍏嶅崟鎴愬姛锛屽厤鍗曢噾宸茶浆鍏ヤ綑棰�";
-
+
progressState2 = "3";
progressState3 = "3";
progressState4 = "3";
-
+
text2Color = "#000000";
text3Color = "#000000";
text4Color = "#000000";
-
+
userRecordVO.setCouponMoneyState("宸插埌璐�");
userRecordVO.setCouponName("杩斿埄: 楼" + orderVO.getHongBao().setScale(2, BigDecimal.ROUND_DOWN));
-
+
jumpDetail = jumpDetailV2Service.getByTypeCache("capitalDetails");
-
+
rewardCouponRemark = configService.get("free_coupon_remark");
}
userRecordVO.setProgressState(progressState);
userRecordVO.setPayMoney(payMoney);
-
+
// 鏄剧ず鎻愮ず杈冨ぇ瀛�
ClientTextStyleVO progressMsgStyle = new ClientTextStyleVO();
- progressMsgStyle.setContent(progressMsg);
+ progressMsgStyle.setContent(progressMsg);
progressMsgStyle.setColor(progressColor);
userRecordVO.setProgressMsg(progressMsgStyle);
-
- /* --- 杩涘害鐐� ---- */
+
+ /* --- 杩涘害鐐� ---- */
Map<String, Object> map1 = new HashMap<String, Object>();
map1.put("state", progressState1);
-
+
Map<String, Object> map2 = new HashMap<String, Object>();
map2.put("state", progressState2);
ClientTextStyleVO style2 = new ClientTextStyleVO();
- style2.setContent(goodsState);
+ style2.setContent(goodsState);
style2.setColor(text2Color);
map2.put("text", style2);
-
+
Map<String, Object> map3 = new HashMap<String, Object>();
map3.put("state", progressState3);
ClientTextStyleVO style3 = new ClientTextStyleVO();
- style3.setContent("杩斿埄鍒拌处");
+ style3.setContent("杩斿埄鍒拌处");
style3.setColor(text3Color);
map3.put("text", style3);
-
+
Map<String, Object> map4 = new HashMap<String, Object>();
map4.put("state", progressState4);
ClientTextStyleVO style4 = new ClientTextStyleVO();
- style4.setContent("鍏嶅崟鎴愬姛");
+ style4.setContent("鍏嶅崟鎴愬姛");
style4.setColor(text4Color);
map4.put("text", style4);
-
+
// 鍦嗙偣棰滆壊
List<Object> progressList = new ArrayList<Object>();
progressList.add(map1);
@@ -750,7 +1015,7 @@
progressList.add(map3);
progressList.add(map4);
userRecordVO.setProgressList(progressList);
-
+
if (jumpDetail != null) {
Map<String, Object> jumpState = new HashMap<String, Object>();
jumpState.put("jumpDetail", jumpDetail);
@@ -762,8 +1027,304 @@
if (rewardCouponRemark != null && rewardCouponRemark.trim().length() > 0) {
userRecordVO.setRemark(JSONObject.fromObject(rewardCouponRemark));
}
-
+
return userRecordVO;
}
+ @Transactional
+ @Override
+ public void activatedWelfareFreeCoupon(Long uid) {
+ if (uid == null) {
+ return;
+ }
+ // 绂忓埄鍏嶅崟鍒�
+ String welfareFree = CouponTypeEnum.welfareFreeCoupon.name();
+
+ SystemCoupon systemCoupon = systemCouponService.getCouponByType(welfareFree);
+ if (systemCoupon == null) {
+ return;
+ }
+
+ // 寰呮椿绂忓埄鍏嶅崟鍒�
+ List<UserSystemCoupon> list = userSystemCouponMapper.getCouponByTypeAndNotActivated(uid, systemCoupon.getId());
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ for (UserSystemCoupon userSystemCoupon: list) {
+ // 婵�娲�
+ userSystemCoupon.setStateActivated(1);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ userOtherMsgNotificationService.welfareCouponGet(userSystemCoupon);
+ } catch(Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Transactional
+ @Override
+ public void updateStateByDrawback(String orderNo) throws Exception {
+
+ if (orderNo == null || orderNo.trim().length() == 0) {
+ return;
+ }
+
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, null);
+ if (record == null) {
+ return;
+ }
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+ record.setState(UserSystemCouponRecord.STATE_FAIL_DRAWBACK);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 鍒搁��鍥�
+ sendBackCoupon(record.getUserSystemCoupon(), record);
+ }
+
+ @Transactional
+ @Override
+ public void updateStateByArrivalAccount(String orderNo) throws Exception {
+
+ if (orderNo == null || orderNo.trim().length() == 0) {
+ return;
+ }
+
+ UserSystemCouponRecord record = userSystemCouponRecordService.getRecordByOrderNo(orderNo, 2);
+ if (record == null) {
+ return;
+ }
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+ record.setState(UserSystemCouponRecord.STATE_SUCCESS);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 娑堟伅鎺ㄩ��
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.welfareCouponUsed(record.getUserSystemCoupon(), orderNo);
+ } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.freeSheetCouponUsed(record.getUserSystemCoupon(), orderNo);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void updateCounponInvalid(Long uid) {
+ List<UserSystemCoupon> list = userSystemCouponMapper.getCounponNowInvalid(uid);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ for (UserSystemCoupon userSystemCoupon: list) {
+ // 鏇存柊鍒稿凡杩囨湡
+ userSystemCoupon.setState(UserSystemCoupon.STATE_OVERDUE);
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+ if (systemCoupon == null) {
+ continue;
+ }
+
+ SystemCoupon baseCoupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (baseCoupon == null || baseCoupon.getId() == null) {
+ continue;
+ }
+
+ // 娑堟伅鎺ㄩ��
+ try {
+ if (baseCoupon.getType() == CouponTypeEnum.welfareFreeCoupon) {
+ userOtherMsgNotificationService.welfareCouponAlreadyOutOfDate(userSystemCoupon);
+ } else if (baseCoupon.getType() == CouponTypeEnum.freeCoupon) {
+ userOtherMsgNotificationService.freeSheetCouponAlreadyOutOfDate(userSystemCoupon);
+ } else if (baseCoupon.getType() == CouponTypeEnum.rebatePercentCoupon) {
+ userOtherMsgNotificationService.rewardCouponAlreadyOutOfDate(userSystemCoupon);
+ }
+
+ } catch(Exception e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+
+ @Transactional
+ @Override
+ public void sendBackTimeOutCoupon(Long uid) {
+ // 瓒呰繃120绉� 鏈鍖归厤鐨勫埜
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getCouponByUsingTimeOut(uid, 120L);
+ if (list == null || list.size() == 0) {
+ return;
+ }
+
+ for (UserSystemCouponRecord couponRecord: list) {
+ // 鏇存柊鐘舵�侊細鍖归厤瓒呮椂
+ couponRecord.setState(UserSystemCouponRecord.STATE_WAIT_TIME_OUT);
+ couponRecord.setUpdateTime(new Date());
+ userSystemCouponRecordService.updateByPrimaryKeySelective(couponRecord);
+
+ UserSystemCoupon userSystemCoupon = couponRecord.getUserSystemCoupon();
+
+ int expiryDay = 15;
+
+ SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+ SystemCoupon coupon= systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (coupon != null) {
+ expiryDay = coupon.getExpiryDay();
+ }
+
+ // 缁撴潫鏃ユ湡
+ Date endTime = null;
+ try {
+ String endDay = DateUtil.plusDay(expiryDay, new Date());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ endTime = format.parse(endDay);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ // 鐘舵�佸垵濮嬪寲
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUseTime(null);
+
+ // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
+ userSystemCoupon.setStartTime(new Date());
+ userSystemCoupon.setEndTime(endTime);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+ }
+ }
+
+ @Transactional
+ @Override
+ public boolean updateCouponRecordUsed(Long uid, String orderNo, BigDecimal payment,
+ Long auctionId) throws Exception{
+
+ boolean isfree = false;
+
+ if (uid == null || payment == null || auctionId == null || orderNo == null ||
+ orderNo.trim().length() == 0 ) {
+ throw new Exception("浼犻�掑弬鏁颁笉鑳戒负绌�");
+ }
+
+ // 鏌ヨ绛夊緟鍖归厤鐨勫埜璁板綍
+ List<UserSystemCouponRecord> list = userSystemCouponRecordService.getRecordByState(uid, UserSystemCouponRecord.STATE_WAIT);
+ if (list == null || list.size() == 0) {
+ return isfree;
+ }
+
+ // 鍖归厤
+ boolean matching = false;
+ UserSystemCouponRecord record = null;
+
+ for (UserSystemCouponRecord userSystemCouponRecord : list) {
+ Long goodId = userSystemCouponRecord.getGoodId();
+ if (auctionId.equals(goodId)) {
+ matching = true; // 鍖归厤鎴愬姛
+ record = userSystemCouponRecord;
+ break;
+ }
+ }
+
+ // 鍟嗗搧鍖归厤鎴愬姛
+ if (matching) {
+
+ record.setOrderNo(orderNo);
+ record.setUpdateTime(new Date());
+
+ UserSystemCoupon userSystemCoupon = record.getUserSystemCoupon();
+
+ if (payment.compareTo(new BigDecimal(10)) > 0) {
+ // 鏇存柊璁板綍 -- 閲戦涓嶅尮閰� 澶�10鍏�
+ record.setState(UserSystemCouponRecord.STATE_FAIL_RULE);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 閫�鍥炲埜
+ sendBackCoupon(userSystemCoupon, record);
+
+ } else {
+ // 鍏嶅崟鍖归厤鎴愬姛
+ isfree = true;
+
+ //鏇存柊璁板綍--鍏嶅崟涓�
+ record.setState(UserSystemCouponRecord.STATE_FREE_ON);
+ userSystemCouponRecordService.updateByPrimaryKeySelective(record);
+
+ // 鍒哥粨鏉熶娇鐢�
+ userSystemCoupon.setState(UserSystemCoupon.STATE_END_USE);
+ userSystemCoupon.setUpdateTime(new Date());
+ userSystemCouponMapper.updateByPrimaryKeySelective(userSystemCoupon);
+
+ String couponType = record.getCouponType();
+ if (couponType == null || couponType.trim().length() == 0) {
+ throw new Exception("鍒哥被鍨嬫湭琚褰�");
+ }
+
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.welfareCouponUsing(userSystemCoupon,orderNo,payment);
+ } else if (CouponTypeEnum.freeCoupon.name().equals(couponType)) {
+ userOtherMsgNotificationService.freeSheetCouponUsing(userSystemCoupon, orderNo, payment);
+ }
+ }
+ }
+
+ return isfree;
+ }
+
+ /**
+ * 閫�鍥炲埜 鍒濆鏁版嵁
+ * @param userSystemCoupon
+ */
+ public void sendBackCoupon(UserSystemCoupon userSystemCoupon, UserSystemCouponRecord record) throws Exception{
+
+ int expiryDay = 15;
+
+ SystemCoupon systemCoupon = userSystemCoupon.getSystemCoupon();
+ SystemCoupon coupon = systemCouponService.selectByPrimaryKey(systemCoupon.getId());
+ if (coupon != null) {
+ expiryDay = coupon.getExpiryDay();
+ }
+
+ // 缁撴潫鏃ユ湡
+ Date endTime = null;
+ try {
+ String endDay = DateUtil.plusDay(expiryDay, new Date());
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ endTime = format.parse(endDay);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ // 鐘舵�佸垵濮嬪寲
+ userSystemCoupon.setState(UserSystemCoupon.STATE_CAN_USE);
+ userSystemCoupon.setUseTime(null);
+ // 鏈夋晥鏈熸椂闂撮噸鏂板畾涔�
+ userSystemCoupon.setStartTime(new Date());
+ userSystemCoupon.setEndTime(endTime);
+
+ userSystemCoupon.setUpdateTime(new Date());
+
+ userSystemCouponMapper.updateByPrimaryKey(userSystemCoupon);
+
+
+ if (CouponTypeEnum.welfareFreeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.welfareCouponDrawBack(userSystemCoupon, record.getOrderNo());
+ } else if (CouponTypeEnum.freeCoupon.name().equals(record.getCouponType())) {
+ userOtherMsgNotificationService.freeSheetCouponDrawBack(userSystemCoupon, record.getOrderNo());
+ }
+ }
+
+
+
}
--
Gitblit v1.8.0