From 2b71bd05caf230bf9d35e0f000cea6d0413a774e Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期五, 01 十一月 2019 11:39:45 +0800
Subject: [PATCH] 邀请奖励红包
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 48aab31..3252620 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
@@ -275,11 +275,11 @@
}
boolean rewardOrder = false;
-
int type = 1; // 1 甯歌璺宠浆椤甸潰 2寮瑰嚭閫夐」锛堝鍔卞埜锛�
if (rewardSuccess) {
- // 濂栧姳鎴愬姛
- rewardOrder = true;
+ if (!VersionUtil.greaterThan_2_0_2(acceptData.getPlatform(), acceptData.getVersion())) {
+ rewardOrder = true; //濂栧姳鎴愬姛 2.0.2 娑堝け
+ }
} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
&& HongBaoV2.STATE_YILINGQU == hongBaoState) {
// 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
@@ -1573,4 +1573,23 @@
return commonOrderList.get(0);
}
+
+
+ @Override
+ public CommonOrderVO firstValidOrderByUid(Long uid) {
+ return commonOrderMapper.firstValidOrderByUid(uid, null, null);
+ }
+
+ @Override
+ public CommonOrderVO firstValidOrderByUidAndType(Long uid, Integer type) {
+ return commonOrderMapper.firstValidOrderByUid(uid, type, null);
+ }
+
+
+ @Override
+ public CommonOrderVO firstValidOrderTheMonthByUidAndType(Long uid, Integer type) {
+ return commonOrderMapper.firstValidOrderByUid(uid, type, 3);
+ }
+
+
}
--
Gitblit v1.8.0