From 184d1341ae248cf02a8225ca7bfbba463e18496e Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期一, 13 四月 2020 17:47:40 +0800
Subject: [PATCH] 消息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 49 ++++++++++++++-----------------------------------
1 files changed, 14 insertions(+), 35 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 75b0088..b5801de 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
@@ -2041,11 +2041,11 @@
// 鏄惁宸蹭娇鐢ㄥ鍔卞埜銆佸厤鍗曞埜鎯呭喌
if (sourceType == Constant.SOURCE_TYPE_TAOBAO) {
- couponUseFactory(order, signList, listRecordTB);
+ couponUseFactory(order, listRecordTB);
} else if (sourceType == Constant.SOURCE_TYPE_JD) {
- couponUseFactory(order, signList, listRecordJD);
+ couponUseFactory(order, listRecordJD);
} else if (sourceType == Constant.SOURCE_TYPE_PDD) {
- couponUseFactory(order, signList, listRecordPDD);
+ couponUseFactory(order, listRecordPDD);
}
} else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {
// 鍒嗕韩
@@ -2124,18 +2124,14 @@
* 璁㈠崟锛� 鍏嶅崟鏍囪瘑 濂栧姳鏍囪瘑
*
* @param order
- * @param hasRewardCoupon
- * @param hongBaoState
* @param list
- * @param signList
*/
- private void couponUseFactory(CommonOrderVO order,List<String> signList, List<UserSystemCouponRecord> list) throws Exception {
+ private void couponUseFactory(CommonOrderVO order, List<UserSystemCouponRecord> list) throws Exception {
if (list == null || list.size() == 0) {
return;
}
- // 鏄惁鍏嶅崟鍟嗗搧
- boolean freeOrder = false;
+ String text = null;
for (UserSystemCouponRecord couponRecord : list) {
int goodSource = couponRecord.getGoodSource();
if (goodSource == 0)
@@ -2145,47 +2141,30 @@
if (order.getOrderNo().equals(orderNo) && goodSource == order.getSourceType()) {
Integer state = couponRecord.getState();
String systemCouponType = couponRecord.getCouponType();
- if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
+ if (CouponTypeEnum.rebatePercentCoupon.name().equals(systemCouponType)
+ && UserSystemCouponRecord.STATE_SUCCESS == state) {
+ text = "宸插鍔�";
+ } else if (CouponTypeEnum.freeCoupon.name().equals(systemCouponType)
|| CouponTypeEnum.welfareFreeCoupon.name().equals(systemCouponType)
|| CouponTypeEnum.freeCouponBuy.name().equals(systemCouponType)) {
if (UserSystemCouponRecord.STATE_FREE_ON == state) {
- // 鍏嶅崟涓�
- freeOrder = true;
- signList.add(PIC_FREE_ON);
+ text = "鍏嶅崟涓�";
} else if (UserSystemCouponRecord.STATE_SUCCESS == state) {
- // 鍏嶅崟鎴愬姛
- freeOrder = true;
- signList.add(PIC_FREE_SUCCEED);
- } else if (UserSystemCouponRecord.STATE_FAIL_RULE == state
- || UserSystemCouponRecord.STATE_FAIL_DRAWBACK == state) {
- // 瑙勫垯涓嶅尮閰嶃�侀��娆�
- freeOrder = true;
- signList.add(PIC_FREE_FAIL);
- }
+ text = "鍏嶅崟鎴愬姛";
+ }
}
break;
}
}
- // 鍏嶅崟璇︽儏
- if (freeOrder) {
+ if (!StringUtil.isNullOrEmpty(text)) {
ClientTextStyleVO rewardStyleVO = new ClientTextStyleVO();
- rewardStyleVO.setContent("鍏嶅崟璇︽儏 >");
+ rewardStyleVO.setContent(text);
rewardStyleVO.setColor("#E5005C");
rewardStyleVO.setBottomColor("#FFDCEA");
- Map<String, Object> jumpLink = new HashMap<String, Object>();
- jumpLink.put("orderNo", order.getOrderNo());
- jumpLink.put("goodsType", order.getSourceType() + "");
-
- Map<String, Object> jump = new HashMap<String, Object>();
- jump.put("type", 1); // 椤甸潰璺宠浆
- jump.put("params", jumpLink);
- jump.put("jumpDetail", jumpDetailV2Service.getByTypeCache("freeCouponDetail"));
-
Map<String, Object> rewardMap = new HashMap<String, Object>();
rewardMap.put("text", rewardStyleVO);
- rewardMap.put("jump", jump);
order.setRewardDetail(rewardMap);
}
}
--
Gitblit v1.8.0