From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java | 627 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 389 insertions(+), 238 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 19ed847..d0b324c 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
@@ -2,10 +2,13 @@
import java.math.BigDecimal;
import java.util.Calendar;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import javax.annotation.Resource;
@@ -13,7 +16,6 @@
import org.springframework.transaction.annotation.Transactional;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
-import com.yeshi.fanli.dao.mybatis.PidOrderMapper;
import com.yeshi.fanli.dao.mybatis.hongbao.HongBaoMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderGoodsMapper;
import com.yeshi.fanli.dao.mybatis.order.CommonOrderMapper;
@@ -23,28 +25,37 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;
import com.yeshi.fanli.dto.HongBaoDTO;
+import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;
import com.yeshi.fanli.entity.bus.user.HongBao;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
+import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.order.CommonOrder;
import com.yeshi.fanli.entity.order.CommonOrderGoods;
import com.yeshi.fanli.entity.order.HongBaoOrder;
-import com.yeshi.fanli.entity.taobao.PidOrder;
+import com.yeshi.fanli.entity.order.ShareGoodsActivityOrder;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
import com.yeshi.fanli.exception.HongBaoException;
+import com.yeshi.fanli.exception.order.ShareGoodsActivityOrderException;
import com.yeshi.fanli.exception.share.UserShareGoodsRecordException;
import com.yeshi.fanli.log.LogHelper;
+import com.yeshi.fanli.service.inter.config.ConfigService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoManageService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoV2Service;
import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;
+import com.yeshi.fanli.service.inter.msg.UserOrderMsgNotificationService;
import com.yeshi.fanli.service.inter.order.CommonOrderService;
+import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;
+import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;
import com.yeshi.fanli.service.inter.user.UserInfoService;
+import com.yeshi.fanli.service.inter.user.UserNotificationService;
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.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
+import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
@Service
public class HongBaoV2ServiceImpl implements HongBaoV2Service {
@@ -85,8 +96,33 @@
@Resource
private UserShareGoodsGroupService userShareGoodsGroupService;
+
@Resource
- private PidOrderMapper pidOrderMapper;
+ private HongBaoManageService hongBaoManageService;
+
+ @Resource
+ private ThreeSaleSerivce threeSaleSerivce;
+
+ @Resource
+ private UserNotificationService userNotificationService;
+
+ @Resource
+ private UserOrderMsgNotificationService userOrderMsgNotificationService;
+
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private ShareGoodsActivityOrderService shareGoodsActivityOrderService;
+
+ @Resource
+ private UserExtraTaoBaoInfoService userExtraTaoBaoInfoService;
+
+ @Resource
+ private UserSystemCouponService userSystemCouponService;
+
+ @Resource
+ private UserSystemCouponRecordService userSystemCouponRecordService;
@Override
public int insert(HongBaoV2 record) {
@@ -118,252 +154,123 @@
return hongBaoV2Mapper.selectByPrimaryKey(id);
}
- private HongBaoV2 getHongBaoV2(HongBao hb) {
- int type = hb.getType().intValue();
- HongBaoV2 v2 = new HongBaoV2(hb.getId());
- v2.setCreateTime(new Date(hb.getCreatetime()));
- if (hb.getGetTime() == null || hb.getGetTime() == 0)
- v2.setGetTime(null);
- else
- v2.setGetTime(new Date(hb.getGetTime()));
-
- v2.setMoney(hb.getMoney());
- if (hb.getParent() != null)
- v2.setParent(new HongBaoV2(hb.getParent().getId()));
-
- if (hb.getType() == HongBao.TYPE_SHARE_GOODS) {
- if (hb.getBalanceTime() != null)
- v2.setPreGetTime(new Date(hb.getPreGettime()));
- else
- v2.setPreGetTime(null);
- } else {
- if (hb.getPreGettime() == null || hb.getPreGettime() == 0)
- v2.setPreGetTime(null);
- else
- v2.setPreGetTime(new Date(hb.getPreGettime()));
- }
-
- v2.setState(hb.getState());
- if (hb.getState() == 1 && hb.getBalanceTime() != null) {
- v2.setState(HongBaoV2.STATE_KELINGQU);
- }
- v2.setType(type);
- v2.setUpdateTime(new Date(hb.getCreatetime()));
- v2.setUrank(hb.getUrank());
- v2.setUserInfo(hb.getUserInfo());
- v2.setVersion(hb.getVersion());
- return v2;
- }
@Transactional
@Override
- public void convert(HongBao hb) {
- if (hb == null || hb.getParent() != null)
- return;
-
- int type = hb.getType().intValue();
- if (type == HongBao.TYPE_TAOBAO || type == HongBao.TYPE_SHARE_GOODS) {// 鑷喘涓庡垎浜禋闇�瑕佹煡璇㈠嚭鎵�鏈夌殑璁㈠崟
- // 灞炰簬杩斿埄璁㈠崟
- String orderId = "";
- if (hb.getOrder() != null) {
- orderId = hb.getOrder().getOrderId();
- // 鏌ヨ鍚屼竴璁㈠崟鍙风殑闈炲瓙绾㈠寘
- } else
- orderId = hb.getOrderId();
-
- int count = commonOrderMapper.countByOrderNOAndOrderType(orderId, Constant.SOURCE_TYPE_TAOBAO);
-
- // 宸茬粡鎻掑叆璁㈠崟
- if (count > 0)
- return;
-
- //
-
- if (hb.getVersion() == 1) {// 寰堣�佺増鏈殑澶勭悊鏂瑰紡,宸瞙ongbao涓轰富
- if (hongBaoV2Mapper.selectByPrimaryKey(hb.getId()) != null)
- return;
- HongBaoV2 hongBaoV2 = getHongBaoV2(hb);
- hongBaoV2.setBeizhu("璁㈠崟鍙�:" + orderId);
- hongBaoV2Mapper.insert(hongBaoV2);
-
- if (hb.getHasChild())// 瀛樺湪瀛愮孩鍖�
- {
- List<HongBao> children = hongBaoMapper.selectChildHongBaoByPid(hb.getId());
- if (children != null)
- for (HongBao hongBao : children) {
- HongBaoV2 child = getHongBaoV2(hongBao);
- hongBaoV2Mapper.insert(child);
- }
+ public void addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException {
+ Set<Integer> stateSet = new HashSet<>();// 璁㈠崟鐘舵�丼et
+ if (commonOrderList != null && commonOrderList.size() > 0) {
+ Map<Integer, HongBaoOrder> notificationMap = new HashMap<>();
+ int goodsCount = 0;
+ boolean hasAdd = false;
+ for (CommonOrder commonOrder : commonOrderList) {
+ stateSet.add(commonOrder.getState());
+ goodsCount += commonOrder.getCount();
+ if (commonOrder == null || commonOrder.getId() == null || commonOrder.getUserInfo() == null)
+ throw new HongBaoException(1, "璁㈠崟淇℃伅涓嶅畬鏁�");
+ HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
+ if (hongBaoOrder == null) {
+ saveHongBao(commonOrder, type, notificationMap);
+ hasAdd = true;
+ } else {
+ updateHongBao(hongBaoOrder, commonOrder, type, notificationMap);
}
+ }
+ /**
+ * 閫氱煡鐢ㄦ埛鐨勮繑鍒╂儏鍐�
+ */
+ int state = getOrderState(stateSet);
+ if (hasAdd) {
+ Iterator<Integer> its = notificationMap.keySet().iterator();
+ while (its.hasNext()) {
- } else {// 鏂扮増鏈鐞嗘柟寮�
-
- List<HongBao> list = hongBaoMapper.selectByOrderId(orderId);
-
- if (list.size() == 0)
- list = hongBaoMapper.selectByOid(hb.getOrder().getId());
- if (list != null)
- // 鍒犻櫎瀛愮孩鍖�
- for (int i = 0; i < list.size(); i++) {
- if (list.get(i).getParent() != null) {
- list.remove(i);
- i--;
- }
-
- }
-
- if (list.size() <= 0)
- return;
- if (list.get(0).getType() == 20)
- for (HongBao hb1 : list) {
- PidOrder pidOrder = pidOrderMapper.getPidOrderByHongBaoId(hb1.getId());
- if (pidOrder != null)
- hb1.setAuctionId(pidOrder.getAuctionId());
-
- }
-
- List<TaoBaoOrder> orderList = taoBaoOrderMapper.selectTaoBaoOrderByOrderId(orderId);
-
- if (orderList == null || orderList.size() < list.size()) {
- System.out.println("绾㈠寘鏁颁笌璁㈠崟鏁颁笉瀵瑰簲");
- return;
- }
-
- // 鍔犲叆鎺掑簭鍊�
- for (int i = 0; i < orderList.size(); i++) {
- orderList.get(i).setOrderBy(i + 1);
- }
-
- // 鎸夌収auctionId,payMoney鎺掑簭
- Comparator<HongBao> cm = new Comparator<HongBao>() {
- @Override
- public int compare(HongBao o1, HongBao o2) {
- if (o1.getAuctionId().longValue() < o2.getAuctionId().longValue())
- return -3;
- else if (o1.getAuctionId().longValue() > o2.getAuctionId().longValue()) {
- return 3;
- } else {
- if (o1.getState() - o2.getState() > 0)
- return 2;
- else if (o1.getState() - o2.getState() < 0)
- return -2;
- else {
- if (o1.getPayMoney().compareTo(o2.getPayMoney()) >= 0)
- return 1;
- else
- return -1;
- }
- }
- }
- };
-
- Collections.sort(list, cm);
-
- Comparator<TaoBaoOrder> cmOrder = new Comparator<TaoBaoOrder>() {
-
- @Override
- public int compare(TaoBaoOrder o1, TaoBaoOrder o2) {
-
- if (o1.getAuctionId().longValue() < o2.getAuctionId().longValue())
- return -3;
- else if (o1.getAuctionId().longValue() > o2.getAuctionId().longValue()) {
- return 3;
- } else {
- if (o1.getPayment().compareTo(o2.getPayment()) < 0)
- return 2;
- else
- return -2;
- }
- }
- };
-
- Collections.sort(orderList, cmOrder);
-
- for (TaoBaoOrder t : orderList)
- System.out.println(t.getAuctionId());
-
- for (int i = 0; i < list.size(); i++) {
- CommonOrder commonOrder = TaoBaoOrderUtil.convert(orderList.get(i));
- CommonOrderGoods goods = new CommonOrderGoods();
- goods.setGoodsId(orderList.get(i).getAuctionId() + "");
- goods.setGoodsType(Constant.SOURCE_TYPE_TAOBAO);
- // 鍟嗗搧鏄惁宸茬粡鎻掑叆
- List<CommonOrderGoods> commonGoodsList = commonOrderGoodsMapper
- .listByGoodsIdAndGoodsType(goods.getGoodsId(), goods.getGoodsType());
- if (commonGoodsList.size() <= 0)// 涓嶅瓨鍦ㄥ氨鎻掑叆鍟嗗搧
- commonOrderGoodsMapper.insertSelective(goods);
- else
- goods.setId(commonGoodsList.get(commonGoodsList.size() - 1).getId());
- commonOrder.setCommonOrderGoods(goods);
-
- commonOrder.setUserInfo(list.get(i).getUserInfo());
- commonOrder.setCreateTime(new Date(list.get(i).getCreatetime()));
-
- // TODO 缁存潈鍒ゆ柇
- List<TaoBaoWeiQuanOrder> weiQuanList = taoBaoWeiQuanOrderMapper.selectListByOrderIdAndState(orderId,
- "缁存潈鎴愬姛");
- if (weiQuanList != null && weiQuanList.size() > 0)
- commonOrder.setState(CommonOrder.STATE_WQ);
-
- commonOrderMapper.insertSelective(commonOrder);
-
- // 鎻掑叆绾㈠寘
- HongBaoV2 hongBaoV2 = getHongBaoV2(list.get(i));
- hongBaoV2.setId(list.get(i).getId());
- hongBaoV2Mapper.insert(hongBaoV2);
-
- HongBaoOrder ho = new HongBaoOrder();
- ho.setCommonOrder(commonOrder);
- ho.setCreateTime(new Date());
- ho.setHongBaoV2(hongBaoV2);
- hongBaoOrderMapper.insertSelective(ho);
-
- if (list.get(i).getHasChild())// 瀛樺湪瀛愮孩鍖�
- {
- List<HongBao> children = hongBaoMapper.selectChildHongBaoByPid(list.get(i).getId());
- if (children != null)
- for (HongBao hongBao : children) {
- HongBaoV2 child = getHongBaoV2(hongBao);
- hongBaoV2Mapper.insert(child);
- }
+ Integer t = its.next();
+ HongBaoV2 notify = notificationMap.get(t).getHongBaoV2();
+ CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();
+ String orderId = commonOrderList.get(0).getOrderNo();
+ Long uid = notify.getUserInfo().getId();
+ 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;
+ case HongBaoV2.TYPE_SHARE_GOODS:
+ userNotificationService.orderShareStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,
+ null, money);
+ userOrderMsgNotificationService.orderShareStatistic(uid, orderId, commonOrder.getPayment(),
+ money, goodsCount, state);
+ break;
+ case HongBaoV2.TYPE_YIJI:
+ userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,
+ MsgOrderDetail.STATE_FK, null, money);
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, commonOrder.getPayment(),
+ money, goodsCount, state);
+ break;
+ case HongBaoV2.TYPE_ERJI:
+ userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,
+ MsgOrderDetail.STATE_FK, null, money);
+ userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, commonOrder.getPayment(),
+ money, goodsCount, state);
+ break;
}
}
}
- } else {// 鐩存帴鎻掑叆
+ // 娣诲姞鏂扮増鏈�氱煡
- if (type != HongBao.TYPE_ERJI && type != HongBao.TYPE_YIJI && type != HongBao.TYPE_SHARE_YIJI
- && type != HongBao.TYPE_SHARE_ERJI) {
- if (hongBaoV2Mapper.selectByPrimaryKey(hb.getId()) == null)
- hongBaoV2Mapper.insert(getHongBaoV2(hb));
+ 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();
+ String orderId = commonOrderList.get(0).getOrderNo();
+ Long uid = notify.getUserInfo().getId();
+ BigDecimal money = notify.getMoney();
+ switch (t) {
+ case HongBaoV2.TYPE_ZIGOU:
+ userOrderMsgNotificationService.orderFanLiStateChanged(uid, orderId, commonOrder.getPayment(),
+ money, state);
+ break;
+ case HongBaoV2.TYPE_SHARE_GOODS:
+ userOrderMsgNotificationService.orderShareStateChanged(uid, orderId, commonOrder.getPayment(),
+ money, state);
+ break;
+ case HongBaoV2.TYPE_YIJI:
+ userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, commonOrder.getPayment(),
+ money, state);
+ break;
+ case HongBaoV2.TYPE_ERJI:
+ userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, commonOrder.getPayment(),
+ money, state);
+ break;
+ }
+ }
}
-
}
}
- @Resource
- private HongBaoManageService hongBaoManageService;
-
- @Resource
- private ThreeSaleSerivce threeSaleSerivce;
-
- @Transactional
- @Override
- public void addHongBao(CommonOrder commonOrder, int type) throws HongBaoException {
- if (commonOrder == null || commonOrder.getId() == null || commonOrder.getUserInfo() == null)
- throw new HongBaoException(1, "璁㈠崟淇℃伅涓嶅畬鏁�");
- HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());
- if (hongBaoOrder == null) {
- saveHongBao(commonOrder, type);
- } else {
- updateHongBao(hongBaoOrder, commonOrder, type);
+ private int getOrderState(Set<Integer> states) {
+ if (states.size() == 1)
+ return states.iterator().next();
+ Iterator<Integer> its = states.iterator();
+ while (its.hasNext()) {
+ int tempState = its.next();
+ if (tempState == CommonOrder.STATE_FK)
+ return CommonOrder.STATE_FK;
+ else if (tempState == CommonOrder.STATE_JS)
+ return CommonOrder.STATE_JS;
}
-
+ return CommonOrder.STATE_SX;
}
@Transactional
- private void updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type) throws HongBaoException {
+ private void updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,
+ Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException {
System.out.println(commonOrder.getOrderNo());
HongBaoV2 oldHongBao = hongBaoV2Mapper.selectByPrimaryKey(hongBaoOrder.getHongBaoV2().getId());
if (oldHongBao == null)
@@ -374,6 +281,20 @@
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ // 鍏嶅崟澶勭悊
+ boolean mianDan = false;
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
+ commonOrder.getOrderNo());
+ if (orderList != null && orderList.size() == 1) {// 鍙湁1涓鍗曟墠鍙備笌鍏嶅崟
+ BigDecimal payMent = commonOrder.getPayment();
+ if (commonOrder.getState() == CommonOrder.STATE_JS)
+ payMent = commonOrder.getSettlement();
+
+ if (payMent.compareTo(new BigDecimal(10)) < 0) {
+ mianDan = userSystemCouponRecordService.isSuccessMianDan(commonOrder.getOrderNo());
+ }
+ }
+
HongBaoV2 hongBao = new HongBaoV2(hongBaoOrder.getHongBaoV2().getId());
hongBao.setUpdateTime(new Date());
// 鏇存敼鐘舵�佷笌璧勯噾
@@ -381,16 +302,47 @@
hongBao.setState(HongBaoV2.STATE_BUKELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.getEstimate(), fanliRate.divide(new BigDecimal(100))));
+ if (mianDan)
+ hongBao.setMoney(commonOrder.getPayment());
} else if (commonOrder.getState() == CommonOrder.STATE_JS) {
hongBao.setState(HongBaoV2.STATE_KELINGQU);
hongBao.setMoney(
MoneyBigDecimalUtil.mul(commonOrder.geteIncome(), fanliRate.divide(new BigDecimal(100))));
hongBao.setPreGetTime(new Date(commonOrder.getSettleTime().getTime() + 1000 * 60 * 60 * 24 * 15L));
+ if (mianDan)
+ hongBao.setMoney(commonOrder.getSettlement().compareTo(commonOrder.getPayment()) <= 0
+ ? commonOrder.getSettlement() : commonOrder.getPayment());// 杩斿埄缁撶畻涓庝粯娆捐緝灏忕殑閲戦
} else if (commonOrder.getState() == CommonOrder.STATE_SX) {
hongBao.setState(HongBaoV2.STATE_SHIXIAO);
hongBao.setMoney(new BigDecimal(0));
+ if (mianDan) {
+ try {
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new HongBaoException(12, "鍏嶅崟鍒搁��娆惧嚭閿�");
+ }
+ }
}
hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);
+
+ // 鍔犲叆閫氱煡
+ if (notificationMap.get(type) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(oldHongBao.getId());
+ tempHongBao.setUserInfo(oldHongBao.getUserInfo());
+ tempHongBao.setMoney(hongBao.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(type);
+ tempHongBaoOrder.getCommonOrder()
+ .setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(hongBao.getMoney()));
+ notificationMap.put(type, tempHongBaoOrder);
+ }
// 鑾峰彇瀛愮孩鍖�
List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());
@@ -423,10 +375,35 @@
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(child.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());
+ tempHongBaoOrder.getCommonOrder().setPayment(
+ tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(child.getMoney()));
+ notificationMap.put(child.getType(), tempHongBaoOrder);
+ }
+
}
} else if (type == HongBaoV2.TYPE_SHARE_GOODS) {
- BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ BigDecimal fanliRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+ List<ShareGoodsActivityOrder> list = shareGoodsActivityOrderService
+ .listByOrderIdAndUid(commonOrder.getUserInfo().getId(), commonOrder.getOrderNo());
+ if (list != null && list.size() > 0) {
+ fanliRate = list.get(0).getShareRate();
+ }
+
HongBaoV2 hongBao = new HongBaoV2(hongBaoOrder.getHongBaoV2().getId());
hongBao.setUpdateTime(new Date());
// 鏇存敼鐘舵�佷笌璧勯噾
@@ -448,6 +425,23 @@
hongBao.setMoney(new BigDecimal(0));
}
hongBaoV2Mapper.updateByPrimaryKeySelective(hongBao);
+ // 閫氱煡
+ if (notificationMap.get(type) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());
+ tempHongBao.setUserInfo(hongBaoOrder.getHongBaoV2().getUserInfo());
+ tempHongBao.setMoney(hongBao.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(type);
+ tempHongBaoOrder.getCommonOrder()
+ .setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(hongBao.getMoney()));
+ notificationMap.put(type, tempHongBaoOrder);
+ }
// 鑾峰彇瀛愮孩鍖�
List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());
@@ -490,9 +484,44 @@
}
@Transactional
- private void saveHongBao(CommonOrder commonOrder, int type) throws HongBaoException {
+ private void saveHongBao(CommonOrder commonOrder, int type, Map<Integer, HongBaoOrder> notificationMap)
+ throws HongBaoException {
if (type == HongBaoV2.TYPE_ZIGOU) {// 鑾峰彇鑷喘鐨勮繑鍒╂瘮渚�
BigDecimal fanliRate = hongBaoManageService.getFanLiRate(commonOrder.getCreateTime().getTime());
+ // 鏌ヨ鏄惁鏈夊厤鍗曡鍒�
+ BigDecimal mianDanMoney = null;
+ if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {
+ List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,
+ commonOrder.getOrderNo());
+ if (orderList != null && orderList.size() == 1) {// 鍙湁1涓鍗曟墠鍙備笌鍏嶅崟
+ BigDecimal payMent = commonOrder.getPayment();
+ if (commonOrder.getState() == CommonOrder.STATE_JS)
+ payMent = commonOrder.getSettlement();
+
+ CommonOrderGoods goods = commonOrderGoodsMapper
+ .selectByPrimaryKey(commonOrder.getCommonOrderGoods().getId());
+ if (goods != null) {
+
+ try {
+ if (userSystemCouponService.updateCouponRecordUsed(commonOrder.getUserInfo().getId(),
+ commonOrder.getOrderNo(), payMent, Long.parseLong(goods.getGoodsId())))
+ mianDanMoney = payMent;
+ } catch (NumberFormatException e) {
+ throw new HongBaoException(10, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new HongBaoException(11, "鍏嶅崟鍟嗗搧澶勭悊鍑洪敊");
+ }
+ }
+ }
+ } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 璁剧疆鍏嶅崟鍒稿け鏁�
+ try {
+ userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
HongBaoV2 hongBao = new HongBaoV2();
hongBao.setUserInfo(commonOrder.getUserInfo());
hongBao.setCreateTime(new Date());
@@ -513,6 +542,10 @@
} else {
throw new HongBaoException(3, "缁存潈璁㈠崟涓嶈兘鍒涘缓绾㈠寘");
}
+
+ if (mianDanMoney != null)
+ hongBao.setMoney(mianDanMoney);
+
UserInfo user = userInfoService.getUserById(commonOrder.getUserInfo().getId());
hongBao.setUrank(user.getRank());
hongBaoV2Mapper.insertSelective(hongBao);
@@ -522,9 +555,26 @@
hongBaoOrder.setCreateTime(new Date());
hongBaoOrder.setHongBaoV2(hongBao);
hongBaoOrderMapper.insertSelective(hongBaoOrder);
+ // 鍔犲叆閫氱煡
+ if (notificationMap.get(type) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());
+ tempHongBao.setUserInfo(hongBao.getUserInfo());
+ tempHongBao.setMoney(hongBao.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(type);
+ tempHongBaoOrder.getCommonOrder()
+ .setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(hongBao.getMoney()));
+ notificationMap.put(type, tempHongBaoOrder);
+ }
UserInfo boss = threeSaleSerivce.getBoss(user.getId());
- if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥
+ if (boss != null && hongBao.getState() != HongBaoV2.STATE_SHIXIAO && mianDanMoney == null) {// 1绾OSS瀛樺湪涓旂孩鍖呮湭澶辨晥,鍏嶅崟涓嶆敮鎸佸绾у垎閿�
// 鎻掑叆涓�绾у瓙绾㈠寘
BigDecimal firstRate = hongBaoManageService
@@ -554,6 +604,23 @@
MoneyBigDecimalUtil.mul(hongBao.getMoney(), firstRate.divide(new BigDecimal(100))));
}
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);
+ }
// 鎻掑叆浜岀骇瀛愮孩鍖�
boss = threeSaleSerivce.getBoss(boss.getId());
@@ -571,7 +638,7 @@
secondHongbao.setVersion(2);
secondHongbao.setState(hongBao.getState());
if (hongBao.getState() == HongBaoV2.STATE_KELINGQU) {
- firstHongbao.setMoney(
+ secondHongbao.setMoney(
MoneyBigDecimalUtil.mul(hongBao.getMoney(), secondRate.divide(new BigDecimal(100))));
Calendar calendar = Calendar.getInstance();
calendar.setTime(commonOrder.getSettleTime());
@@ -584,6 +651,24 @@
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);
+ }
}
}
@@ -594,6 +679,37 @@
return;
// 鍒嗕韩璧�
BigDecimal shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());
+
+ // 鍒ゆ柇璁㈠崟鍒嗕韩娲诲姩鏄惁寮�鍚�
+ if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {
+ // 娌℃湁璁㈠崟锛屽苟涓旀槸娓犻亾ID鏉ョ殑锛屽苟涓�
+ UserExtraTaoBaoInfo taoBaoExtraInfo = userExtraTaoBaoInfoService
+ .getByUid(commonOrder.getUserInfo().getId());
+ if (taoBaoExtraInfo != null && ((!StringUtil.isNullOrEmpty(taoBaoExtraInfo.getTaoBaoOrderEnd6Num())
+ && !commonOrder.getOrderNo().endsWith(taoBaoExtraInfo.getTaoBaoOrderEnd6Num().trim()))
+ || StringUtil.isNullOrEmpty(taoBaoExtraInfo.getTaoBaoOrderEnd6Num()))) {
+ List<TaoBaoOrder> taoBaoOrderList = taoBaoOrderMapper
+ .selectTaoBaoOrderByOrderId(commonOrder.getOrderNo());
+ if (taoBaoOrderList != null && taoBaoOrderList.size() > 0
+ && !StringUtil.isNullOrEmpty(taoBaoOrderList.get(0).getRelationId())) {
+ if (shareGoodsActivityOrderService.listByUid(commonOrder.getUserInfo().getId()).size() < 1) {
+ shareRate = new BigDecimal(hongBaoManageService.get("share_activity_proportion"));
+ try {
+ shareGoodsActivityOrderService.addShareGoodsActivityOrder(
+ commonOrder.getUserInfo().getId(), shareRate, commonOrder.getOrderNo());
+ } catch (ShareGoodsActivityOrderException e) {
+ try {
+ LogHelper.errorDetailInfo(e);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
+ }
+ }
+ }
+ }
+
+ }
+
HongBaoV2 hongBao = new HongBaoV2();
hongBao.setCreateTime(new Date());
hongBao.setType(HongBaoV2.TYPE_SHARE_GOODS);
@@ -622,6 +738,23 @@
hongBaoOrder.setCreateTime(new Date());
hongBaoOrder.setHongBaoV2(hongBao);
hongBaoOrderMapper.insertSelective(hongBaoOrder);
+
+ if (notificationMap.get(type) == null) {
+ HongBaoV2 tempHongBao = new HongBaoV2(hongBao.getId());
+ tempHongBao.setUserInfo(hongBao.getUserInfo());
+ tempHongBao.setMoney(hongBao.getMoney());
+ CommonOrder tempCommonOrder = new CommonOrder(commonOrder.getId());
+ tempCommonOrder.setPayment(commonOrder.getPayment());
+ notificationMap.put(type, new HongBaoOrder(tempCommonOrder, tempHongBao));
+ } else {
+ // 澧炲姞浠樻閲戦涓庤祫閲�
+ HongBaoOrder tempHongBaoOrder = notificationMap.get(type);
+ tempHongBaoOrder.getCommonOrder()
+ .setPayment(tempHongBaoOrder.getCommonOrder().getPayment().add(commonOrder.getPayment()));
+ tempHongBaoOrder.getHongBaoV2()
+ .setMoney(tempHongBaoOrder.getHongBaoV2().getMoney().add(hongBao.getMoney()));
+ notificationMap.put(type, tempHongBaoOrder);
+ }
// 淇敼缁熻鏁版嵁
Long goodsId = commonOrder.getCommonOrderGoods().getId();
@@ -686,4 +819,22 @@
BigDecimal money = hongBaoV2Mapper.getUnRecievedFanLiMoney(uid);
return money == null ? new BigDecimal(0) : money;
}
+
+ @Override
+ public BigDecimal getUnRecievedMoneyWithCreateTime(Long uid, Date minDate, Date maxDate) {
+ BigDecimal money = hongBaoV2Mapper.getUnRecievedMoneyWithCreateTime(uid, minDate, maxDate);
+ if (money == null)
+ return new BigDecimal(0);
+ else
+ return money;
+ }
+
+ @Override
+ public BigDecimal getUnRecievedMoneyWithPreGetTime(Long uid, Date minDate, Date maxDate) {
+ BigDecimal money = hongBaoV2Mapper.getUnRecievedMoneyWithPreGetTime(uid, minDate, maxDate);
+ if (money == null)
+ return new BigDecimal(0);
+ else
+ return money;
+ }
}
--
Gitblit v1.8.0