From 5981b2cae7c20ec9021c8ccbe1a926f35f640210 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 03 一月 2019 17:43:18 +0800
Subject: [PATCH] Merge branch 'dev-hongbao'
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 156 ++++++++++++++-------------------------------------
1 files changed, 44 insertions(+), 112 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 002715f..28d639a 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, Integer 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, "鐢ㄦ埛鏈櫥褰�"));
@@ -66,31 +73,33 @@
page = 1;
}
- if (state !=null && state == 0) {
- state = null;
+ if (state != null && state == 0) {
+ state = null;// 鎵�鏈夌姸鎬�
}
if (type != null && type == 0 ) {
- type = null; // 鏌ヨ鎵�鏈夌被鍨嬭鍗�
+ type = null; // 鎵�鏈夌被鍨嬭鍗�
}
try {
if (slotTime != null) {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
- startTime = sd.format(new Date());
- endTime = convertDate(slotTime, startTime);
+ endTime= sd.format(new Date());
+ startTime = convertDate(slotTime, endTime);
}
} catch (Exception e) {
e.printStackTrace();
}
+
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;
@@ -100,7 +109,8 @@
BigDecimal todayMoney = null;
// 闇�瑕佺粺璁′俊鎭�
if (needCount && page == 1) {
- Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime, endTime);
+ Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type,
+ startTime, endTime, dateType);
if (countOrder.get("totalValid") != null) {
totalValid = countOrder.get("totalValid").intValue();
@@ -130,8 +140,12 @@
data.put("helpUrl", helpUrl);
- data.put("todayTotal", todayTotal);
- data.put("todayMoney", todayMoney);
+ if (type != null && type == 1) {
+ data.put("todayMoney", "浠婃棩棰勪及杩斿埄鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ } else {
+ data.put("todayMoney", "浠婃棩棰勪及濂栭噾鎬婚 楼" + todayMoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+ }
+ data.put("todayTotal", "鍏�"+ todayTotal+ "绗�");
data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
data.put("totalProces", totalProces); // 缁存潈鏁伴噺
data.put("totalInvite", totalInvite); // 澶辨晥鏁伴噺
@@ -276,11 +290,15 @@
JSONObject data = new JSONObject();
// 鍒嗕韩缁熻
+ BigDecimal sharemoney = commonOrderService.countOrderMoney(uid,2, dateType);
data.put("shareCount", commonOrderService.countOrder(uid, 2, dateType));
- data.put("sharemoney", commonOrderService.countOrderMoney(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", commonOrderService.countOrderMoney(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));
@@ -288,94 +306,8 @@
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇淇℃伅澶辫触"));
e.printStackTrace();
}
-
}
- /**
- * 濂栭噾璁㈠崟
- * @param acceptData
- * @param page
- * @param uid
- * @param dateType 1-浠婃棩 2-鏄ㄥぉ 3-鏈湀 4-涓婁釜鏈� |
- * @param type 璁㈠崟绫诲瀷锛�1-杩斿埄璁㈠崟 2-鍒嗕韩璁㈠崟 3-閭�璇疯鍗�
- * @param out
- */
- @RequestMapping(value = "getbonusorder", method = RequestMethod.POST)
- public void getBonusOrder(AcceptData acceptData, Integer page, Long uid, Integer dateType,
- Integer type, PrintWriter out) {
-
- if (uid == null) {
- out.print(JsonUtil.loadFalseResult(1, "鐢ㄦ埛鏈櫥褰�"));
- return;
- }
-
- if (type == null || dateType == null ) {
- out.print(JsonUtil.loadFalseResult(1, "浼犻�掑弬鏁扮己澶�"));
- return;
- }
-
- if (page == null || page < 1) {
- page = 1;
- }
-
- try {
- long count = 0;
- List<CommonOrderVO> list = commonOrderService.listBonusOrder(page, uid, type, dateType);
-
- if (list != null && list.size() > 0) {
- count = commonOrderService.countOrder(uid, type, dateType);
- }
-
- int totalValid = 0;
- int totalProces = 0;
- int totalInvite = 0;
- long todayTotal = 0;
- BigDecimal todayMoney = null;
- // 闇�瑕佺粺璁′俊鎭�
- if (page == 1) {
- Map<String, BigDecimal> countOrder = commonOrderService.countBonusOrderByState(uid, type, dateType);
-
- if (countOrder.get("totalValid") != null) {
- totalValid = countOrder.get("totalValid").intValue();
- }
-
- if (countOrder.get("totalProces") != null) {
- totalProces = countOrder.get("totalProces").intValue();
- }
-
- if (countOrder.get("totalInvite") != null) {
- totalInvite = countOrder.get("totalInvite").intValue();
- }
-
- todayTotal = commonOrderService.countOrder(uid, type, 1);
- todayMoney = commonOrderService.countOrderMoney(uid, type , 1);
- }
-
- if (todayMoney == null) {
- todayMoney = new BigDecimal(0);
- }
-
-
- JSONObject data = new JSONObject();
- data.put("count", count);
- data.put("result_list", JsonUtil.getApiCommonGson().toJson(list));
-
- data.put("todayTotal", todayTotal);
- data.put("todayMoney", todayMoney);
- data.put("totalValid", totalValid); // 鏈夋晥鏁伴噺
- data.put("totalProces", totalProces); // 缁存潈鏁伴噺
- data.put("totalInvite", totalInvite); // 澶辨晥鏁伴噺
-
- out.print(JsonUtil.loadTrueResult(data));
-
- } catch(CommonOrderException e){
- out.print(JsonUtil.loadFalseResult(e.getCode(), e.getMsg()));
- } catch (Exception e) {
- out.print(JsonUtil.loadFalseResult(1, "鏌ヨ澶辫触"));
- e.printStackTrace();
- }
-
- }
/**
* 鏃堕棿杞崲
@@ -384,32 +316,32 @@
* @return
* @throws Exception
*/
- public String convertDate (Integer slotTime, String startTime) throws Exception {
- String endTime = null;
+ public String convertDate (Integer slotTime, String endTime) throws Exception {
+ String startTime = null;
switch (slotTime) {
case 1: // 鏈�杩戜笁澶�
- endTime = DateUtil.plusDay(3, startTime);
+ startTime = DateUtil.reduceDay(3, endTime);
break;
case 2: // 鏈�杩戜竷澶�
- endTime = DateUtil.plusDay(7, startTime);
+ startTime = DateUtil.reduceDay(7, endTime);
break;
case 3: // 鏈�杩�15澶� 锛堝崐鏈堬級
- endTime = DateUtil.plusDay(15, startTime);
+ startTime = DateUtil.reduceDay(15, endTime);
break;
case 4: // 鏈�杩戜笁鍗佸ぉ 锛堟湰鏈堬級
- endTime = DateUtil.plusDay(30, startTime);
+ startTime = DateUtil.reduceDay(30, endTime);
break;
case 5: // 鏈�杩戜節鍗佸ぉ锛堣繎涓夋湀锛�
- endTime = DateUtil.plusDay(3*30, startTime);
+ startTime = DateUtil.reduceDay(3*30, endTime);
break;
case 6: // 鏈�杩戜竴鐧惧叓鍗佸ぉ锛堣繎鍗婂勾锛�
- endTime = DateUtil.plusDay(6*30, startTime);
+ startTime = DateUtil.reduceDay(6*30, endTime);
break;
default:
break;
}
- return endTime;
+ return startTime;
}
}
--
Gitblit v1.8.0