From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 265 +++++++++-------------------------------------------
1 files changed, 49 insertions(+), 216 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 a344766..8704f84 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
@@ -1,29 +1,17 @@
package com.yeshi.fanli.service.impl.count;
import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
-import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Service;
-import org.yeshi.utils.DateUtil;
import com.yeshi.fanli.dao.mybatis.HongBaoV2CountMapper;
-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.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;
import com.yeshi.fanli.vo.order.HongBaoV2VO;
@Service
@@ -32,208 +20,14 @@
@Resource
private HongBaoV2CountMapper hongBaoV2CountMapper;
- @Resource
- private TaoBaoOrderMapper taoBaoOrderMapper;
-
- @Resource
- private CommonOrderMapper commonOrderMapper;
-
- @Resource
- private CommonOrderGoodsMapper commonOrderGoodsMapper;
-
- @Resource
- private HongBaoOrderMapper hongBaoOrderMapper;
-
- @Resource
- private OrderMapper orderMapper;
-
- @Resource
- private CommonOrderService commonOrderService;
-
- @Resource
- private UserInfoService userInfoService;
-
- @Resource
- private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;
-
- public List<ChartTDO> dayFactory(String startTime, String endTime, List<ChartTDO> list)
- throws Exception {
-
- List<ChartTDO> listObject = new ArrayList<ChartTDO>();
-
- if (startTime.equals(endTime)) {
- ChartTDO chartTDO = list.get(0);
- String total = chartTDO.getShowValue();
- if (total == null) {
- chartTDO.setShowValue("0");
- }
- 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;
- } else {
- plusDay = DateUtil.plusDay(i, startTime);
- }
-
- String total = null;
- ChartTDO chart = new ChartTDO();
- for (int j = 0; j < list.size(); j++) {
- ChartTDO chartTDO = list.get(j);
- String createDate = chartTDO.getShowDate();
- String month = createDate.toString();
- if (plusDay.equalsIgnoreCase(month)) {
- total = chartTDO.getShowValue();
- break;
- }
- }
-
- if (total == null) {
- total = "0";
- }
- chart.setShowValue(total);
- Date parseDate = sdf.parse(plusDay.toString());
- chart.setShowDate(sdf2.format(parseDate));
- listObject.add(chart);
-
- if (plusDay.equals(endTime)) {
- break; // 鏃堕棿缁撴潫
- }
- }
-
- return listObject;
- }
-
- public List<ChartTDO> monthFactory(List<ChartTDO> list) {
- List<ChartTDO> listObject = new ArrayList<ChartTDO>();
- // 12 涓湀澶勭悊
- for (int i = 1; i <= 12; i++) {
-
- String total = null;
- for (int j = 0; j < list.size(); j++) {
- ChartTDO chartTDO = list.get(j);
- String createDate = chartTDO.getShowDate();
- String month = createDate.toString();
- if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = chartTDO.getShowValue();
- break;
- }
- }
-
- if (total == null) {
- total = "0";
- }
-
- ChartTDO mapObject = new ChartTDO();
- mapObject.setShowValue(total);
- mapObject.setShowDate(i + "鏈�");
- listObject.add(mapObject);
- }
- return listObject;
- }
-
- public List<ChartTDO> yearFactory(List<ChartTDO> list) {
- List<ChartTDO> listObject = new ArrayList<ChartTDO>();
- for (int i = 0; i < list.size(); i++) {
- ChartTDO chartTDO = list.get(i);
- String showValue = chartTDO.getShowValue();
- if (showValue == null) {
- showValue = "0";
- }
- chartTDO.setShowValue(showValue);
- listObject.add(chartTDO);
- }
- return listObject;
- }
-
- @Override
- 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<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<ChartTDO> countHongBaoType(Integer dateType, Integer type, String year, String startTime,
- String endTime) throws Exception {
- return hongBaoV2CountMapper.countHongBaoType(dateType, type, year, startTime, endTime);
- }
-
@Override
- public Integer countOrderByTypeAndDate(Integer orderType, String preDay) {
+ public Long 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<ChartTDO> result_list = null;
-
- List<ChartTDO> listTotal = hongBaoV2CountMapper.countHongBaoTotalNum(dateType, year, startTime,
- endTime);
- if (listTotal == null || listTotal.size() == 0) {
- return result_list;
- }
-
- List<ChartTDO> 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;
- }
-
- for (int i = 0; i < result_list.size(); i++) {
- float proportion = 0;
- ChartTDO chartTDO = result_list.get(i);
- String showDate = chartTDO.getShowDate();
- for (int j = 0; j < listTotal.size(); j++) {
- 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; // 缁撴潫鍐呴儴寰幆
- }
- }
- chartTDO.setShowValue(proportion+"");
- }
- return result_list;
- }
-
+
@Override
public BigDecimal countMoneyByUidAndState(Long uid, Integer state) {
return hongBaoV2CountMapper.countMoneyByUidAndState(uid, state);
@@ -269,11 +63,6 @@
return hongBaoV2CountMapper.getLastHongBaoTime(uid);
}
- @Override
- public List<ChartTDO> 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) {
@@ -348,16 +137,33 @@
return hongBaoV2CountMapper.getRewardMoneyByUid(uid, list);
}
+
@Override
- public long countValidOrderTeamUserByUid(Long uid, Long time, BigDecimal payment) {
- return hongBaoV2CountMapper.countValidOrderTeamUserByUid(uid, time, payment);
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
}
+
@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);
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, null, null, null, listSource);
+ if (money == null)
+ money = BigDecimal.ZERO;
+ return money;
}
+ @Override
+ public BigDecimal geBonusByuid(Long uid, Integer dateType, Integer hbType, Integer moneyState) {
+ BigDecimal money = hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, hbType, null, null, moneyState, null, null, null);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
@Override
public BigDecimal getRewardMoneyByToSearch(Long uid, Integer dateType, Integer orderType, Integer orderState,
@@ -366,4 +172,31 @@
startTime, endTime, listSource);
}
+
+ @Override
+ public BigDecimal sumMoneyArrivalByUidAndNearDay(Long uid, int day) {
+ return hongBaoV2CountMapper.sumMoneyArrivalByUidAndNearDay(uid, day);
+ }
+
+
+ @Override
+ public BigDecimal sumMoneyBySettleTimeAndUid(Long uid, Date minDate, Date maxDate) {
+ BigDecimal money = hongBaoV2CountMapper.sumMoneyBySettleTimeAndUid(uid, minDate, maxDate);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+ @Override
+ public BigDecimal sumMoneyByANotSettleAndUid(Long uid) {
+ BigDecimal money = hongBaoV2CountMapper.sumMoneyByANotSettleAndUid(uid);
+ if (money == null) {
+ money = new BigDecimal(0);
+ }
+ return money;
+ }
+
+
+
}
--
Gitblit v1.8.0