From f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 十二月 2018 15:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 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 6a83a09..b1fa29a 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,6 +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.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.util.account.UserUtil;
@@ -38,24 +39,30 @@
@Resource
private CommonOrderService commonOrderService;
+
+ @Resource
+ private HongBaoService hongBaoService;
/**
* 璁㈠崟鍒楄〃
* @param acceptData
* @param page
* @param uid
- * @param state 鐘舵�侊細1-鏈埌璐� 3-宸插埌璐� 4-宸插け鏁�
+ * @param state 鐘舵�侊細1-鏈埌璐� 2-宸插埌璐� 3-宸插け鏁�
* @param type 绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
- * @param orderNo 璁㈠崟鍙�
+ * @param orderState 1鏈夋晥璁㈠崟 2 缁存潈璁㈠崟 3澶辨晥璁㈠崟
+ * @param orderNo 璁㈠崟鍙�
* @param startTime 璧峰鏃堕棿
* @param endTime 缁撴潫鏃堕棿
* @param slotTime 鏃堕棿娈碉細1-鏈�杩戜笁澶� 2-鏈�杩戜竷澶� 3鏈�杩戝崐鏈� 4鏈湀 5杩戜笁鏈� 6杩戝崐骞�
+ * @param dateType 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈� |
* @param needCount
* @param out
*/
@RequestMapping(value = "getorder", method = RequestMethod.POST)
- public void getOrder(AcceptData acceptData, Long page, Long uid, Integer state, Integer type, String orderNo,
- String startTime, String endTime, Integer slotTime, boolean needCount, PrintWriter out) {
+ public void getOrder(AcceptData acceptData, Integer page, Long uid, Integer state, Integer type,
+ Integer orderState,String orderNo, String startTime, String endTime, Integer slotTime,
+ boolean needCount, Integer dateType, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -63,7 +70,7 @@
}
if (page == null || page < 1) {
- page = 1L;
+ page = 1;
}
if (state !=null && state == 0) {
@@ -86,11 +93,11 @@
try {
long count = 0;
- List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderNo,
- startTime, endTime);
+ List<CommonOrderVO> list = commonOrderService.getOrderByUid(page, uid, state, type, orderState, orderNo,
+ startTime, endTime, dateType);
if (list != null && list.size() > 0) {
- count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderNo, startTime, endTime);
+ count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderState, orderNo, startTime, endTime, dateType);
}
int totalValid = 0;
@@ -114,8 +121,8 @@
totalInvite = countOrder.get("totalInvite").intValue();
}
- todayTotal = commonOrderService.countOrder(uid, 1);
- todayMoney = commonOrderService.countOrderMoney(uid, 1);
+ todayTotal = commonOrderService.countOrder(uid, type, 1);
+ todayMoney = commonOrderService.countOrderMoney(uid, type , 1);
}
if (todayMoney == null) {
@@ -259,13 +266,13 @@
}
/**
- * 缁熻浠婃棩璁㈠崟鏀跺叆 浠ュ強璁㈠崟鏁伴噺
+ * 缁熻濂栭噾
* @param acceptData
* @param uid
* @param out
*/
- @RequestMapping(value = "countToday", method = RequestMethod.POST)
- public void countToday(AcceptData acceptData, Long uid, PrintWriter out) {
+ @RequestMapping(value = "countBonus", method = RequestMethod.POST)
+ public void countBonus(AcceptData acceptData, Long uid, Integer dateType, PrintWriter out) {
if (uid == null) {
out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
@@ -273,23 +280,25 @@
}
try {
- long count = commonOrderService.countOrder(uid, 1);
- BigDecimal money = commonOrderService.countOrderMoney(uid, 1);
-
- if (money == null) {
- money = new BigDecimal(0);
- }
JSONObject data = new JSONObject();
- data.put("count", count);
- data.put("money", money);
+ // 鍒嗕韩缁熻
+ 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());
+ // 閭�璇风粺璁�
+ BigDecimal inviteMoney = commonOrderService.countOrderMoney(uid,3, dateType);
+ data.put("inviteCount", commonOrderService.countOrder(uid, 3, dateType));
+ data.put("inviteMoney", inviteMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+
+ data.put("showTiCheng", hongBaoService.getTotalTiChengCount(uid) > 0);
+
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇淇℃伅澶辫触"));
e.printStackTrace();
}
-
}
--
Gitblit v1.8.0