From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
index 08583b6..6df8c80 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserShareGoodsRecordServiceImpl.java
@@ -489,7 +489,7 @@
}
@Override
- public JSONObject getGoodsGroup(Long recordId) throws UserShareGoodsRecordException {
+ public JSONObject getGoodsGroup(Long recordId, SystemEnum system) throws UserShareGoodsRecordException {
JSONArray array = new JSONArray();
@@ -520,7 +520,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
- java.lang.System.currentTimeMillis());
+ java.lang.System.currentTimeMillis(),system);
for (UserShareGoodsGroup goodsGroup : list) {
CommonGoods commonGoods = goodsGroup.getCommonGoods();
@@ -573,7 +573,7 @@
}
@Override
- public JSONObject getGoodsGroupDetail(Long recordId) throws UserShareGoodsRecordException {
+ public JSONObject getGoodsGroupDetail(Long recordId, SystemEnum system) throws UserShareGoodsRecordException {
JSONArray array = new JSONArray();
@@ -606,7 +606,7 @@
.excludeFieldsWithoutExposeAnnotation().setDateFormat("yyyy-MM-dd").create();
BigDecimal shareRate = hongBaoManageService.getShareRate(UserLevelEnum.daRen,
- java.lang.System.currentTimeMillis());
+ java.lang.System.currentTimeMillis(),system);
for (UserShareGoodsGroup goodsGroup : list) {
CommonGoods commonGoods = goodsGroup.getCommonGoods();
--
Gitblit v1.8.0