From 2ff38cf4200a2235567e8ff6f5560a7026e1f1a6 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 23 四月 2020 14:08:56 +0800
Subject: [PATCH] 返利比例兼容
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 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..c56c1c9 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()) {
@@ -2038,13 +2043,12 @@
orderStateMap.put("fontColor", "#666666");
order.setOrderState(orderStateMap);
- String hongbaoInfo = "";
+
// 璁㈠崟鏍囪瘑
List<String> signList = new ArrayList<String>();
/* 璁㈠崟杩斿埄绫诲瀷 杞崲 */
if (HongBaoV2.TYPE_ZIGOU == hongBaoType || 2 == hongBaoType) {
// 鑷喘
- hongbaoInfo = "杩斿埄";
order.setOrderOrigin("1");
order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);
signList.add(CommonOrder.TYPE_FANLI);
@@ -2059,7 +2063,6 @@
}
} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
// 鍒嗕韩
- hongbaoInfo = "濂栭噾";
order.setOrderOrigin("2");
order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);
signList.add(CommonOrder.TYPE_SHARE);
@@ -2068,7 +2071,6 @@
|| HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType) {
// 閭�璇疯鍗�
- hongbaoInfo = "鏀剁泭";
order.setOrderOrigin("3");
order.setHongBaoTypePic(CommonOrder.TYPE_INVITE);
signList.add(CommonOrder.TYPE_INVITE);
@@ -2131,10 +2133,9 @@
stateMap.put("content", stateContent);
stateMap.put("fontColor", stateFontColor);
order.setAccountState(stateMap);
- hongbaoInfo = hongBaoState_Str + hongbaoInfo;
Map<String, String> hongBaoMap = new HashMap<String, String>();
- hongBaoMap.put("content", hongbaoInfo + " 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ hongBaoMap.put("content", hongBaoState_Str + "鏀剁泭 楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
hongBaoMap.put("fontColor", hongbaoInfoFontColor);
order.setHongBaoInfo(hongBaoMap);
@@ -2177,8 +2178,8 @@
if (UserSystemCouponRecord.STATE_FREE_ON == state) {
text = "鍏嶅崟涓�";
} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
- text = "鍏嶅崟鎴愬姛";
- }
+ text = "宸插厤鍗�";
+ }
}
break;
}
--
Gitblit v1.8.0