From 075f6eceec6908178ba53b40b7794e2f90f74c92 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期三, 09 一月 2019 17:40:10 +0800
Subject: [PATCH] 冲突解决
---
fanli/src/main/java/com/yeshi/fanli/controller/client/UserOrderController.java | 129 ++++++++++++++++++++++++++----------------
1 files changed, 79 insertions(+), 50 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..d1ec5f0 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,44 +70,56 @@
}
if (page == null || page < 1) {
- page = 1L;
+ 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);
-
- if (list != null && list.size() > 0) {
- count = commonOrderService.countGroupOrderNoByUid(uid, state, type, orderNo, startTime, endTime);
- }
-
int totalValid = 0;
int totalProces = 0;
int totalInvite = 0;
long todayTotal = 0;
BigDecimal todayMoney = null;
- // 闇�瑕佺粺璁′俊鎭�
+
+ // 鏌ヨ鍒楄〃
+ 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, orderState, orderNo,
+ startTime, endTime, dateType);
+ }
+
+ // 闇�瑕佺粺璁＄瓫閫変俊鎭� 锛氭湭澶辨晥鐨勬�婚噾棰� 浠ュ強璁㈠崟
if (needCount && page == 1) {
- Map<String, BigDecimal> countOrder = commonOrderService.countByUidAndOrderState(uid, type, startTime, endTime);
+
+ 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);
if (countOrder.get("totalValid") != null) {
totalValid = countOrder.get("totalValid").intValue();
@@ -113,14 +132,12 @@
if (countOrder.get("totalInvite") != null) {
totalInvite = countOrder.get("totalInvite").intValue();
}
-
- todayTotal = commonOrderService.countOrder(uid, 1);
- todayMoney = commonOrderService.countOrderMoney(uid, 1);
}
-
+
if (todayMoney == null) {
- todayMoney = new BigDecimal(0);
+ todayMoney = new BigDecimal(0.00);
}
+
String helpUrl = configService.get("order_list_help");
@@ -130,8 +147,15 @@
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 if (type != null &&(type == 2 || type == 3)) {
+ 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); // 澶辨晥鏁伴噺
@@ -174,7 +198,7 @@
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();
@@ -198,7 +222,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) {
@@ -226,7 +250,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();
@@ -259,13 +283,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 +297,28 @@
}
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.countBonusOrderMoney(uid,2, dateType, null, null);
+
+ data.put("shareCount", commonOrderService.countBonusOrderNumber(uid, 2, dateType, null, null));
+ data.put("sharemoney", sharemoney.setScale(2, BigDecimal.ROUND_DOWN).toString());
+
+ // 閭�璇风粺璁�
+ BigDecimal inviteMoney = commonOrderService.countBonusOrderMoney(uid,3, dateType, null, null);
+
+ 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);
+
out.print(JsonUtil.loadTrueResult(data));
} catch (Exception e) {
out.print(JsonUtil.loadFalseResult(1, "鑾峰彇淇℃伅澶辫触"));
e.printStackTrace();
}
-
}
@@ -300,32 +329,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