From 2442c923fd35ef864be1cfe07e039eebfaf24ffc Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 03 十二月 2019 11:48:21 +0800
Subject: [PATCH] 新人红包功能
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 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 d6bfb98..de483b3 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
@@ -215,7 +215,7 @@
*/
public void setSystemCouponRecord(CommonOrderVO order, boolean hasRewardCoupon, boolean exchangeCoupon,
Integer hongBaoState, Integer hongBaoType, List<UserSystemCouponRecord> list, List<String> signList,
- AcceptData acceptData) {
+ Long uid, AcceptData acceptData) {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -284,10 +284,11 @@
rewardOrder = true; // 濂栧姳鎴愬姛 2.0.2 娑堝け
}
} else if (hasRewardCoupon && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
- && HongBaoV2.STATE_YILINGQU == hongBaoState) {
- // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
- type = 2;
- rewardOrder = true;
+ && HongBaoV2.STATE_YILINGQU == hongBaoState) { // 鏈夊彲鐢ㄧ殑濂栧姳鍒� 銆侀潪鍏嶅崟璁㈠崟 銆佷笖宸插埌璐︾殑 銆佽繑鍒╄鍗�
+ if (!userVIPInfoService.isVIP(uid)) { // 闈炰細鍛樺彲浣跨敤濂栧姳鍒�
+ type = 2;
+ rewardOrder = true;
+ }
}
if (rewardOrder) {
@@ -772,16 +773,16 @@
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType, null,
- signList, acceptData);
+ signList, uid, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordTB, signList, acceptData);
+ listRecordTB, signList, uid, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordJD, signList, acceptData);
+ listRecordJD, signList, uid, acceptData);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
setSystemCouponRecord(order, hasRewardCoupon, exchangeCoupon, hongBaoState, hongBaoType,
- listRecordPDD, signList, acceptData);
+ listRecordPDD, signList, uid, acceptData);
}
}
--
Gitblit v1.8.0