From 84b968d16a1f58dcd46aaa39d9593ef86189df04 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 21 五月 2020 12:13:47 +0800
Subject: [PATCH] 添加活动名称
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/CommonOrderServiceImpl.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 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 f237f58..10ae403 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
@@ -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);
}
}
@@ -2193,4 +2201,10 @@
return commonOrderMapper.getNewestOrderNoByTaoBao();
}
+
+ @Override
+ public List<CommonOrder> listByOrderNo(String orderNo) {
+ return commonOrderMapper.listByOrderNo(orderNo);
+ }
+
}
--
Gitblit v1.8.0