From f4b0bb5dfda8f21409b9eb0b2ee6e436c87475e3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 26 十二月 2018 15:52:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java | 203 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 154 insertions(+), 49 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
index 1e2fae5..2ab204d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java
@@ -23,6 +23,7 @@
import com.yeshi.fanli.dao.mybatis.ThreeSaleGiftMapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
+import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderItemMapper;
import com.yeshi.fanli.dao.mybatis.order.OrderMapper;
import com.yeshi.fanli.dao.mybatis.share.PidUserMapper;
@@ -34,6 +35,7 @@
import com.yeshi.fanli.entity.bus.user.Order;
import com.yeshi.fanli.entity.bus.user.OrderItem;
import com.yeshi.fanli.entity.bus.user.UserInfo;
+import com.yeshi.fanli.entity.money.UserMoneyDetail;
import com.yeshi.fanli.entity.taobao.PidOrder;
import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
@@ -44,7 +46,10 @@
import com.yeshi.fanli.exception.ObjectStateException;
import com.yeshi.fanli.exception.OrderItemException;
import com.yeshi.fanli.exception.TaoBaoWeiQuanException;
+import com.yeshi.fanli.exception.money.UserMoneyDetailException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;
+import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
import com.yeshi.fanli.service.inter.order.LostOrderService;
import com.yeshi.fanli.service.inter.order.OrderItemServcie;
@@ -62,6 +67,7 @@
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
import com.yeshi.fanli.util.factory.AccountDetailsFactory;
+import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@Service
@@ -135,6 +141,15 @@
@Resource
private TaoBaoWeiQuanOrderMapper taoBaoWeiQuanOrderMapper;
+
+ @Resource
+ private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private AccountDetailsHongBaoMapService accountDetailsHongBaoMapService;
+
+ @Resource
+ private UserMoneyDetailMapper userMoneyDetailMapper;
@Override
public void processOrder(Map<String, List<TaoBaoOrder>> orders) {
@@ -417,7 +432,7 @@
orderMapper.updateByPrimaryKeySelective(updateOrder);
Order order = oldOrder;
// 璁㈠崟杩斿埄姣斾緥
- BigDecimal rate = new BigDecimal(hongBaoManageMapper.selectByKey("hongbao_goods_proportion").getValue());
+ BigDecimal rate = hongBaoManageService.getFanLiRate();
// 鏌ユ壘鏄惁瀛樺湪绾㈠寘
List<HongBao> hongBaoList = hongBaoMapper.selectByOid(order.getId());
@@ -500,6 +515,23 @@
AccountDetails accountDetails = AccountDetailsFactory.create("+" + hb.getMoney(),
AccountDetailsFactory.FANLI, orderItem, null, hb.getUserInfo());
accountDetailsMapper.insertSelective(accountDetails);
+
+ // 鎻掑叆鏂扮増璧勯噾鏄庣粏
+ try {
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLi(hb.getUserInfo().getId(),
+ hb.getOrderId(), 1,hb.getId(), hb.getMoney());
+ userMoneyDetail.setId(accountDetails.getId());
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e1) {
+ try {
+ LogHelper.errorDetailInfo(e1);
+ } catch (Exception e2) {
+ e2.printStackTrace();
+ }
+ }
+
+ // 娣诲姞璧勯噾鏄庣粏涓庣孩鍖呯殑鏄犲皠鍏崇郴
+ accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hb.getId(), accountDetails.getId());
// 缁存潈鎵ｆ锛�2018-08-05鍚庡紑濮嬪疄琛岋級
if (hb.getBalanceTime() != null
@@ -596,22 +628,26 @@
// 鏌ヨUID鐨勯個璇疯禋璁㈠崟
List<HongBao> hongBaoList = hongBaoMapper.selectCanBalanceHongBaoByChildHongBaoAndUid(uid);
- BigDecimal money = new BigDecimal(0);
+ List<Long> hbIdList = new ArrayList<>();
+
+ BigDecimal invitemoney = new BigDecimal(0);
// 闇�瑕佸垽鏂��娆剧殑璁㈠崟鍙�
Set<String> drawBackOrders = new HashSet<String>();
for (HongBao hongBao : hongBaoList) {
hongBao = filterWeiQuanINGHongBao(hongBao);
if (hongBao == null)
continue;
-
+
hongBao = hongBaoMapper.selectByPrimaryKeyForUpdate(hongBao.getId());
if (hongBao.getState() == HongBao.STATE_BUKELINGQU || hongBao.getState() == HongBao.STATE_KELINGQU) {
- money = money.add(hongBao.getMoney());
+ invitemoney = invitemoney.add(hongBao.getMoney());
HongBao updateHongBao = new HongBao();
updateHongBao.setId(hongBao.getId());
updateHongBao.setGetTime(System.currentTimeMillis());
updateHongBao.setState(HongBao.STATE_YILINGQU);
hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ hbIdList.add(hongBao.getId());
// 2018-08-05 杩囧悗鐨勮鍗曟墠澶勭悊缁存潈
Date balanceTime = null;
if (hongBao.getParent() != null)
@@ -627,40 +663,11 @@
}
}
}
-
+
+
+
/**
- * 澶勭悊椤剁骇鍒嗕韩璧�
- */
-
- // 鏌ヨUID鐨勫垎浜禋璁㈠崟
- List<PidOrder> pidOrderList = pidOrderMapper.getCanBalanceListByUid(uid);
- for (PidOrder pidOrder : pidOrderList) {
- HongBao hongBao = hongBaoMapper.selectByPrimaryKeyForUpdate(pidOrder.getHongBao().getId());
- hongBao = filterWeiQuanINGHongBao(hongBao);
- if (hongBao == null)
- continue;
- if (hongBao.getState() == HongBao.STATE_BUKELINGQU || hongBao.getState() == HongBao.STATE_KELINGQU) {
- money = money.add(hongBao.getMoney());
- HongBao updateHongBao = new HongBao();
- updateHongBao.setId(hongBao.getId());
- updateHongBao.setGetTime(System.currentTimeMillis());
- updateHongBao.setState(HongBao.STATE_YILINGQU);
- hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);
- // 2018-08-05 杩囧悗鐨勮鍗曟墠澶勭悊缁存潈
- Date balanceTime = null;
- if (hongBao.getParent() != null)
- balanceTime = hongBao.getParent().getBalanceTime();
- else
- balanceTime = hongBao.getBalanceTime();
- if (balanceTime != null
- && balanceTime.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
- drawBackOrders.add(pidOrder.getOrderId());
- }
- }
- }
-
- /**
- * 澶勭悊涓�绾т簩绾у垎浜禋
+ * 澶勭悊涓�绾т簩绾у垎浜禋(灞炰簬閭�璇疯禋绫诲瀷)
*/
List<HongBao> totalHongBaoList = new ArrayList<>();
@@ -675,44 +682,142 @@
if (hbList != null && hbList.size() > 0)
totalHongBaoList.addAll(hbList);
-
for (HongBao hb : totalHongBaoList) {
if (hb.getState() == HongBao.STATE_BUKELINGQU || hb.getState() == HongBao.STATE_KELINGQU) {
hb = filterWeiQuanINGHongBao(hb);
if (hb == null)
continue;
- money = money.add(hb.getMoney());
+ invitemoney = invitemoney.add(hb.getMoney());
HongBao updateHongBao = new HongBao();
updateHongBao.setId(hb.getId());
updateHongBao.setGetTime(System.currentTimeMillis());
updateHongBao.setState(HongBao.STATE_YILINGQU);
hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ hbIdList.add(hb.getId());
if (!StringUtil.isNullOrEmpty(hb.getOrderId()))
drawBackOrders.add(hb.getOrderId());
}
}
-
- /**
- * 澧炲姞鐢ㄦ埛璧勯噾璁板綍
- */
-
- if (money.compareTo(new BigDecimal(0)) > 0) {
- userInfoMapper.addHongBaoByUid(uid, money);
+
+
+
+ // 閭�璇疯禋鍒拌处
+ if (invitemoney.compareTo(new BigDecimal(0)) > 0) {
+ userInfoMapper.addHongBaoByUid(uid, invitemoney);
// 娣诲姞璁板綍
- AccountDetails accountDetails = AccountDetailsFactory.create("+" + money, AccountDetailsFactory.TICHENG,
- null, null, new UserInfo(uid));
+ AccountDetails accountDetails = AccountDetailsFactory.create("+" + invitemoney,
+ AccountDetailsFactory.TICHENG, null, null, new UserInfo(uid));
accountDetailsMapper.insertSelective(accountDetails);
+
+ // 娣诲姞鏂扮増璇︽儏璁板綍
+ try {
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, 0, 0, 0, invitemoney,
+ new Date());
+ userMoneyDetail.setId(accountDetails.getId());
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+
+ // 璁板綍杩斿埄绾㈠寘涓庤祫閲戣鎯呯殑瀵瑰簲鍏崇郴
+
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, accountDetails.getId());
// 鍙戦�佹帹閫�
try {
// 鎻愭垚鍒拌处娑堟伅閫氱煡
- userNotificationService.tiChengRecieved(uid, money);
+ userNotificationService.tiChengInviteRecieved(uid, invitemoney);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ for (String orderId : drawBackOrders)
+ taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);
+ }
+
+ hbIdList.clear();
+ drawBackOrders.clear();
+
+ /**
+ * 澶勭悊鍒嗕韩璧�
+ */
+ BigDecimal sharemoney = new BigDecimal(0);
+ // 鏌ヨUID鐨勫垎浜禋璁㈠崟
+ List<PidOrder> pidOrderList = pidOrderMapper.getCanBalanceListByUid(uid);
+ for (PidOrder pidOrder : pidOrderList) {
+ HongBao hongBao = hongBaoMapper.selectByPrimaryKeyForUpdate(pidOrder.getHongBao().getId());
+ hongBao = filterWeiQuanINGHongBao(hongBao);
+ if (hongBao == null)
+ continue;
+ if (hongBao.getState() == HongBao.STATE_BUKELINGQU || hongBao.getState() == HongBao.STATE_KELINGQU) {
+ sharemoney = sharemoney.add(hongBao.getMoney());
+ HongBao updateHongBao = new HongBao();
+ updateHongBao.setId(hongBao.getId());
+ updateHongBao.setGetTime(System.currentTimeMillis());
+ updateHongBao.setState(HongBao.STATE_YILINGQU);
+ hongBaoMapper.updateByPrimaryKeySelective(updateHongBao);
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ hbIdList.add(hongBao.getId());
+ // 2018-08-05 杩囧悗鐨勮鍗曟墠澶勭悊缁存潈
+ Date balanceTime = null;
+ if (hongBao.getParent() != null)
+ balanceTime = hongBao.getParent().getBalanceTime();
+ else
+ balanceTime = hongBao.getBalanceTime();
+ if (balanceTime != null
+ && balanceTime.getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {
+ drawBackOrders.add(pidOrder.getOrderId());
+ }
+ }
+ }
+
+
+
+ /**
+ * 鍒嗕韩璧氬埌璐�
+ */
+
+ if (sharemoney.compareTo(new BigDecimal(0)) > 0) {
+ userInfoMapper.addHongBaoByUid(uid, sharemoney);
+ // 娣诲姞璁板綍
+ AccountDetails accountDetails = AccountDetailsFactory.create("+" + sharemoney,
+ AccountDetailsFactory.SHARE_GOODS, null, null, new UserInfo(uid));
+ accountDetailsMapper.insertSelective(accountDetails);
+
+ // 娣诲姞鏂扮増璇︽儏璁板綍
+ try {
+ UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, 0, 0, 0, sharemoney,
+ new Date());
+ userMoneyDetail.setId(accountDetails.getId());
+ userMoneyDetailMapper.insert(userMoneyDetail);
+ } catch (UserMoneyDetailException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ // 璁板綍杩斿埄绾㈠寘涓庤祫閲戣鎯呯殑瀵瑰簲鍏崇郴
+
+ // 娣诲姞鍒扮孩鍖呰繑鍒╄褰曢泦鍚�
+ accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, accountDetails.getId());
+
+ // 鍙戦�佹帹閫�
+ try {
+ // 鎻愭垚鍒拌处娑堟伅閫氱煡
+ userNotificationService.tiChengShareRecieved(uid, sharemoney);
} catch (Exception e) {
e.printStackTrace();
}
for (String orderId : drawBackOrders)
taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);
}
+
}
}
--
Gitblit v1.8.0