From 374fa38b5e4c17c079e027e9987e966f30a5cd36 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 一月 2019 12:13:46 +0800
Subject: [PATCH] 新版订单统计，返利，到账修改
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java | 26 +++++++++++++++-----------
1 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
index 25d76e0..8fba11d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserAccountController.java
@@ -7,13 +7,10 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import com.yeshi.fanli.util.Constant;
-
import org.yeshi.utils.JsonUtil;
+
import com.alipay.api.AlipayApiException;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.BindingAccount;
@@ -35,6 +32,7 @@
import com.yeshi.fanli.service.inter.config.SystemService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
@@ -49,11 +47,14 @@
import com.yeshi.fanli.service.inter.user.TBPidService;
import com.yeshi.fanli.service.inter.user.UserAccountService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.GsonUtil;
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.util.wx.WXLoginUtil;
+
+import net.sf.json.JSONObject;
/**
* 璐︽埛绯荤粺
@@ -73,6 +74,9 @@
@Resource
private HongBaoService hongBaoService;
+
+ @Resource
+ private HongBaoV2Service hongBaoV2Service;
@Resource
private BindingAccountService bindingAccountService;
@@ -850,8 +854,8 @@
}
BigDecimal moneyLastMonth = inviteGetMoneyService.getMoneyLastMonth(uid + "");
- BigDecimal unOpenmoney = hongBaoService.getUnOpenHongBaoByUid(uid);
- BigDecimal totalFanMoney = hongBaoService.getMyTotalHongBaoByUid(user.getId());
+ BigDecimal unOpenmoney = hongBaoV2Service.getUnRecievedFanLiMoney(uid);
+ BigDecimal totalFanMoney = hongBaoV2Service.getTotalFanLiMoney(uid);
JSONObject data = new JSONObject();
// IOS绔暟瀛楁寜鐓у瓧绗︿覆澶勭悊
if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && Integer.parseInt(acceptData.getVersion()) > 33) {
@@ -861,8 +865,8 @@
data.put("money", user.getMyHongBao().toString());
data.put("unGetMoney", unOpenmoney.toString());
data.put("totalFanLiMoney", totalFanMoney.toString());// 绱杩斿埄
- data.put("totalTiChengMoney", hongBaoService.getTotalTiChengMoney(uid).toString());// 绱鎻愭垚
- data.put("totalUnGetTiChengMoney", hongBaoService.getUnGetTiChengMoney(uid).toString()); // 鏈埌璐︽彁鎴�
+ data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid).toString());// 绱鎻愭垚
+ data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid).toString()); // 鏈埌璐︽彁鎴�
// 灞曠ず鎻愭垚鏁版嵁
data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);
} else {
@@ -872,10 +876,10 @@
data.put("money", user.getMyHongBao());
data.put("unGetMoney", unOpenmoney);
data.put("totalFanLiMoney", totalFanMoney);// 绱杩斿埄
- data.put("totalTiChengMoney", hongBaoService.getTotalTiChengMoney(uid));// 绱鎻愭垚
- data.put("totalUnGetTiChengMoney", hongBaoService.getUnGetTiChengMoney(uid)); // 鏈埌璐︽彁鎴�
+ data.put("totalTiChengMoney", hongBaoV2Service.getTotalTiChengMoney(uid));// 绱鎻愭垚
+ data.put("totalUnGetTiChengMoney", hongBaoV2Service.getUnGetTiChengMoney(uid)); // 鏈埌璐︽彁鎴�
// 灞曠ず鎻愭垚鏁版嵁
- data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);
+ data.put("showTiCheng", hongBaoV2Service.getTotalTiChengCount(uid) > 0);
}
user.setNoOpenHongBao(unOpenmoney);
--
Gitblit v1.8.0