From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 35 +++++++----------------------------
1 files changed, 7 insertions(+), 28 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
index 6033dc6..d687694 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java
@@ -5,7 +5,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.Map;
import java.util.UUID;
import javax.annotation.Resource;
@@ -32,17 +31,12 @@
import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.goods.CollectionGoodsV2Service;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoMessageService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
-import com.yeshi.fanli.service.inter.order.OrderItemServcie;
import com.yeshi.fanli.service.inter.order.OrderService;
-import com.yeshi.fanli.service.inter.user.AccountDetailsService;
import com.yeshi.fanli.service.inter.user.AccountMessageService;
import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
-import com.yeshi.fanli.service.inter.user.MoneyRecordService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -67,11 +61,7 @@
@Resource
private OrderService orderService;
- @Resource
- private HongBaoService hongBaoService;
- @Resource
- private MoneyRecordService moneyRecordService;
@Resource
private BindingAccountService bindingAccountService;
@@ -89,9 +79,6 @@
private XcxMiniControllerUtil xcxMiniControllerUtil;
@Resource
- private HongBaoMessageService hongBaoMessageService;
-
- @Resource
private ShamUserService shamUserService;
@Resource
@@ -99,13 +86,7 @@
@Resource
private LostOrderService lostOrderService;
-
- @Resource
- private OrderItemServcie orderItemServcie;
-
- @Resource
- private AccountDetailsService accountDetailsService;
-
+
@Resource
private AccountMessageService accountMessageService;
@@ -322,10 +303,10 @@
}
private void outUserInfo(PrintWriter out, String remotIP, UserInfo user, String device) {
- BigDecimal totalmoney = hongBaoService.getTotalHongBaoByUid(user.getId());
+ BigDecimal totalmoney = new BigDecimal(0);
user.setTotalHongBao(totalmoney);
- BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(user.getId());
- BigDecimal canOpenMoney = hongBaoService.getCanOpenHongBaoByUid(user.getId());
+ BigDecimal unOpenmoney = new BigDecimal(0);
+ BigDecimal canOpenMoney = new BigDecimal(0);
user.setNoOpenHongBao(unOpenmoney);
user.setCanOpenHongBao(canOpenMoney);
JSONObject data = new JSONObject();
@@ -400,14 +381,12 @@
List<CollectionGoodsV2> coList = collectionGoodsV2Service.getCollectionGoodsList(uid, page, pageSize);
long count = collectionGoodsV2Service.getCollectionGoodsCount(uid);
JSONObject data = new JSONObject();
- Map<String, String> map = hongBaoManageService.convertMap();
- String proportion = map.get("hongbao_goods_proportion");
- String fcRate = map.get("hongbao_fc_ratio");
+ BigDecimal proportion = hongBaoManageService.getFanLiRate();
List<TaoBaoGoodsBriefExtra> list = new ArrayList<TaoBaoGoodsBriefExtra>();
coList.parallelStream().forEachOrdered(cg -> {
TaoBaoGoodsBrief goodsBrief = TaoBaoUtil.convert(cg.getCommonGoods());
- TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief, proportion,
- fcRate, "");
+ TaoBaoGoodsBriefExtra taoBaoGoodsBriefExtra = TaoBaoUtil.getTaoBaoGoodsBriefExtra(goodsBrief,
+ proportion.toString(), "");
list.add(taoBaoGoodsBriefExtra);
});
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
--
Gitblit v1.8.0