From 498db5b387d50dc76be41498200fa06d4e1def95 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 17 四月 2020 14:02:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 19 ++++++++++++-------
1 files changed, 12 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 0ddf015..f17f18d 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
@@ -595,16 +595,16 @@
if (HongBaoV2.TYPE_ZIGOU == hongBaoType) {
// 濂栧姳璁㈠崟銆佸厤鍗� 浣跨敤璁板綍
if (sourceType == null) {
- couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData);
+ couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, null, uid, vip, acceptData, hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordTB, uid, vip,
- acceptData);
+ acceptData, hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordJD, uid, vip,
- acceptData);
+ acceptData, hongBao);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
couponFactory(order, hasRewardCoupon, hongBaoState, hongBaoType, listRecordPDD, uid, vip,
- acceptData);
+ acceptData, hongBao);
}
}
@@ -627,7 +627,7 @@
* @param signList
*/
private void couponFactory(CommonOrderVO order, boolean hasRewardCoupon, Integer hongBaoState, Integer hongBaoType,
- List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData) throws Exception {
+ List<UserSystemCouponRecord> list, Long uid, boolean vip, AcceptData acceptData, BigDecimal hongBao) throws Exception {
// 鏄惁鍏嶅崟鍟嗗搧
boolean freeOrder = false;
@@ -725,6 +725,11 @@
order.setRewardDetail(rewardMap);
}
+ // 浣跨敤濂栧姳鍒� 閲戦棰濋檺鍒�
+ if (hongBao.compareTo(Constant.REWARD_COUPON_LIMIT_MONEY) > 0){
+ return;
+ }
+
// 鏄惁鍙娇鐢ㄥ鍔卞埜
if (!rewardSuccess && !freeOrder && HongBaoV2.TYPE_ZIGOU == hongBaoType
&& HongBaoV2.STATE_YILINGQU == hongBaoState && !vip && CommonOrder.STATE_WQ != order.getState()) {
@@ -2177,8 +2182,8 @@
if (UserSystemCouponRecord.STATE_FREE_ON == state) {
text = "鍏嶅崟涓�";
} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
- text = "鍏嶅崟鎴愬姛";
- }
+ text = "宸插厤鍗�";
+ }
}
break;
}
--
Gitblit v1.8.0