From 88b54772dbcf5ecab1e2316e4e4626ac901b8908 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 22 一月 2019 15:58:24 +0800
Subject: [PATCH] 邀请码添加返回状态
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 70 +++++++++++++++++++++++++----------
1 files changed, 50 insertions(+), 20 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..4be4283 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,14 +83,17 @@
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();
}
+ if (endTime != null && endTime.trim().length() > 0) {
+ endTime += " 23:59:59";
+ }
try {
long count = 0;
@@ -99,6 +102,7 @@
int totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
+
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
@@ -116,6 +120,7 @@
todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+
// 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
@@ -298,21 +303,46 @@
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;
+ }
+ }
// 閭�璇风粺璁�
- 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;
+ }
+ }
- data.put("inviteCount", commonOrderService.countBonusOrderNumber(uid, 3, dateType, null, null));
+
+ JSONObject data = new JSONObject();
+ data.put("shareCount", shareCount);
+ data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ data.put("inviteCount", inviteCount);
data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
- data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);
-
+ data.put("showTiCheng", hongBaoV2CountService.getTotalTiChengCount(uid) > 0);
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -334,22 +364,22 @@
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
- startTime = DateUtil.reduceDay(3, endTime);
+ startTime = DateUtil.reduceDay(2, endTime);
break;
case 2: // 鏈�杩戜竷澶�
- startTime = DateUtil.reduceDay(7, endTime);
+ startTime = DateUtil.reduceDay(6, endTime);
break;
case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- startTime = DateUtil.reduceDay(15, endTime);
+ startTime = DateUtil.reduceDay(14, endTime);
break;
case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- startTime = DateUtil.reduceDay(30, endTime);
+ startTime = DateUtil.reduceDay(29, endTime);
break;
case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- startTime = DateUtil.reduceDay(3*30, endTime);
+ startTime = DateUtil.reduceDay(3*30-1, endTime);
break;
case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- startTime = DateUtil.reduceDay(6*30, endTime);
+ startTime = DateUtil.reduceDay(6*30-1, endTime);
break;
default:
break;
--
Gitblit v1.8.0