From 553e4585a5ec8e2c22b50e33a27d14ead6fd034d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期五, 26 四月 2019 15:16:07 +0800
Subject: [PATCH] 店铺足迹删除+ 假删除
---
fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java | 39 +++++++++++++++++----------------------
1 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
index 630b4be..87baa53 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java
@@ -13,7 +13,6 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import com.yeshi.fanli.dao.mybatis.AccountDetailsMapper;
import com.yeshi.fanli.dao.mybatis.HongBaoV2Mapper;
import com.yeshi.fanli.dao.mybatis.UserInfoMapper;
import com.yeshi.fanli.dao.mybatis.money.UserMoneyDetailMapper;
@@ -21,7 +20,6 @@
import com.yeshi.fanli.dao.mybatis.order.HongBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoOrderMapper;
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanDrawBackMapper;
-import com.yeshi.fanli.entity.bus.user.AccountDetails;
import com.yeshi.fanli.entity.bus.user.HongBaoV2;
import com.yeshi.fanli.entity.bus.user.UserInfo;
import com.yeshi.fanli.entity.money.UserMoneyDetail;
@@ -33,13 +31,13 @@
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.msg.UserMoneyMsgNotificationService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;
import com.yeshi.fanli.service.inter.user.UserNotificationService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.MoneyBigDecimalUtil;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.factory.AccountDetailsFactory;
import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;
import com.yeshi.fanli.vo.order.CommonOrderVO;
@@ -61,9 +59,6 @@
private UserMoneyDetailMapper userMoneyDetailMapper;
@Resource
- private AccountDetailsMapper accountDetailsMapper;
-
- @Resource
private UserNotificationService userNotificationService;
@Resource
@@ -74,6 +69,9 @@
@Resource
private HongBaoOrderMapper hongBaoOrderMapper;
+
+ @Resource
+ private UserMoneyMsgNotificationService userMoneyMsgNotificationService;
@Override
public void addWeiQuanDrawBack(TaoBaoWeiQuanDrawBack taoBaoWeiQuanDrawBack) {
@@ -97,6 +95,9 @@
for (TaoBaoOrder order : orderList)
if (order.getOrderState().equalsIgnoreCase("璁㈠崟缁撶畻"))
sumFee = sumFee.add(order.geteIncome());
+ if (new BigDecimal(0).compareTo(sumFee) == 0)
+ throw new TaoBaoWeiQuanException(TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER, "闇�瑕佹洿鏂拌鍗�");
+
// 鑾峰彇鍜岃璁㈠崟鍙锋湁鍏宠仈鐨勭敤鎴�
// 鑾峰彇涓荤孩鍖�(鍚屼竴涓鍗曞彿鐨勫崟鍙細瀵瑰簲鍚屼竴涓敤鎴�)
List<CommonOrderVO> typeList = new ArrayList<>();
@@ -180,15 +181,10 @@
// 閫�娆鹃噾棰�
BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(userGetMoney.multiply(fanMoney), sumFee);
userInfoMapper.subHongBaoByUid(uid, drawBackMoney);
- // 娣诲姞璧勯噾璁板綍
- AccountDetails accountDetails = AccountDetailsFactory.create("-" + drawBackMoney,
- AccountDetailsFactory.SHARE_GOODS_DRAWBACK, null, null, new UserInfo(uid));
- accountDetailsMapper.insertSelective(accountDetails);
// 鏂扮増璧勯噾璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createFanLiWeiQuan(uid, weiQuanDrawBack,
drawBackMoney);
- userMoneyDetail.setId(accountDetails.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e) {
try {
@@ -197,6 +193,10 @@
e1.printStackTrace();
}
}
+
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, drawBackMoney,
+ userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
userNotificationService.weiQuanFanli(uid, orderId, drawBackMoney);
}
@@ -308,15 +308,10 @@
// 閫�娆鹃噾棰�
BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(userGetMoney.multiply(fanMoney), sumFee);
userInfoMapper.subHongBaoByUid(uid, drawBackMoney);
- // 娣诲姞璧勯噾璁板綍
- AccountDetails accountDetails = AccountDetailsFactory.create("-" + drawBackMoney,
- AccountDetailsFactory.SHARE_GOODS_DRAWBACK, null, null, new UserInfo(uid));
- accountDetailsMapper.insertSelective(accountDetails);
// 鏂扮増璧勯噾璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShareWeiQuan(uid, weiQuanDrawBack,
drawBackMoney);
- userMoneyDetail.setId(accountDetails.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e) {
try {
@@ -325,6 +320,9 @@
e1.printStackTrace();
}
}
+
+ userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, drawBackMoney,
+ userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney);
}
@@ -438,16 +436,11 @@
// 閫�娆鹃噾棰�
BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(userGetMoney.multiply(fanMoney), sumFee);
userInfoMapper.subHongBaoByUid(uid, drawBackMoney);
- // 娣诲姞璧勯噾璁板綍
- AccountDetails accountDetails = AccountDetailsFactory.create("-" + drawBackMoney,
- AccountDetailsFactory.SHARE_GOODS_DRAWBACK, null, null, new UserInfo(uid));
- accountDetailsMapper.insertSelective(accountDetails);
// 鏂扮増璧勯噾璁板綍
try {
UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInviteWeiQuan(uid, weiQuanDrawBack,
drawBackMoney);
- userMoneyDetail.setId(accountDetails.getId());
userMoneyDetailMapper.insert(userMoneyDetail);
} catch (UserMoneyDetailException e) {
try {
@@ -457,7 +450,9 @@
}
}
- //
+ // 鏂扮増閫氱煡
+ userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, drawBackMoney,
+ userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());
userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney);
}
--
Gitblit v1.8.0