From d0da0aa5e01dd73b7fca8e59ff2664d7e6076802 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 24 六月 2020 10:09:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/count/HongBaoV2CountServiceImpl.java | 364 +++++++++++++++++++--------------------------------
1 files changed, 137 insertions(+), 227 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 d288c7f..ada4f71 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,249 +1,35 @@
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.HashMap;
import java.util.List;
-import java.util.Map;
import javax.annotation.Resource;
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.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
public class HongBaoV2CountServiceImpl implements HongBaoV2CountService {
+
+
@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<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>>();
-
- if (startTime.equals(endTime)) {
-
- Map<String, Object> map = list.get(0);
- Object total = map.get("showValue");
- if (total == null) {
- map.put("showValue", 0);
- }
- listObject.add(map);
- return listObject;
- }
-
- String plusDay = "";
- for (int i = 0; i < 1000; i++) {
- if (i == 0) {
- plusDay = startTime;
- } else {
- plusDay = DateUtil.plusDay(i, startTime);
- }
-
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
- for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
- if (plusDay.equalsIgnoreCase(month)) {
- total = map.get("showValue");
- break;
- }
- }
-
- if (total == null) {
- total = 0;
- }
- mapObject.put("showValue", total);
-
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy/MM/dd");
- Date parseDate = sdf.parse(plusDay.toString());
-
- mapObject.put("showDate", sdf2.format(parseDate));
-
- listObject.add(mapObject);
-
- if (plusDay.equals(endTime)) {
- break; // 鏃堕棿缁撴潫
- }
- }
-
- return listObject;
- }
-
- public List<Map<String, Object>> monthFactory(List<Map<String, Object>> list) {
-
- List<Map<String, Object>> listObject = new ArrayList<Map<String, Object>>();
- // 12 涓湀澶勭悊
- for (int i = 1; i <= 12; i++) {
- Map<String, Object> mapObject = new HashMap<String, Object>();
- Object total = null;
-
- for (int j = 0; j < list.size(); j++) {
- Map<String, Object> map = list.get(j);
- Object createDate = map.get("showDate");
- String month = createDate.toString();
- if ((i + "").equalsIgnoreCase(month) || i == Integer.parseInt(month)) {
- total = map.get("showValue");
- break;
- }
- }
-
- if (total == null) {
- total = 0;
- }
- mapObject.put("showValue", total);
-
- mapObject.put("showDate", 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>>();
-
- 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;
- }
- map.put("showValue", total);
-
- listObject.add(map);
- }
-
- return listObject;
- }
-
+
@Override
- 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);
+ public Long countOrderByTypeAndDate(Integer orderType, String preDay) {
+ return hongBaoV2CountMapper.countOrderByTypeAndDate(orderType, preDay);
}
-
- @Override
- 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 {
- 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 {
-
- List<Map<String, Object>> result_list = null;
-
- 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);
-
- 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;
- 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;
- }
-
- break; // 缁撴潫鍐呴儴寰幆
- }
- }
-
- resultMap.put("showValue", proportion);
- }
-
- return result_list;
- }
-
+
+
@Override
public BigDecimal countMoneyByUidAndState(Long uid, Integer state) {
return hongBaoV2CountMapper.countMoneyByUidAndState(uid, state);
@@ -257,6 +43,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
@@ -274,11 +65,6 @@
return hongBaoV2CountMapper.getLastHongBaoTime(uid);
}
- @Override
- 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) {
@@ -318,4 +104,128 @@
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 countMyDirectOrderByCashArrival(Long uid, BigDecimal payment) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, null);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
+ @Override
+ public long countMyDirectOrderByCashArrival(Long uid, BigDecimal payment, Integer type) {
+ Long count = hongBaoV2CountMapper.countMyDirectOrderByCashArrival(uid, payment, type);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+
+ @Override
+ public BigDecimal getRewardMoneyToCount(Long uid, Integer dateType, Integer hbType, List<Integer> 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,
+ String orderNo, Integer moneyState, String startTime, String endTime, List<Integer> listSource) {
+ return hongBaoV2CountMapper.getRewardMoneyByDate(uid, dateType, orderType, orderState, orderNo, moneyState,
+ 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;
+ }
+
+ @Override
+ public long countOrderByCashArrival(Long uid, BigDecimal payment, Integer type, Integer dateType) {
+ Long count = hongBaoV2CountMapper.countOrderByCashArrival(uid, payment, type, dateType);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
+ @Override
+ public long countOrderByCashNotArrival(Long uid, BigDecimal payment, Integer type, Integer dateType) {
+ Long count = hongBaoV2CountMapper.countOrderByCashNotArrival(uid, payment, type, dateType);
+ if (count == null) {
+ count = 0L;
+ }
+ return count;
+ }
+
}
--
Gitblit v1.8.0