From f4a0f2acc63d7785eab108419a4e16f5f688cb95 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 18 一月 2020 12:06:27 +0800
Subject: [PATCH] 用户注册信息
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 235 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 152 insertions(+), 83 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 0ea1752..a344766 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
@@ -4,12 +4,11 @@
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
import org.yeshi.utils.DateUtil;
@@ -17,10 +16,11 @@
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.dto.ChartTDO;
+import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.service.inter.count.HongBaoV2CountService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
@@ -32,13 +32,8 @@
@Resource
private HongBaoV2CountMapper hongBaoV2CountMapper;
-
-
@Resource
private TaoBaoOrderMapper taoBaoOrderMapper;
-
- @Resource
- private OrderItemMapper orderItemMapper;
@Resource
private CommonOrderMapper commonOrderMapper;
@@ -61,23 +56,24 @@
@Resource
private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;
- public List<Map<String, Object>> dayFactory(String startTime, String endTime, List<Map<String, Object>> list)
+ public List<ChartTDO> dayFactory(String startTime, String endTime, List<ChartTDO> list)
throws Exception {
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
if (startTime.equals(endTime)) {
-
- Map<String, Object> map = list.get(0);
- Object total = map.get("showValue");
+ ChartTDO chartTDO = list.get(0);
+ String total = chartTDO.getShowValue();
if (total == null) {
- map.put("showValue", 0);
+ chartTDO.setShowValue("0");
}
- listObject.add(map);
+ listObject.add(chartTDO);
return listObject;
}
String plusDay = "";
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
for (int i = 0; i < 1000; i++) {
if (i == 0) {
plusDay = startTime;
@@ -85,31 +81,25 @@
plusDay = DateUtil.plusDay(i, startTime);
}
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
+ String total = null;
+ ChartTDO chart = new ChartTDO();
for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
+ ChartTDO chartTDO = list.get(j);
+ String createDate = chartTDO.getShowDate();
String month = createDate.toString();
if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("showValue");
+ total = chartTDO.getShowValue();
break;
}
}
if (total == null) {
- total = 0;
+ total = "0";
}
- mapObject.put("showValue", total);
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
+ chart.setShowValue(total);
Date parseDate = sdf.parse(plusDay.toString());
-
- mapObject.put("showDate", sdf2.format(parseDate));
-
- listObject.add(mapObject);
+ chart.setShowDate(sdf2.format(parseDate));
+ listObject.add(chart);
if (plusDay.equals(endTime)) {
break; // 鏃堕棿缁撴潫
@@ -119,86 +109,88 @@
return listObject;
}
- public List<Map<String, Object>> monthFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
+ public List<ChartTDO> monthFactory(List<ChartTDO> list) {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
// 12 涓湀澶勭悊
for (int i = 1; i <= 12; i++) {
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
+
+ String total = null;
for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
+ ChartTDO chartTDO = list.get(j);
+ String createDate = chartTDO.getShowDate();
String month = createDate.toString();
if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = map.get("showValue");
+ total = chartTDO.getShowValue();
break;
}
}
if (total == null) {
- total = 0;
+ total = "0";
}
- mapObject.put("showValue", total);
-
- mapObject.put("showDate", i + "鏈�");
-
+
+ ChartTDO mapObject = new ChartTDO();
+ mapObject.setShowValue(total);
+ mapObject.setShowDate(i + "鏈�");
listObject.add(mapObject);
}
return listObject;
}
- public List<Map<String, Object>> yearFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
-
+ public List<ChartTDO> yearFactory(List<ChartTDO> list) {
+ List<ChartTDO> listObject = new ArrayList<ChartTDO>();
for (int i = 0; i < list.size(); i++) {
- Map<String, Object> map = list.get(i);
- Object total = map.get("showValue");
-
- if (total == null) {
- total = 0;
+ ChartTDO chartTDO = list.get(i);
+ String showValue = chartTDO.getShowValue();
+ if (showValue == null) {
+ showValue = "0";
}
- map.put("showValue", total);
-
- listObject.add(map);
+ chartTDO.setShowValue(showValue);
+ listObject.add(chartTDO);
}
-
return listObject;
}
@Override
- public List<Map<String, Object>> countHongBaoMoney(String channel, Integer dateType, Integer state, String year,
+ public List<ChartTDO> 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,
+ public List<ChartTDO> 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,
+ public List<ChartTDO> 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,
+ public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {
+ return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);
+ }
+
+
+
+ @Override
+ public List<ChartTDO> getProportionByType(Integer dateType, Integer type, String year, String startTime,
String endTime) throws Exception {
- List<Map<String, Object>> result_list = null;
+ List<ChartTDO> result_list = null;
- List<Map<String, Object>> listTotal = hongBaoV2CountMapper.countHongBaoTotalNum(dateType, year, startTime,
+ List<ChartTDO> 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,
+ List<ChartTDO> type_list = hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime,
endTime);
if (type_list == null || type_list.size() == 0) {
@@ -220,33 +212,25 @@
}
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");
+ ChartTDO chartTDO = result_list.get(i);
+ String showDate = chartTDO.getShowDate();
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());
-
+ ChartTDO innerChart = result_list.get(j);
+ String innerDate = innerChart.getShowDate();
+ if (innerDate != null && innerDate.equals(showDate)) {
+ String innerValue = innerChart.getShowValue();
+ long innerData = Long.parseLong(innerValue);
+ String showValue = chartTDO.getShowValue();
+ long showData = Long.parseLong(showValue);
if (showData > 0) {
proportion = innerData / showData;
}
-
break; // 缁撴潫鍐呴儴寰幆
}
}
-
- resultMap.put("showValue", proportion);
+ chartTDO.setShowValue(proportion+"");
}
-
return result_list;
}
@@ -263,6 +247,11 @@
@Override
public int getTotalTiChengCount(Long uid) {
return hongBaoV2CountMapper.getTotalTiChengCount(uid);
+ }
+
+ @Override
+ public long getHongBaoCount(Long uid,Integer type) {
+ return hongBaoV2CountMapper.getHongBaoCount(uid, type);
}
@Override
@@ -281,7 +270,7 @@
}
@Override
- public List<Map<String, Object>> count24HOderByChannel(String channel, Integer type, String years, String startTime,
+ public List<ChartTDO> count24HOderByChannel(String channel, Integer type, String years, String startTime,
String endTime) throws Exception {
return hongBaoV2CountMapper.count24HOderByChannel(channel, type, years, startTime, endTime);
}
@@ -297,4 +286,84 @@
return (int) count;
}
+ @Override
+ public BigDecimal countRebateCouponMoney() {
+ return hongBaoV2CountMapper.countRebateCouponMoney();
+ }
+
+ @Override
+ public long countRebateOrder(Long uid) {
+ return hongBaoV2CountMapper.countRebateOrder(uid);
+ }
+
+
+ @Override
+ public long countShareOrInviteOrder(Long uid) {
+ return hongBaoV2CountMapper.countShareOrInviteOrder(uid);
+ }
+
+
+ @Override
+ public BigDecimal sumAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime) {
+ return hongBaoV2CountMapper.sumAlreadyGetMoneyByUid(uid, typeList, minGetTime, maxGetTime);
+ }
+
+ @Override
+ public long countAlreadyGetMoneyByUid(Long uid, List<Integer> typeList, Date minGetTime, Date maxGetTime) {
+ return hongBaoV2CountMapper.countAlreadyGetMoneyByUid(uid, typeList, minGetTime, maxGetTime);
+ }
+
+ @Override
+ public BigDecimal getOrderRewardByTeamUid(Long uid, Long teamUid, Date endTime) {
+ return hongBaoV2CountMapper.getOrderRewardByTeamUid(uid, teamUid, endTime);
+ }
+
+ @Override
+ public BigDecimal getOrderRewardByTeamUidTheMonth(Long uid, Long teamUid) {
+ return hongBaoV2CountMapper.getOrderRewardByTeamUidTheMonth(uid, teamUid);
+ }
+
+ @Override
+ public BigDecimal getRewardMoneyBySelf(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_ZIGOU);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+ @Override
+ public BigDecimal getRewardMoneyByShare(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_SHARE_GOODS);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByInvite(Long uid) {
+ List<Integer> list = new ArrayList<Integer>();
+ list.add(HongBaoV2.TYPE_YIJI);
+ list.add(HongBaoV2.TYPE_ERJI);
+ list.add(HongBaoV2.TYPE_SHARE_YIJI);
+ list.add(HongBaoV2.TYPE_SHARE_ERJI);
+ return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
+ }
+
+ @Override
+ public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment) {
+ return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, time, payment);
+ }
+
+ @Override
+ public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> listSource) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
+ startTime, endTime, listSource);
+ }
+
}
--
Gitblit v1.8.0