From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 129 ++++++++++++++++++++++--------------------
1 files changed, 68 insertions(+), 61 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
index d453571..3f9d96f 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java
@@ -14,17 +14,16 @@
import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;
-import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
-import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
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.vo.order.HongBaoV2VO;
@Service
public class HongBaoV2CountServiceImpl implements HongBaoV2CountService {
@@ -33,13 +32,7 @@
private HongBaoV2CountMapper hongBaoV2CountMapper;
@Resource
- private HongBaoMapper hongBaoMapper;
-
- @Resource
private TaoBaoOrderMapper taoBaoOrderMapper;
-
- @Resource
- private OrderItemMapper orderItemMapper;
@Resource
private CommonOrderMapper commonOrderMapper;
@@ -62,9 +55,8 @@
@Resource
private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;
-
-
- public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list) throws Exception {
+ public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list)
+ throws Exception {
List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
@@ -169,87 +161,86 @@
return listObject;
}
-
-
+
@Override
- public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state,
- String year, String startTime, String endTime) throws Exception {
+ public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
+ String startTime, String endTime) throws Exception {
return hongBaoV2CountMapper.countHongBaoMoney(channel, dateType, state, year, startTime, endTime);
}
-
+
@Override
- public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state,
- String year, String startTime, String endTime) throws Exception {
+ public List<Map<String, Object>> countHongBaoNum(String channel, Integer dateType, Integer state, String year,
+ String startTime, String endTime) throws Exception {
return hongBaoV2CountMapper.countHongBaoNum(channel, dateType, state, year, startTime, endTime);
}
-
+
@Override
- public List<Map<String, Object>> countHongBaoType(Integer dateType, Integer type, String year,
- String startTime, String endTime) throws Exception {
+ public List<Map<String, Object>> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
+ String endTime) throws Exception {
return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);
}
-
+
@Override
- public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year,
- String startTime, String endTime) throws Exception {
-
+ public List<Map<String, Object>> getProportionByType(Integer dateType, Integer type, String year, String startTime,
+ String endTime) throws Exception {
+
List<Map<String, Object>> result_list = null;
-
- List<Map<String, Object>> listTotal = hongBaoV2CountMapper.countHongBaoTotalNum(dateType, year, startTime, endTime);
+
+ List<Map<String, Object>> listTotal = hongBaoV2CountMapper.countHongBaoTotalNum(dateType, year, startTime,
+ endTime);
if (listTotal == null || listTotal.size() == 0) {
return result_list;
- }
-
- List<Map<String, Object>> type_list = hongBaoV2CountMapper.countHongBaoType(dateType, type,
- year, startTime, endTime);
-
+ }
+
+ List<Map<String, Object>> type_list = hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime,
+ endTime);
+
if (type_list == null || type_list.size() == 0) {
return null;
}
-
- switch (dateType){
- case 1: // 鎸夊ぉ澶勭悊
- result_list = dayFactory(startTime, endTime, type_list);
- break;
- case 2: // 鎸夋湀澶勭悊
- result_list = monthFactory(type_list);
- break;
- case 3:
- result_list = yearFactory(type_list);
- break;
- default:
- break;
+
+ switch (dateType) {
+ case 1: // 鎸夊ぉ澶勭悊
+ result_list = dayFactory(startTime, endTime, type_list);
+ break;
+ case 2: // 鎸夋湀澶勭悊
+ result_list = monthFactory(type_list);
+ break;
+ case 3:
+ result_list = yearFactory(type_list);
+ break;
+ default:
+ break;
}
-
-
+
for (int i = 0; i < result_list.size(); i++) {
-
+
float proportion = 0;
Map<String, Object> resultMap = result_list.get(i);
-
+
Object showDate = resultMap.get("showDate");
for (int j = 0; j < listTotal.size(); j++) {
Map<String, Object> innerMap = result_list.get(j);
Object innerDate = innerMap.get("showDate");
-
+
if (innerDate != null && innerDate.toString().equals(showDate.toString())) {
Object innerValue = innerMap.get("showValue");
long innerData = Long.parseLong(innerValue.toString());
-
+
Object showValue = resultMap.get("showValue");
long showData = Long.parseLong(showValue.toString());
-
+
if (showData > 0) {
- proportion = innerData/showData;
+ proportion = innerData / showData;
}
-
+
break; // 缁撴潫鍐呴儴寰幆
}
}
-
+
resultMap.put("showValue", proportion);
}
-
+
return result_list;
}
@@ -257,7 +248,7 @@
public BigDecimal countMoneyByUidAndState(Long uid, Integer state) {
return hongBaoV2CountMapper.countMoneyByUidAndState(uid, state);
}
-
+
@Override
public Integer countNumberByUidAndState(Long uid, Integer state) {
return hongBaoV2CountMapper.countNumberByUidAndState(uid, state);
@@ -282,11 +273,27 @@
public Date getLastHongBaoTime(Long uid) {
return hongBaoV2CountMapper.getLastHongBaoTime(uid);
}
-
-
+
@Override
- public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years,
- String startTime, String endTime) throws Exception{
+ public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years, String startTime,
+ String endTime) throws Exception {
return hongBaoV2CountMapper.count24HOderByChannel(channel, type, years, startTime, endTime);
}
+
+ @Override
+ public List<HongBaoV2VO> listShareAndInviteMoney(long start, int count, String date) {
+ return hongBaoV2CountMapper.listShareAndInviteMoney(start, count, date);
+ }
+
+ @Override
+ public Integer countNumberByUid(Long uid) {
+ long count = hongBaoV2CountMapper.countNumberByUid(uid);
+ return (int) count;
+ }
+
+ @Override
+ public BigDecimal countRebateCouponMoney() {
+ return hongBaoV2CountMapper.countRebateCouponMoney();
+ }
+
}
--
Gitblit v1.8.0