From 8b3371befea773bda4e08b19189c25c32ea6818f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 11 十二月 2019 16:18:09 +0800
Subject: [PATCH] 订单维权修改，通用模板修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserSystemCouponServiceImpl.java | 80 ++++++++++++++++++++++------------------
1 files changed, 44 insertions(+), 36 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 996f96f..2e388ee 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
@@ -78,6 +78,7 @@
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.TokenUtil;
import com.yeshi.fanli.util.VersionUtil;
import com.yeshi.fanli.util.annotation.RequestSerializableByKeyService;
@@ -176,15 +177,12 @@
@Resource
private UserSystemCouponActivateService userSystemCouponActivateService;
-
+
@Resource(name = "producer")
private Producer producer;
- @Lazy
@Resource
private UserVIPInfoService userVIPInfoService;
-
-
@Override
public int insertSelective(UserSystemCoupon record) {
@@ -301,8 +299,8 @@
userCoupon.setCreateTime(new Date());
userCoupon.setUpdateTime(new Date());
userSystemCouponMapper.insertSelective(userCoupon);
-
- if(coupon.getType() == CouponTypeEnum.freeCoupon) {
+
+ if (coupon.getType() == CouponTypeEnum.freeCoupon) {
userSystemCouponActivateService.addActivateRecord(userCoupon.getId());
}
@@ -855,19 +853,34 @@
if (orderNo == null || orderNo.trim().length() == 0)
throw new UserSystemCouponException(1, "璁㈠崟鍙蜂笉瀛樺湪");
+ // 妫�鏌ヨ鍗曞彿鏄惁缁存潈
+ List<CommonOrder> commonOrderList = commonOrderService.listBySourceTypeAndOrderId(sourceType, orderNo);
+ boolean weiquan = false;
+ if (commonOrderList != null) {
+ for (CommonOrder commonOrder : commonOrderList) {
+ if (commonOrder.getState() == CommonOrder.STATE_WQ) {
+ weiquan = true;
+ break;
+ }
+ }
+ }
+
+ if (weiquan) {
+ throw new UserSystemCouponException(1, "浜诧紝寰堥仐鎲撅紝鍞悗缁存潈璁㈠崟涓嶈兘浣跨敤杩斿埄濂栧姳鍒竳");
+ }
+
// 璁㈠崟
CommonOrderVO orderVO = commonOrderService.getCommonOrderByOrderNo(uid, orderNo, CommonOrder.STATE_JS,
sourceType);
if (orderVO == null)
throw new UserSystemCouponException(1, "璁㈠崟淇℃伅鑾峰彇澶辫触");
- // 鐗堟湰鍖哄垎锛�2.0.2
+ // 鐗堟湰鍖哄垎锛�2.1
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
Date thirdCreateTime = orderVO.getThirdCreateTime();
if (thirdCreateTime != null) {
long downOrderTime = thirdCreateTime.getTime();
- long limitDate = Long.parseLong("1573315200000"); // TODO
- // 鏃ユ湡寰呯‘瀹�2019-11-10
+ long limitDate = TimeUtil.parse(Constant.COUPON_REWARD_TIME).getTime();
if (downOrderTime > limitDate) {
Date endDay = DateUtil.plusDayDate(4, thirdCreateTime);
long currentTime = java.lang.System.currentTimeMillis();
@@ -884,12 +897,12 @@
if (!valid && dateInfo.getMinute() > 0)
valid = true;
- if (!valid && dateInfo.getSecond() >= 0)
+ if (!valid && dateInfo.getSecond() > 0)
valid = true;
}
if (!valid)
- throw new UserSystemCouponException(1, "璇ヨ鍗曞凡涓嶈兘浣跨敤浣跨敤濂栧姳鍒革紝璇︽儏璇峰挩璇㈠鏈�");
+ throw new UserSystemCouponException(1, "璇ヨ鍗曞凡瓒呰繃鏈夋晥浣跨敤濂栧姳鍒告椂闂�");
}
}
}
@@ -918,8 +931,7 @@
UserSystemCouponUseMQMsg mqMsg = new UserSystemCouponUseMQMsg(userSystemCoupon.getId(), order.getOrderId(),
sourceType, systemCoupon.getType().name());
// 浜嬪姟娑堟伅
- Message msg =MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon,
- mqMsg);
+ Message msg = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.useSystemCoupon, mqMsg);
try {
SendResult result = orderTransactionProducer.send(msg, new LocalTransactionExecuter() {
@Override
@@ -1905,7 +1917,7 @@
userCouponVO.setState(UserSystemCoupon.STATE_GIVE_ONLY);
} else {// 鍙娇鐢� 鍙禒閫�
userCouponVO.setState(UserSystemCoupon.STATE_USE_GIVE);
-
+
jumpLink.put("state", "2"); // 宸叉敹璐�
jumpLink.put("showNav", false); // 涓嶆樉绀轰笂鏂圭粺璁′俊鎭�
jumpLink.put("type", "1"); // 杩斿埄璁㈠崟
@@ -2105,18 +2117,17 @@
tips = tips.replace("{鍙ｄ护}", token).replace("{涓嬭浇閾炬帴}", configService.get("app_down_link"));
UserSystemCouponVO couponVO = createUserCouponVOo(userSystemCoupon, systemCoupon, giveRecord, tips);
-
+
UserSystemCouponUseMQMsg msg = new UserSystemCouponUseMQMsg();
msg.setUserSystemCouponId(id);
msg.setCouponType(type.name());
- Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback,
- msg);
+ Message message = MQMsgBodyFactory.create(MQTopicName.TOPIC_USER, UserTopicTagEnum.systemCouponDrawback, msg);
try {
producer.send(message);
} catch (Exception e) {
throw new UserSystemCouponException(1, "鍒涘缓璧犻�佷俊鎭け璐�");
}
-
+
return couponVO;
}
@@ -2302,38 +2313,36 @@
sendBackGiveCoupon(list);
}
-
@Override
@RequestSerializableByKeyService(key = "#id")
@Transactional(rollbackFor = Exception.class)
public void sendBackByGiveId(Long couponId) {
if (couponId == null)
return;
-
+
UserSystemCoupon userCoupon = userSystemCouponMapper.selectByPrimaryKey(couponId);
if (userCoupon == null)
return;
-
+
Integer state = userCoupon.getState();
if (state != UserSystemCoupon.STATE_IN_USE)
return;
-
+
UserSystemCouponGiveRecord giveRecord = userSystemCouponGiveRecordService.getByCouponId(couponId);
if (giveRecord == null)
return;
-
- if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+
+ if (giveRecord.getState() != null && giveRecord.getState() != UserSystemCouponGiveRecord.STATE_INIT)
return;
-
+
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
updateRecord.setId(giveRecord.getId());
updateRecord.setState(UserSystemCouponGiveRecord.STATE_OVERDUE);
userSystemCouponGiveRecordService.updateByPrimaryKeySelective(updateRecord);
-
+
// 鍙ｄ护澶辨晥
tokenRecordService.invalidByCoupon(giveRecord.getId());
-
Date now = new Date();
Date endTime = userCoupon.getEndTime();
@@ -2388,14 +2397,13 @@
msgOther.setReturnTime(sd.format(new Date()));
userOtherMsgNotificationService.tokenGiveMsg(giveRecord.getGiveUid(), beiZhu, msgOther);
}
-
-
+
@Override
public void sendBackGiveCoupon(List<UserSystemCouponGiveRecord> overdueList) {
for (UserSystemCouponGiveRecord record : overdueList) {
- if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
+ if (record.getState() != null && record.getState() != UserSystemCouponGiveRecord.STATE_INIT)
continue;
-
+
// 鏇存柊璧犻�佽褰�
UserSystemCouponGiveRecord updateRecord = new UserSystemCouponGiveRecord();
updateRecord.setId(record.getId());
@@ -2566,9 +2574,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void triggerFreeCouponActivate(Long uid, String orderNo, Integer source) {
- if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
+ if (uid == null || source == null || StringUtil.isNullOrEmpty(orderNo))
return;
-
+
UserSystemCoupon coupon = userSystemCouponMapper.getNeedActivateCouponByType(uid,
CouponTypeEnum.freeCoupon.name());
if (coupon == null)
@@ -2578,14 +2586,14 @@
UserSystemCouponActivate couponActivate = userSystemCouponActivateService.selectForUpdate(id);
if (couponActivate == null)
return;
-
+
// 楠岃瘉鍚岃鍗曟槸鍚﹀瓨鍦�
String key = orderNo + "_" + source;
String ordernos = couponActivate.getOrdernos();
if (!StringUtil.isNullOrEmpty(ordernos)) {
String[] array = ordernos.split(",");
if (array != null)
- for (int i= 0; i < array.length; i ++) {
+ for (int i = 0; i < array.length; i++) {
if (array[i].equals(key))
return;
}
@@ -2608,7 +2616,7 @@
} else {
ordernos = ordernos + "," + key;
}
-
+
UserSystemCouponActivate updateActivate = new UserSystemCouponActivate();
updateActivate.setId(id);
updateActivate.setState(state);
--
Gitblit v1.8.0