From eed607d87b2eee1f09b4a28da614f3ad0b46601d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 14 三月 2019 16:14:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/xcx/XcxUserInfoController.java | 24 +++++-------------------
1 files changed, 5 insertions(+), 19 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 1d00c9e..7c13b73 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
@@ -22,7 +22,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.bus.user.WeiXinUser;
import com.yeshi.fanli.entity.goods.CollectionGoodsV2;
-import com.yeshi.fanli.entity.system.System;
+import com.yeshi.fanli.entity.system.BusinessSystem;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBriefExtra;
import com.yeshi.fanli.exception.goods.CollectionGoodsException;
@@ -31,13 +31,10 @@
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.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.AccountMessageService;
-import com.yeshi.fanli.service.inter.user.BindingAccountService;
import com.yeshi.fanli.service.inter.user.ExtractService;
import com.yeshi.fanli.service.inter.user.PassWordErrorRecordService;
import com.yeshi.fanli.service.inter.user.ShamUserService;
@@ -64,14 +61,6 @@
private OrderService orderService;
@Resource
- private HongBaoService hongBaoService;
-
-
-
- @Resource
- private BindingAccountService bindingAccountService;
-
- @Resource
private ExtractService extractService;
@Resource
@@ -91,9 +80,6 @@
@Resource
private LostOrderService lostOrderService;
-
- @Resource
- private OrderItemServcie orderItemServcie;
@Resource
private AccountMessageService accountMessageService;
@@ -134,7 +120,7 @@
}
}
// 涓嶆槸鐢↖D鐨勭櫥闄嗙殑浜嬪氨澶氫簡
- System system = xcxMiniControllerUtil.getSystem(acceptData);
+ BusinessSystem system = xcxMiniControllerUtil.getSystem(acceptData);
if (system == null) {
out.print(JsonUtil.loadFalseResult(XcxMiniControllerUtil.NOSYSTEM));
return;
@@ -311,10 +297,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();
--
Gitblit v1.8.0