From 91ddd96c12ec25aaf6d0cb38d54288d863ab2b58 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 10 七月 2021 18:10:38 +0800
Subject: [PATCH] 礼金红包兼容
---
fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java b/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java
index ed51c07..5e1f182 100644
--- a/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/lijin/manager/GoodsLijinMnager.java
@@ -174,16 +174,16 @@
}
- public BigDecimal getTBLijin(Long uid, TaoBaoGoodsBrief goodsBrief) {
+ public MoneyInfo getTBLijinAndFanli(Long uid, TaoBaoGoodsBrief goodsBrief) {
List<MoneyInfo> moneyInfo = lijinCreateService.getMoneyInfo(getUid(uid), Arrays.asList(new TaoBaoGoodsBrief[]{goodsBrief}));
- return moneyInfo.get(0).getLijinAmount();
+ return moneyInfo.get(0);
}
private List<GoodsDetailVOWithKey> loadTBMoneyInfo(SystemEnum system, Long uid, List<TaoBaoGoodsBrief> goodsBriefList, List<String> goodsKeyList, GoodsMoneyConfigParamsDTO paramsDTO) {
Map<String, MoneyInfo> lijinMap = null;
boolean hasCreateTime = false;
- if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub)) {
+ if (SystemInfoUtil.hasFunctions(system, SystemFunction.lijinSub) && goodsBriefList.size() > 0) {
loadMaterialLibsType(goodsBriefList);
lijinMap = getTBLijinList(uid, goodsBriefList);
hasCreateTime = true;
@@ -442,6 +442,17 @@
}
/**
+ * 鑾峰彇浠婃棩鍓╀綑鏁伴噺
+ *
+ * @param uid
+ * @param registDate
+ * @return
+ */
+ public int getTodayLeftCount(Long uid, Date registDate) {
+ return lijinCreateService.getTodayLeftCount(getUid(uid), registDate);
+ }
+
+ /**
* 灏佽绀奸噾淇℃伅
*
* @param money
--
Gitblit v1.8.0