From 50c684ac131ba7f738e85e3cd7b48cc19bab086f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 24 一月 2019 09:36:47 +0800
Subject: [PATCH] 增加白底图展示
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 154 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 107 insertions(+), 47 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 bafa41c..485598e 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
@@ -9,23 +9,27 @@
import javax.annotation.Resource;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.yeshi.utils.DateUtil;
import org.yeshi.utils.JsonUtil;
+import com.yeshi.fanli.entity.AppVersionInfo;
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.exception.order.CommonOrderException;
+import com.yeshi.fanli.service.inter.config.AppVersionService;
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.UserInfoExtraService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.account.UserUtil;
import com.yeshi.fanli.vo.order.CommonOrderVO;
+import com.yeshi.fanli.vo.user.UserInfoExtraVO;
+
+import net.sf.json.JSONObject;
@Controller
@RequestMapping("api/v1/user/order")
@@ -33,15 +37,21 @@
@Resource
private ConfigService configService;
+
+ @Resource
+ private AppVersionService appVersionService;
@Resource
private UserInfoService userInfoService;
@Resource
+ private UserInfoExtraService userInfoExtraService;
+
+ @Resource
private CommonOrderService commonOrderService;
@Resource
- private HongBaoService hongBaoService;
+ private HongBaoV2CountService hongBaoV2CountService;
/**
* 璁㈠崟鍒楄〃
@@ -83,19 +93,26 @@
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;
+ int totalValid = 0;
+ int totalProces = 0;
+ int totalInvite = 0;
long todayTotal = 0;
- BigDecimal todayMoney = new BigDecimal(0.00);
+ BigDecimal todayMoney = null;
+
// 鏌ヨ鍒楄〃
List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState,
@@ -109,26 +126,13 @@
// 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
if (needCount && page == 1) {
- Map<String, Object> countMap = commonOrderService.countMoneyGroupOrderNoByUid(uid, type,
- orderNo, startTime, endTime, dateType);
- if (countMap != null) {
- BigDecimal totalMoney = (BigDecimal) countMap.get("totalMoney");
- if (totalMoney != null) {
- todayMoney = totalMoney;// 褰撳墠鏌ヨ鎵�鏈夎鍗曞凡鍒拌处鎬婚噾棰�
- }
-
- //褰撳墠鏌ヨ鎵�鏈夊凡鍒拌处璁㈠崟鏁伴噺
- todayTotal = (long) countMap.get("totalRow");
- }
- }
-
-
- int totalValid = 0;
- int totalProces = 0;
- int totalInvite = 0;
-
- // 闇�瑕佺粺璁′俊鎭�
- if (needCount && page == 1) {
+
+ todayMoney = commonOrderService.countBonusOrderMoney(uid, type, dateType, startTime, endTime);
+
+ todayTotal = commonOrderService.countBonusOrderNumber(uid, type, dateType, startTime, endTime);
+
+
+ // 缁熻鏈夋晥鐨勮鍗曟暟閲� 銆� 澶辨晥璁㈠崟鏁伴噺 銆佺淮鏉冭鍗曟暟閲�
Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
startTime, endTime, dateType);
@@ -144,7 +148,12 @@
totalInvite = countOrder.get("totalInvite").intValue();
}
}
-
+
+ if (todayMoney == null) {
+ todayMoney = new BigDecimal(0.00);
+ }
+
+
String helpUrl = configService.get("order_list_help");
JSONObject data = new JSONObject();
@@ -200,11 +209,34 @@
UserInfo userInfo = UserUtil.filterForClientUser(user);
+ // 1.5.0 鐗堟湰涔嬪悗杩斿洖鏂扮殑绛夌骇
+ String version = acceptData.getVersion();
+ if (version != null && version.trim().length() > 0) {
+ int versionCode = Integer.parseInt(version);
+ String platform = acceptData.getPlatform();
+
+ AppVersionInfo versionInfo = appVersionService.getByPlatformAndVersion(platform, "1.5.0");
+ if (versionInfo != null) {
+ int versionCode150 = versionInfo.getVersionCode();
+ if (versionCode >= versionCode150) {
+ UserInfoExtraVO userInfoExtra = userInfoExtraService.getInfoExtraVOByUid(user.getId()); if (userInfoExtra != null && userInfoExtra.getUserRank() != null) {
+ String picture = userInfoExtra.getUserRank().getPicture();
+ String icon = userInfoExtra.getUserRank().getIcon();
+
+ userInfo.setRankIcon(icon);
+ userInfo.setRankNamePicture(picture);
+ }
+ }
+ }
+
+ }
+
+
JSONObject data = new JSONObject();
data.put("userInfo", userInfo);
/* 鎬昏鍗曠粺璁� */
- Map<String, BigDecimal> countOrder= commonOrderService.countOrderByHongBaoType(uid, null);
+ Map<String, BigDecimal> countOrder= commonOrderService.countHistoryOrder(uid, null);
int self = 0;
if (countOrder.get("totalSelf") != null) {
self = countOrder.get("totalSelf").intValue();
@@ -228,7 +260,7 @@
data.put("invite", invite);
/* 浠婃棩璁㈠崟缁熻 */
- Map<String, BigDecimal> countToday= commonOrderService.countOrderByHongBaoType(uid, 1);
+ Map<String, BigDecimal> countToday= commonOrderService.countHistoryOrder(uid, 1);
int todaySelf = 0;
if (countToday.get("totalSelf") != null) {
@@ -256,7 +288,7 @@
data.put("today", todaydata);
/* 鏄ㄦ棩璁㈠崟缁熻 */
- Map<String, BigDecimal> countYesterday= commonOrderService.countOrderByHongBaoType(uid, 2);
+ Map<String, BigDecimal> countYesterday= commonOrderService.countHistoryOrder(uid, 2);
int yesterdaySelf = 0;
if (countYesterday.get("totalSelf") != null) {
yesterdaySelf = countYesterday.get("totalSelf").intValue();
@@ -304,18 +336,46 @@
try {
- JSONObject data = new JSONObject();
- // 鍒嗕韩缁熻
- BigDecimal sharemoney = commonOrderService.countOrderMoney(uid,2, dateType);
- data.put("shareCount", commonOrderService.countOrder(uid, 2, dateType));
- data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ Object shareCount = 0;
+ BigDecimal sharemoney = new BigDecimal(0.00);
+ Object inviteCount = 0;
+ BigDecimal inviteMoney = new BigDecimal(0.00);
+
+ 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.countOrderMoney(uid,3, dateType);
- data.put("inviteCount", commonOrderService.countOrder(uid, 3, dateType));
+ 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;
+ }
+ }
+
+
+ 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) {
@@ -337,22 +397,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