From fd1dce3121a7773419263c495f92e160cc1e7124 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 24 三月 2020 11:36:36 +0800
Subject: [PATCH] 2.1 +后台编辑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 136 ++++++++++-----------------------------------
1 files changed, 31 insertions(+), 105 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 319b318..dad4451 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
@@ -273,38 +273,21 @@
}
Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- for (CommonOrderVO order : listOrder) {
-
- if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
- Integer urank = order.getUrank();
- if (urank != null) {
- String levelName = UserLevelUtil.getLevelName(urank);
- if (!StringUtil.isNullOrEmpty(levelName)) {
- order.setOrderDesc(levelName);
- }
- }
- }
- }
- } else {
- // 璁剧疆鏄惁涓簐ip璁㈠崟
- for (CommonOrderVO order : listOrder) {
- if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
- if (vipUserMap.get(Long.parseLong(order.getUserId())) != null
- && vipUserMap.get(Long.parseLong(order.getUserId())) == true)
- order.setVipOrder(true);
- else
- order.setVipOrder(false);
- } else
+ // 璁剧疆鏄惁涓簐ip璁㈠崟
+ for (CommonOrderVO order : listOrder) {
+ if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
+ || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
+ || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
+ if (vipUserMap.get(Long.parseLong(order.getUserId())) != null
+ && vipUserMap.get(Long.parseLong(order.getUserId())) == true)
+ order.setVipOrder(true);
+ else
order.setVipOrder(false);
+ } else
+ order.setVipOrder(false);
- if (order.isVipOrder())
- order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
- }
+ if (order.isVipOrder())
+ order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
SimpleDateFormat format = new SimpleDateFormat("yyyy.MM.dd HH:mm");
@@ -316,15 +299,12 @@
boolean vip = userVIPInfoService.isVIP(uid);
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
- long nowTime = java.lang.System.currentTimeMillis();
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
Integer hongBaoType = order.getHongBaoType();
- BigDecimal totalPay = new BigDecimal(0);
- BigDecimal totalActual = new BigDecimal(0);
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
CommonOrderGoods goods = commonOrder.getCommonOrderGoods();
@@ -354,16 +334,6 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- totalPay = MoneyBigDecimalUtil.add(totalPay, totalSettlement);
-
- // 鍟嗗搧浠锋牸
- BigDecimal actualPrice = commonGoodsVO.getActualPrice();
- if (actualPrice != null) {
- Integer totalCount = commonOrder.getTotalCount();
- totalActual = MoneyBigDecimalUtil.add(totalActual,
- MoneyBigDecimalUtil.mul(new BigDecimal(totalCount), actualPrice));
- }
-
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
|| HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
@@ -395,16 +365,6 @@
order.setDownTime("涓嬪崟鏃堕棿锛�" + format.format(thirdCreateTime));
order.setObtainTime(thirdCreateTime.getTime());
- // 2.1鍒嗕韩璁㈠崟鍜岃繑鍒╄鍗曞疄浠橀噾棰濆ぇ浜庢垨鑰呭皬浜庡埜鍚庝环鐨勬椂鍊欙紝璁㈠崟椤甸潰 鍙樉绀�3澶� 涓嬪崟鏃堕棿寮�濮�
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (HongBaoV2.TYPE_SHARE_YIJI == hongBaoType
- && DateUtil.plusDayDate(3, thirdCreateTime).getTime() > nowTime
- && totalPay.compareTo(totalActual) != 0) {
- order.setFanliDesc("鐢卞疄浠橀噾棰�*杩斿埄姣旇绠楄�屾潵");
- order.setFanliDescLink(configService.get(ConfigKeyEnum.shareOrderRebateDescLink.getKey()));
- }
- }
-
Date settleTime = order.getSettleTime();
if (settleTime != null) {
order.setReceiveTime("鏀惰揣鏃堕棿锛�" + format.format(settleTime));
@@ -1788,39 +1748,18 @@
|| order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI)
needSelectVIPUidList.add(Long.parseLong(order.getUserId()));
}
- Map<Long, Boolean> vipUserMap = userVIPInfoService.listByUids(needSelectVIPUidList);
- if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- for (CommonOrderVO order : listOrder) {
- if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
- Integer urank = order.getUrank();
- if (urank != null) {
- String levelName = UserLevelUtil.getLevelName(urank);
- if (!StringUtil.isNullOrEmpty(levelName)) {
- order.setOrderDesc(levelName);
- }
+ for (CommonOrderVO order : listOrder) {
+ if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
+ || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
+ || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
+ Integer urank = order.getUrank();
+ if (urank != null) {
+ String levelName = UserLevelUtil.getLevelName(urank);
+ if (!StringUtil.isNullOrEmpty(levelName)) {
+ order.setOrderDesc("璁㈠崟鏉ユ簮锛�" + levelName);
}
}
-
- }
- } else {
- // 璁剧疆鏄惁涓簐ip璁㈠崟
- for (CommonOrderVO order : listOrder) {
- if (order.getHongBaoType() == HongBaoV2.TYPE_YIJI || order.getHongBaoType() == HongBaoV2.TYPE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI
- || order.getHongBaoType() == HongBaoV2.TYPE_SHARE_ERJI) {
- if (vipUserMap.get(Long.parseLong(order.getUserId())) != null
- && vipUserMap.get(Long.parseLong(order.getUserId())) == true)
- order.setVipOrder(true);
- else
- order.setVipOrder(false);
- } else
- order.setVipOrder(false);
-
- if (order.isVipOrder())
- order.setVipOrderDesc("璁㈠崟鏉ユ簮锛氱敱瓒呯骇浼氬憳鐨勭矇涓濅骇鐢�");
}
}
@@ -1835,15 +1774,10 @@
// 鏄惁瀛樺湪濂栧姳鍒�
boolean hasRewardCoupon = userSystemCouponService.getValidRebateCoupon(uid);
- long nowTime = java.lang.System.currentTimeMillis();
for (CommonOrderVO order : listOrder) {
String orderNo = order.getOrderNo();
Integer sourceType = order.getSourceType();
Integer hongBaoType = order.getHongBaoType();
-
-
- BigDecimal totalPay = new BigDecimal(0);
- BigDecimal totalActual = new BigDecimal(0);
// 鍟嗗搧淇℃伅缁勫悎
for (CommonOrderVO commonOrder : listGoods) {
@@ -1874,17 +1808,6 @@
}
commonGoodsVO.setActualPay("浠樻閲戦锛毬�" + totalSettlement);
- totalPay = MoneyBigDecimalUtil.add(totalPay, totalSettlement);
-
-
- // 鍟嗗搧浠锋牸
- BigDecimal actualPrice = commonGoodsVO.getActualPrice();
- if (actualPrice != null) {
- Integer totalCount = commonOrder.getTotalCount();
- totalActual = MoneyBigDecimalUtil.add(totalActual,
- MoneyBigDecimalUtil.mul(new BigDecimal(totalCount), actualPrice));
- }
-
// 閭�璇疯鍗曚俊鎭繚鎶�
if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType
@@ -1908,6 +1831,11 @@
order.setOrderType(2);
}
}
+
+ Integer goodsType = commonGoodsVO.getGoodsType();
+ if (goodsType != null & goodsType == 6) {
+ order.setOrderType(5); // 楗夸簡涔堣鍗�
+ }
order.getListOrderGoods().add(commonGoodsVO);
}
@@ -1919,13 +1847,11 @@
order.setObtainTime(thirdCreateTime.getTime());
}
- // 2.1鍒嗕韩璁㈠崟鍜岃繑鍒╄鍗曞疄浠橀噾棰濆ぇ浜庢垨鑰呭皬浜庡埜鍚庝环鐨勬椂鍊欙紝璁㈠崟椤甸潰 鍙樉绀�3澶� 涓嬪崟鏃堕棿寮�濮�
+ // 2.1鏄剧ず杩斿埄璇存槑杩炴帴>
if (VersionUtil.greaterThan_2_1(acceptData.getPlatform(), acceptData.getVersion())) {
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType
- && DateUtil.plusDayDate(3, thirdCreateTime).getTime() > nowTime
- && totalPay.compareTo(totalActual) != 0) {
- order.setFanliDesc("鐢卞疄浠橀噾棰�*杩斿埄姣旇绠楄�屾潵");
- order.setFanliDescLink(configService.get(ConfigKeyEnum.shareOrderRebateDescLink.getKey()));
+ if (thirdCreateTime.getTime() > TimeUtil.convertDateToTemp(Constant.ORDER_SHOW_BRACE_TIME)) {
+ String rebateLink = configService.get(ConfigKeyEnum.orderRebateDescLink.getKey());
+ order.setRebateLink(rebateLink + "?orderNo=" + orderNo +"&sourceType=" + sourceType);
}
}
--
Gitblit v1.8.0