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/hongbao/HongBaoV2ServiceImpl.java | 140 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 124 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
index ca7ce6f..f6f1a96 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java
@@ -175,7 +175,6 @@
if (hasAdd) {
Iterator<Integer> its = notificationMap.keySet().iterator();
while (its.hasNext()) {
-
Integer t = its.next();
HongBaoV2 notify = notificationMap.get(t).getHongBaoV2();
CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();
@@ -184,8 +183,6 @@
BigDecimal money = notify.getMoney();
switch (t) {
case HongBaoV2.TYPE_ZIGOU:
- userNotificationService.orderFanliStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,
- null, money);
userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, commonOrder.getPayment(),
money, goodsCount, state);
break;
@@ -206,6 +203,11 @@
MsgOrderDetail.STATE_FK, null, money);
userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, commonOrder.getPayment(),
money, goodsCount, state);
+ break;
+
+ case HongBaoV2.TYPE_SHARE_YIJI:
+ userOrderMsgNotificationService.orderShareFirstLevelStatistic(uid, orderId,
+ commonOrder.getPayment(), money, goodsCount, state, notify.getBeizhu());
break;
}
}
@@ -239,6 +241,9 @@
userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, commonOrder.getPayment(),
money, state);
break;
+ case HongBaoV2.TYPE_SHARE_YIJI:
+ userOrderMsgNotificationService.orderShareFirstLevelStateChanged(uid, orderId,
+ commonOrder.getPayment(), money, state);
}
}
}
@@ -267,7 +272,7 @@
HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
if (oldHongBao == null)
throw new HongBaoException(10, "绾㈠寘瀵硅薄涓嶅瓨鍦�");
- // 宸茬粡澶辨晥鎴栬�呭凡缁忛鍙栫殑绾㈠寘涓嶅仛澶勭悊
+ // 宸茬粡澶辨晥锛屽凡缁忛鍙栵紝鏂拌�佺姸鎬佷竴鑷寸殑绾㈠寘涓嶅仛澶勭悊
if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)
return;
@@ -307,6 +312,14 @@
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
+
+ }
+
+ // 鏂拌�佺孩鍖呯姸鎬佷竴鑷翠笉澶勭悊
+ if (oldHongBao.getState().intValue() == hongBao.getState())
+ return;
+
+ if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
if (mianDan) {
try {
userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
@@ -316,6 +329,7 @@
}
}
}
+
hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);
// 鍔犲叆閫氱煡
@@ -338,7 +352,7 @@
// 鑾峰彇瀛愮孩鍖�
List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());
- if (children != null&&children.size()>0)
+ if (children != null && children.size() > 0)
for (HongBaoV2 child : children) {
HongBaoV2 childUpdate = new HongBaoV2(child.getId());
childUpdate.setState(hongBao.getState());
@@ -390,7 +404,7 @@
else {// 淇涔嬪墠浜岀骇,涓夌骇璁㈠崟鏈粺璁″埌鐨勬儏鍐�
if (!mianDan) {
ThreeSale threeSale = threeSaleSerivce.selectByWorkerId(commonOrder.getUserInfo().getId());
- if (threeSale.getSucceedTime() != null
+ if (threeSale != null && threeSale.getSucceedTime() != null
&& threeSale.getSucceedTime() <= commonOrder.getThirdCreateTime().getTime()) {
UserInfo boss = threeSaleSerivce.getBoss(commonOrder.getUserInfo().getId());
// 鎻掑叆涓�绾у瓙绾㈠寘
@@ -548,17 +562,20 @@
childUpdate.setUpdateTime(new Date());
BigDecimal rate = null;
if (child.getType() == HongBaoV2.TYPE_SHARE_YIJI) {// 涓�绾у垎浜禋
- rate = hongBaoManageService.getFirstShareRate(child.getUrank(),
- commonOrder.getCreateTime().getTime());
+ rate = hongBaoManageService.getFirstShareRate(1, commonOrder.getCreateTime().getTime());
} else if (child.getType() == HongBaoV2.TYPE_SHARE_ERJI) {// 浜岀骇鍒嗕韩璧�
- rate = hongBaoManageService.getSecondShareRate(child.getUrank(),
- commonOrder.getCreateTime().getTime());
+ rate = hongBaoManageService.getSecondShareRate(1, commonOrder.getCreateTime().getTime());
}
// 浠ュ疄闄呮敹鍏ヤ负鍑嗚绠楅浼版敹鐩�
if (CommonOrder.STATE_JS == commonOrder.getState()) {
childUpdate.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), rate.divide(new BigDecimal(100))));
+ if (commonOrder.getThirdCreateTime().getTime() > TimeUtil.convertToTimeTemp("2019-04-16",
+ "yyyy-MM-dd"))
+ childUpdate.setMoney(MoneyBigDecimalUtil.mul(commonOrder.geteIncome(),
+ rate.divide(new BigDecimal(100))));
+
Calendar calendar = Calendar.getInstance();
calendar.setTime(commonOrder.getSettleTime());
calendar.add(Calendar.MONTH, 1);
@@ -566,13 +583,36 @@
calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-25",
"yyyy-M-dd")));
} else if (CommonOrder.STATE_FK == commonOrder.getState()) {
- if (commonOrder.getOrderNo().equalsIgnoreCase("314134177659155087"))
- System.out.println("");
-
- childUpdate.setMoney(
- MoneyBigDecimalUtil.mul(hongBao.getMoney(), rate.divide(new BigDecimal(100))));
+ if (commonOrder.getThirdCreateTime().getTime() > TimeUtil.convertToTimeTemp("2019-04-16",
+ "yyyy-MM-dd"))
+ childUpdate.setMoney(MoneyBigDecimalUtil.mul(commonOrder.getEstimate(),
+ rate.divide(new BigDecimal(100))));
+ else
+ childUpdate.setMoney(
+ MoneyBigDecimalUtil.mul(hongBao.getMoney(), rate.divide(new BigDecimal(100))));
}
hongBaoV2Mapper.updateByPrimaryKeySelective(childUpdate);
+ // 娣诲姞閫氱煡
+ if (notificationMap.get(child.getType()) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(child.getId());
+ tempHongBao.setUserInfo(child.getUserInfo());
+ tempHongBao
+ .setMoney(childUpdate.getMoney() == null ? new BigDecimal(0) : childUpdate.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(child.getType(), new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(child.getType());
+ if (commonOrder.getPayment() != null)
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ if (childUpdate.getMoney() != null)
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(childUpdate.getMoney()));
+ notificationMap.put(child.getType(), tempHongBaoOrder);
+ }
+
}
} else
throw new HongBaoException(2, "type閿欒");
@@ -698,6 +738,10 @@
firstHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));
}
+ // 杩斿埄涓�0鐨勪笉閫氱煡
+ if (firstHongbao.getMoney() == null || firstHongbao.getMoney().compareTo(new BigDecimal(0)) <= 0)
+ return;
+
hongBaoV2Mapper.insertSelective(firstHongbao);
// 鐢ㄦ埛閫氱煡
if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {
@@ -745,6 +789,11 @@
secondHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
}
+
+ // 杩斿埄涓�0鐨勪笉缁熻
+ if (secondHongbao.getMoney() == null || secondHongbao.getMoney().compareTo(new BigDecimal(0)) <= 0)
+ return;
+
hongBaoV2Mapper.insertSelective(secondHongbao);
// 鐢ㄦ埛閫氱煡
@@ -802,7 +851,6 @@
}
}
}
-
}
HongBaoV2 hongBao = new HongBaoV2();
@@ -849,6 +897,56 @@
tempHongBaoOrder.getHongBaoV2()
.setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(hongBao.getMoney()));
notificationMap.put(type, tempHongBaoOrder);
+ }
+
+ // 4鏈�17鏃ュ悗鎵嶆湁涓�绾у垎浜禋
+ if (commonOrder.getThirdCreateTime().getTime() > TimeUtil.convertToTimeTemp("2019-04-17", "yyyy-MM-dd")) {
+ UserInfo boss = threeSaleSerivce.getBoss(hongBao.getUserInfo().getId());
+ if (boss != null) {
+ BigDecimal firstLevelRate = hongBaoManageService.getFirstShareRate(1,
+ commonOrder.getThirdCreateTime().getTime());
+ HongBaoV2 child = new HongBaoV2();
+ child.setParent(hongBao);
+ child.setType(HongBaoV2.TYPE_SHARE_YIJI);
+ if (commonOrder.getState() == CommonOrder.STATE_FK) {
+ child.setState(HongBaoV2.STATE_BUKELINGQU);
+ child.setMoney(MoneyBigDecimalUtil.mul(commonOrder.getEstimate(),
+ firstLevelRate.divide(new BigDecimal(100))));
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ child.setState(HongBaoV2.STATE_KELINGQU);
+ child.setMoney(MoneyBigDecimalUtil.mul(commonOrder.geteIncome(),
+ firstLevelRate.divide(new BigDecimal(100))));
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(commonOrder.getSettleTime());
+ calendar.add(Calendar.MONTH, 1);
+ child.setPreGetTime(new Date(TimeUtil.convertToTimeTemp(
+ calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-25",
+ "yyyy-M-dd")));
+ }
+ child.setUserInfo(boss);
+ child.setUrank(boss.getRank());
+ child.setVersion(2);
+ child.setCreateTime(new Date());
+ hongBaoV2Mapper.insertSelective(child);
+ // 娣诲姞閫氱煡
+ if (notificationMap.get(HongBaoV2.TYPE_SHARE_YIJI) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(child.getId());
+ tempHongBao.setUserInfo(child.getUserInfo());
+ tempHongBao.setMoney(child.getMoney());
+ tempHongBao.setBeizhu(hongBao.getUserInfo().getNickName());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(HongBaoV2.TYPE_SHARE_YIJI, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_SHARE_YIJI);
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(child.getMoney()));
+ notificationMap.put(HongBaoV2.TYPE_SHARE_YIJI, tempHongBaoOrder);
+ }
+ }
}
// 淇敼缁熻鏁版嵁
@@ -943,4 +1041,14 @@
else
return money;
}
+
+ @Override
+ public List<HongBaoV2> listChildrenById(Long id) {
+ return hongBaoV2Mapper.listChildrenById(id);
+ }
+
+ @Override
+ public List<Long> getUidByNear30DayShareSucceed() {
+ return hongBaoV2Mapper.getUidByNear30DayShareSucceed();
+ }
}
--
Gitblit v1.8.0