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/order/HongBaoV2ServiceImpl.java | 245 +++++++++++++++++++++++++++++++++----------------
1 files changed, 165 insertions(+), 80 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
index 546e4b6..7c88661 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java
@@ -13,6 +13,7 @@
import javax.annotation.Resource;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,23 +34,25 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.HongBaoOrder;
import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
import com.yeshi.fanli.exception.order.HongBaoException;
import com.yeshi.fanli.exception.order.ShareGoodsActivityOrderException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
+import com.yeshi.fanli.exception.user.UserAccountException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.config.ConfigService;
-import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
import com.yeshi.fanli.service.inter.order.HongBaoV2Service;
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
import com.yeshi.fanli.service.inter.order.config.HongBaoManageService;
import com.yeshi.fanli.service.inter.order.msg.UserOrderMsgNotificationService;
-import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;
import com.yeshi.fanli.service.inter.user.UserSystemCouponService;
+import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
@@ -107,6 +110,7 @@
@Resource
private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+ @Lazy
@Resource
private UserSystemCouponService userSystemCouponService;
@@ -143,9 +147,9 @@
return hongBaoV2Mapper.selectByPrimaryKey(id);
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
@Override
- public void addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException {
+ public int addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException, UserAccountException {
Set<Integer> stateSet = new HashSet<>();// 璁㈠崟鐘舵�丼et
if (commonOrderList != null && commonOrderList.size() > 0) {
int orderType = commonOrderList.get(0).getSourceType();
@@ -153,6 +157,7 @@
Map<Integer, HongBaoOrder> notificationMap = new HashMap<>();
int goodsCount = 0;
boolean hasAdd = false;
+ boolean hasUpdate = false;
for (CommonOrder commonOrder : commonOrderList) {
stateSet.add(commonOrder.getState());
goodsCount += commonOrder.getCount();
@@ -163,9 +168,12 @@
saveHongBao(commonOrder, type, notificationMap);
hasAdd = true;
} else {
- updateHongBao(hongBaoOrder, commonOrder, type, notificationMap);
+ boolean update = updateHongBao(hongBaoOrder, commonOrder, type, notificationMap);
+ if (update)
+ hasUpdate = true;
}
}
+
/**
* 閫氱煡鐢ㄦ埛鐨勮繑鍒╂儏鍐�
*/
@@ -242,8 +250,17 @@
}
}
}
- }
+ int resultCode = 0;
+ if (hasAdd && hasUpdate)
+ return 12;
+ else if (hasAdd)
+ return 1;
+ else if (hasUpdate)
+ return 2;
+ return resultCode;
+ }
+ return 0;
}
private int getOrderState(Set<Integer> states) {
@@ -260,16 +277,17 @@
return CommonOrder.STATE_SX;
}
- @Transactional
- private void updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,
- Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException {
+ @Transactional(rollbackFor=Exception.class)
+ private boolean updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,
+ Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException, UserAccountException {
System.out.println(commonOrder.getOrderNo());
- HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
+ // 閿佽
+ HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(hongBaoOrder.getHongBaoV2().getId());
if (oldHongBao == null)
throw new HongBaoException(10, "绾㈠寘瀵硅薄涓嶅瓨鍦�");
// 宸茬粡澶辨晥锛屽凡缁忛鍙栵紝鏂拌�佺姸鎬佷竴鑷寸殑绾㈠寘涓嶅仛澶勭悊
if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)
- return;
+ return false;
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
@@ -297,7 +315,8 @@
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
if (mianDan)
hongBao.setMoney(commonOrder.getPayment());
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS
+ || commonOrder.getState() == CommonOrder.STATE_WQ) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
@@ -316,7 +335,7 @@
// 鏂拌�佺孩鍖呯姸鎬佷竴鑷翠笉澶勭悊
if (oldHongBao.getState().intValue() == hongBao.getState())
- return;
+ return false;
if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
if (mianDan) {
@@ -353,6 +372,9 @@
List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());
if (children != null && children.size() > 0)
for (HongBaoV2 child : children) {
+ if (child.getState() == HongBaoV2.STATE_YILINGQU)
+ continue;
+
HongBaoV2 childUpdate = new HongBaoV2(child.getId());
childUpdate.setState(hongBao.getState());
childUpdate.setUpdateTime(new Date());
@@ -410,7 +432,7 @@
BigDecimal firstRate = hongBaoManageService
.getFirstInviteRate(boss.getRank() == null ? 0 : boss.getRank());
if (firstRate.compareTo(new BigDecimal(0)) <= 0)
- return;
+ return true;
HongBaoV2 firstHongbao = new HongBaoV2();
firstHongbao.setUserInfo(boss);
firstHongbao.setUrank(boss.getRank());
@@ -419,6 +441,7 @@
firstHongbao.setType(HongBaoV2.TYPE_YIJI);
firstHongbao.setVersion(2);
firstHongbao.setState(hongBao.getState());
+ firstHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
firstHongbao.setMoney(
@@ -432,24 +455,31 @@
} else if (hongBao.getState() == HongBaoV2.STATE_BUKELINGQU) {
firstHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));
+ } else if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO) {
+ firstHongbao.setMoney(new BigDecimal(0));
}
- hongBaoV2Mapper.insertSelective(firstHongbao);
- // 鐢ㄦ埛閫氱煡
- if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {
- HongBaoV2 tempHongBao = new HongBaoV2(firstHongbao.getId());
- tempHongBao.setUserInfo(firstHongbao.getUserInfo());
- tempHongBao.setMoney(firstHongbao.getMoney());
- CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
- tempCommonOrder.setPayment(commonOrder.getPayment());
- notificationMap.put(HongBaoV2.TYPE_YIJI, new HongBaoOrder(tempCommonOrder, tempHongBao));
- } else {
- // 澧炲姞浠樻閲戦涓庤祫閲�
- HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_YIJI);
- tempHongBaoOrder.getCommonOrder().setPayment(
- tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
- tempHongBaoOrder.getHongBaoV2()
- .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(firstHongbao.getMoney()));
- notificationMap.put(HongBaoV2.TYPE_YIJI, tempHongBaoOrder);
+
+ if (firstHongbao.getMoney() != null
+ && firstHongbao.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ hongBaoV2Mapper.insertSelective(firstHongbao);
+ // 鐢ㄦ埛閫氱煡
+ if (notificationMap.get(HongBaoV2.TYPE_YIJI) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(firstHongbao.getId());
+ tempHongBao.setUserInfo(firstHongbao.getUserInfo());
+ tempHongBao.setMoney(firstHongbao.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(HongBaoV2.TYPE_YIJI,
+ new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_YIJI);
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2().setMoney(
+ tempHongBaoOrder.getHongBaoV2().getMoney().add(firstHongbao.getMoney()));
+ notificationMap.put(HongBaoV2.TYPE_YIJI, tempHongBaoOrder);
+ }
}
// 鎻掑叆浜岀骇瀛愮孩鍖�
@@ -458,7 +488,7 @@
BigDecimal secondRate = hongBaoManageService
.getSecondInviteRate(boss.getRank() == null ? 0 : boss.getRank());
if (secondRate.compareTo(new BigDecimal(0)) <= 0)
- return;
+ return true;
HongBaoV2 secondHongbao = new HongBaoV2();
secondHongbao.setUserInfo(boss);
secondHongbao.setUrank(boss.getRank());
@@ -467,6 +497,7 @@
secondHongbao.setType(HongBaoV2.TYPE_ERJI);
secondHongbao.setVersion(2);
secondHongbao.setState(hongBao.getState());
+ secondHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
secondHongbao.setMoney(MoneyBigDecimalUtil.mul(hongBao.getMoney(),
secondRate.divide(new BigDecimal(100))));
@@ -479,26 +510,29 @@
} else if (hongBao.getState() == HongBaoV2.STATE_BUKELINGQU) {
secondHongbao.setMoney(MoneyBigDecimalUtil.mul(hongBao.getMoney(),
secondRate.divide(new BigDecimal(100))));
- }
- hongBaoV2Mapper.insertSelective(secondHongbao);
-
- // 鐢ㄦ埛閫氱煡
- if (notificationMap.get(HongBaoV2.TYPE_ERJI) == null) {
- HongBaoV2 tempHongBao = new HongBaoV2(secondHongbao.getId());
- tempHongBao.setUserInfo(secondHongbao.getUserInfo());
- tempHongBao.setMoney(secondHongbao.getMoney());
- CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
- tempCommonOrder.setPayment(commonOrder.getPayment());
- notificationMap.put(HongBaoV2.TYPE_ERJI,
- new HongBaoOrder(tempCommonOrder, tempHongBao));
- } else {
- // 澧炲姞浠樻閲戦涓庤祫閲�
- HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_ERJI);
- tempHongBaoOrder.getCommonOrder().setPayment(
- tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
- tempHongBaoOrder.getHongBaoV2().setMoney(
- tempHongBaoOrder.getHongBaoV2().getMoney().add(secondHongbao.getMoney()));
- notificationMap.put(HongBaoV2.TYPE_ERJI, tempHongBaoOrder);
+ } else if (hongBao.getState() == HongBaoV2.STATE_SHIXIAO)
+ secondHongbao.setMoney(new BigDecimal(0));
+ if (secondHongbao.getMoney() != null
+ && secondHongbao.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ hongBaoV2Mapper.insertSelective(secondHongbao);
+ // 鐢ㄦ埛閫氱煡
+ if (notificationMap.get(HongBaoV2.TYPE_ERJI) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(secondHongbao.getId());
+ tempHongBao.setUserInfo(secondHongbao.getUserInfo());
+ tempHongBao.setMoney(secondHongbao.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(HongBaoV2.TYPE_ERJI,
+ new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(HongBaoV2.TYPE_ERJI);
+ tempHongBaoOrder.getCommonOrder().setPayment(tempHongBaoOrder.getCommonOrder()
+ .getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2().setMoney(
+ tempHongBaoOrder.getHongBaoV2().getMoney().add(secondHongbao.getMoney()));
+ notificationMap.put(HongBaoV2.TYPE_ERJI, tempHongBaoOrder);
+ }
}
}
}
@@ -525,7 +559,8 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS
+ || commonOrder.getState() == CommonOrder.STATE_WQ) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
@@ -561,6 +596,9 @@
List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());
if (children != null)
for (HongBaoV2 child : children) {
+ if (child.getState() == HongBaoV2.STATE_YILINGQU)
+ continue;
+
HongBaoV2 childUpdate = new HongBaoV2(child.getId());
// 缁熶竴璁剧疆鐘舵��
childUpdate.setState(hongBao.getState());
@@ -573,7 +611,8 @@
}
// 浠ュ疄闄呮敹鍏ヤ负鍑嗚绠楅浼版敹鐩�
- if (CommonOrder.STATE_JS == commonOrder.getState()) {
+ if (CommonOrder.STATE_JS == commonOrder.getState()
+ || CommonOrder.STATE_WQ == commonOrder.getState()) {
childUpdate.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), rate.divide(new BigDecimal(100))));
if (commonOrder.getThirdCreateTime().getTime() > TimeUtil.convertToTimeTemp("2019-04-16",
@@ -621,11 +660,13 @@
}
} else
throw new HongBaoException(2, "type閿欒");
+
+ return true;
}
- @Transactional
+ @Transactional(rollbackFor=Exception.class)
private void saveHongBao(CommonOrder commonOrder, int type, Map<Integer, HongBaoOrder> notificationMap)
- throws HongBaoException {
+ throws HongBaoException, UserAccountException {
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
// 鏌ヨ鏄惁鏈夊厤鍗曡鍒�
@@ -641,7 +682,6 @@
CommonOrderGoods goods = commonOrderGoodsMapper
.selectByPrimaryKey(commonOrder.getCommonOrderGoods().getId());
if (goods != null) {
-
try {
if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
@@ -672,7 +712,8 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS
+ || CommonOrder.STATE_WQ == commonOrder.getState()) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
@@ -692,7 +733,10 @@
hongBao.setMoney(mianDanMoney);
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
+ if (user == null)
+ throw new UserAccountException(1001, "鐢ㄦ埛涓嶅瓨鍦�/琚皝绂�");
hongBao.setUrank(user.getRank());
+ hongBao.setOrderType(commonOrder.getSourceType());
hongBaoV2Mapper.insertSelective(hongBao);
// 娣诲姞绾㈠寘涓庤鍗曠殑鏄犲皠
HongBaoOrder hongBaoOrder = new HongBaoOrder();
@@ -734,6 +778,7 @@
firstHongbao.setType(HongBaoV2.TYPE_YIJI);
firstHongbao.setVersion(2);
firstHongbao.setState(hongBao.getState());
+ firstHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
firstHongbao.setMoney(
@@ -786,6 +831,7 @@
secondHongbao.setType(HongBaoV2.TYPE_ERJI);
secondHongbao.setVersion(2);
secondHongbao.setState(hongBao.getState());
+ secondHongbao.setOrderType(commonOrder.getSourceType());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
secondHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
@@ -840,7 +886,7 @@
shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
// 鍒ゆ柇璁㈠崟鍒嗕韩娲诲姩鏄惁寮�鍚�
- if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {
+ if ("1".equalsIgnoreCase(configService.get(ConfigKeyEnum.shareGoodsActivityOpen.getKey()))) {
// 娌℃湁璁㈠崟锛屽苟涓旀槸娓犻亾ID鏉ョ殑锛屽苟涓�
UserExtraTaoBaoInfo taoBaoExtraInfo = userExtraTaoBaoInfoService
.getByUid(commonOrder.getUserInfo().getId());
@@ -876,7 +922,8 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), shareRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS
+ || commonOrder.getState() == CommonOrder.STATE_WQ) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), shareRate.divide(new BigDecimal(100))));
@@ -887,8 +934,11 @@
calendar.get(Calendar.YEAR) + "-" + (calendar.get(Calendar.MONTH) + 1) + "-25", "yyyy-M-dd")));
}
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
+ if (user == null)
+ throw new UserAccountException(1001, "鐢ㄦ埛涓嶅瓨鍦�/琚皝绂�");
hongBao.setUrank(user.getRank());
hongBao.setUserInfo(user);
+ hongBao.setOrderType(commonOrder.getSourceType());
hongBaoV2Mapper.insertSelective(hongBao);
// 鎻掑叆绾㈠寘涓庤鍗曟槧灏�
HongBaoOrder hongBaoOrder = new HongBaoOrder();
@@ -927,7 +977,8 @@
child.setState(HongBaoV2.STATE_BUKELINGQU);
child.setMoney(MoneyBigDecimalUtil.mul(commonOrder.getEstimate(),
firstLevelRate.divide(new BigDecimal(100))));
- } else if (commonOrder.getState() == CommonOrder.STATE_JS) {
+ } else if (commonOrder.getState() == CommonOrder.STATE_JS
+ || commonOrder.getState() == CommonOrder.STATE_WQ) {
child.setState(HongBaoV2.STATE_KELINGQU);
child.setMoney(MoneyBigDecimalUtil.mul(commonOrder.geteIncome(),
firstLevelRate.divide(new BigDecimal(100))));
@@ -942,24 +993,28 @@
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);
+ child.setOrderType(commonOrder.getSourceType());
+ if (child.getMoney() != null && child.getMoney().compareTo(new BigDecimal(0)) > 0) {
+ 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);
+ }
}
}
}
@@ -984,7 +1039,6 @@
e1.printStackTrace();
}
}
-
} else
throw new HongBaoException(2, "type閿欒");
}
@@ -1063,6 +1117,13 @@
}
@Override
+ public List<HongBaoV2> listChildrenByIds(List<Long> idList) {
+ if (idList == null || idList.size() == 0)
+ return null;
+ return hongBaoV2Mapper.listChildrenByIds(idList);
+ }
+
+ @Override
public List<Long> getUidByNear30DayShareSucceed() {
return hongBaoV2Mapper.getUidByNear30DayShareSucceed();
}
@@ -1099,4 +1160,28 @@
return null;
return hongBaoV2Mapper.listBySourceTypeAndTradeIdListAndUid(sourceType, uid, tradeIdList);
}
+
+ @Override
+ public HongBaoV2 getFirstValidHongBaoByTypeAndUid(List<Integer> typeList, Long uid) {
+ List<Integer> stateList = new ArrayList<>();
+ stateList.add(HongBaoV2.STATE_BUKELINGQU);
+ stateList.add(HongBaoV2.STATE_KELINGQU);
+ stateList.add(HongBaoV2.STATE_YILINGQU);
+ List<HongBaoV2> hongBaoV2List = hongBaoV2Mapper.listByStateAndTypeAndUid(stateList, typeList, uid, 0, 1);
+ if (hongBaoV2List != null && hongBaoV2List.size() > 0)
+ return hongBaoV2List.get(0);
+ return null;
+ }
+
+ @Override
+ public List<HongBaoV2> listByIds(List<Long> idList) {
+ return hongBaoV2Mapper.listByIds(idList);
+ }
+
+
+ @Override
+ public List<HongBaoDTO> listByOrderTradeId(String tradeId) {
+ return hongBaoV2Mapper.listByOrderTradeId(tradeId);
+ }
+
}
--
Gitblit v1.8.0