From 3758c5dec1b37a58ea2dc2123c90415349dccee3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 11 一月 2019 16:21:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 71 +++++++++++++++++++++++++++--------
1 files changed, 55 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
index d1ec5f0..ccde44c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java
@@ -21,7 +21,7 @@
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.order.CommonOrderException;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
+import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.account.UserUtil;
@@ -41,7 +41,7 @@
private CommonOrderService commonOrderService;
@Resource
- private HongBaoService hongBaoService;
+ private HongBaoV2CountService hongBaoV2CountService;
/**
* 璁㈠崟鍒楄〃
@@ -83,9 +83,9 @@
try {
if (slotTime != null) {
- SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- endTime= sd.format(new Date());
- startTime = convertDate(slotTime, endTime);
+ SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");
+ endTime= sd.format(new Date());
+ startTime = convertDate(slotTime, endTime);
}
} catch (Exception e) {
e.printStackTrace();
@@ -113,9 +113,21 @@
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
if (needCount && page == 1) {
- todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
+ Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, type,
+ dateType, startTime, endTime);
- todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+ if (shareMap != null) {
+ Object totalNum = shareMap.get("totalNum");
+ if (totalNum != null) {
+ todayTotal = (long) totalNum;
+ }
+
+ Object totalmoney = shareMap.get("totalmoney");
+ if (totalmoney != null) {
+ todayMoney = (BigDecimal) totalmoney;
+ }
+ }
+
// 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
@@ -298,21 +310,48 @@
try {
- JSONObject data = new JSONObject();
- // 鍒嗕韩缁熻
- BigDecimal sharemoney = commonOrderService.countBonusOrderMoney(uid,2, dateType, null, null);
+ Object shareCount = 0;
+ BigDecimal sharemoney = new BigDecimal(0.00);
+ Object inviteCount = 0;
+ BigDecimal inviteMoney = new BigDecimal(0.00);
- data.put("shareCount", commonOrderService.countBonusOrderNumber(uid, 2, dateType, null, null));
- data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ Map<String, Object> shareMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 2 , dateType, null, null);
+ if (shareMap != null) {
+ Object totalNum = shareMap.get("totalNum");
+ if (totalNum != null) {
+ shareCount = totalNum;
+ }
+
+ Object totalmoney = shareMap.get("totalmoney");
+ if (totalmoney != null) {
+ sharemoney = (BigDecimal) totalmoney;
+ sharemoney = sharemoney.setScale(2, BigDecimal.ROUND_DOWN);
+ }
+ }
// 閭�璇风粺璁�
- BigDecimal inviteMoney = commonOrderService.countBonusOrderMoney(uid,3, dateType, null, null);
+ Map<String, Object> inviteMap = commonOrderService.countBonusOrderMoneyAndNumber(uid, 3 , dateType, null, null);
+ if (inviteMap != null) {
+ Object totalNum = inviteMap.get("totalNum");
+ if (totalNum != null) {
+ inviteCount = totalNum;
+ }
+
+ Object totalmoney = inviteMap.get("totalmoney");
+ if (totalmoney != null) {
+ inviteMoney = (BigDecimal) totalmoney;
+ inviteMoney = inviteMoney.setScale(2, BigDecimal.ROUND_DOWN);
+ }
+ }
- data.put("inviteCount", commonOrderService.countBonusOrderNumber(uid, 3, dateType, null, null));
- data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);
+ JSONObject data = new JSONObject();
+ data.put("shareCount", shareCount);
+ data.put("sharemoney", sharemoney);
+ data.put("inviteCount", inviteCount);
+ data.put("inviteMoney", inviteMoney);
+ data.put("showTiCheng", hongBaoV2CountService.getTotalTiChengCount(uid) > 0);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
--
Gitblit v1.8.0