From 744594ef1a2f530fc3e86ea9dc48b62247f79420 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 19 五月 2020 17:13:23 +0800
Subject: [PATCH] 饿了么绘图，添加口碑
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 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 cca39aa..3241e0f 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
@@ -604,9 +604,8 @@
}
}
- // 鍒嗕韩銆侀個璇� 闅愯棌璁㈠崟鍙�
- if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_YAOQING == hongBaoType
- || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
+ // 閭�璇� 闅愯棌璁㈠崟鍙�
+ if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType || HongBaoV2.TYPE_ERJI == hongBaoType
|| HongBaoV2.TYPE_SHARE_YIJI == hongBaoType || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {
order.setOrderNo(UserUtil.filterOrderId(order.getOrderNo()));
}
@@ -1863,13 +1862,14 @@
List<String> listPDD = new ArrayList<String>();
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_YIJI
|| 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);
+ UserLevelEnum levelEnum = UserLevelUtil.getByOrderRank(urank);
+ if (levelEnum != null) {
+ levelEnum = UserLevelUtil.getShowLevel(levelEnum);
+ order.setOrderDesc("璁㈠崟鏉ユ簮锛�" + levelEnum.getName());
}
}
}
@@ -2033,6 +2033,14 @@
List<TaoBaoWeiQuanOrder> listWQ = taoBaoWeiQuanOrderMapper
.selectListByOrderIdAndState(order.getOrderNo(), "缁存潈鎴愬姛");
BigDecimal weiQuanMoney = getWeiQuanMoney(listWQ, sourceType, uid);
+
+ if (settleTime != null) {
+ orderStateContent = "鍞悗鎴愬姛";
+ WeiQuanInfo weiQuanInfo = new WeiQuanInfo();
+ weiQuanInfo.setOldHongBao("楼" + hongBao.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ weiQuanInfo.setWqHongBao("鍞悗锛�-楼" + weiQuanMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ order.setWeiQuanInfo(weiQuanInfo);
+ }
hongBao = MoneyBigDecimalUtil.sub(hongBao, weiQuanMoney);
}
}
@@ -2176,4 +2184,21 @@
order.setRewardDetail(rewardMap);
}
}
+
+
+ @Override
+ public long countOrderByUidAndSettled(Long uid, BigDecimal payment) {
+ Long count = commonOrderMapper.countOrderByUidAndSettled(uid, payment);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
+ @Override
+ public String getNewestOrderNoByTaoBao() {
+ return commonOrderMapper.getNewestOrderNoByTaoBao();
+ }
+
}
--
Gitblit v1.8.0