From 8b2191df2f7d94aa299bd43dcbe97c94e5a61bbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 十一月 2019 14:53:34 +0800
Subject: [PATCH] RocketMQ的消息整改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
index 5c970e5..c2ab5e5 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java
@@ -277,7 +277,7 @@
boolean rewardOrder = false;
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
if (rewardSuccess) {
- if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (!VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
rewardOrder = true; //濂栧姳鎴愬姛 2.0.2 娑堝け
}
} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
@@ -294,8 +294,8 @@
String unit = null;
boolean canUse = false;
- // 鐗堟湰鍖哄垎锛�2.0.2
- if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ // 鐗堟湰鍖哄垎锛�2.1
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
Date thirdCreateTime = order.getThirdCreateTime();
if (thirdCreateTime != null) {
long downOrderTime = thirdCreateTime.getTime();
@@ -344,7 +344,7 @@
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
if (!newEdition) {
- if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
rewardStyleVO.setContent("浣跨敤濂栧姳鍒� >");
} else {
rewardStyleVO.setContent("杩斿埄濂栧姳 >");
@@ -658,7 +658,7 @@
signList.add(CommonOrder.TYPE_INVITE);
// 鐗堟湰鍖哄垎锛�2-0-2
- if (VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
InviteOrderSubsidy orderSubsidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, order.getOrderNo(), sourceType);
if (orderSubsidy != null) {
ClientTextStyleVO subsidyInfo = new ClientTextStyleVO();
@@ -1061,8 +1061,8 @@
commonOrder.getTradeId(), new Date(), commonOrder.getSourceType()));
return new CommonOrderAddResultDTO(commonOrder, CommonOrderAddResultDTO.TYPE_ADD);
} else {// 淇敼
- // 宸茬粡缁撶畻锛屽凡缁忓け鏁堬紝鐘舵�佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
- if (oldCommonOrder.getState() == CommonOrder.STATE_JS || oldCommonOrder.getState() == CommonOrder.STATE_SX
+ // 闈炰含涓滃凡缁忕粨绠楋紝宸茬粡澶辨晥锛岀姸鎬佹湭鏀瑰彉鐨勮鍗曚笉澶勭悊
+ if ((oldCommonOrder.getState() == CommonOrder.STATE_JS&&oldCommonOrder.getSourceType()!=Constant.SOURCE_TYPE_JD) || oldCommonOrder.getState() == CommonOrder.STATE_SX
|| oldCommonOrder.getState() == CommonOrder.STATE_WQ
|| (oldCommonOrder.getState().intValue() == commonOrder.getState())) {
return new CommonOrderAddResultDTO(oldCommonOrder, CommonOrderAddResultDTO.TYPE_NOUPDATE);
@@ -1605,4 +1605,10 @@
public BigDecimal getTotalRewardMoneyByOrderNoAndSourceType(String orderNo, Integer sourceType) {
return commonOrderMapper.getTotalRewardMoneyByOrderNoAndSourceType(orderNo, sourceType);
}
+
+
+ @Override
+ public long count24HValidOrderByUid(Long uid, Date minTime) {
+ return commonOrderMapper.count24HValidOrderByUid(uid, minTime);
+ }
}
--
Gitblit v1.8.0