From 0cc3b905e5945d1b4b02ee5f91a615bcfd8f08d6 Mon Sep 17 00:00:00 2001 From: yujian <yujian@123.com> Date: 星期四, 25 七月 2019 11:44:10 +0800 Subject: [PATCH] 京东兼容 --- fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 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 49872b9..7f1b1d4 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 @@ -36,7 +36,6 @@ import com.yeshi.fanli.log.LogHelper; import com.yeshi.fanli.service.inter.money.UserMoneyDebtService; import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService; -import com.yeshi.fanli.service.inter.order.CommonOrderService; import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService; import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService; import com.yeshi.fanli.service.inter.user.UserMoneyService; @@ -44,7 +43,6 @@ import com.yeshi.fanli.util.Constant; import com.yeshi.fanli.util.MoneyBigDecimalUtil; import com.yeshi.fanli.util.StringUtil; -import com.yeshi.fanli.util.TaoBaoConstant; import com.yeshi.fanli.util.factory.UserMoneyDetailFactory; import com.yeshi.fanli.vo.order.CommonOrderVO; @@ -214,6 +212,8 @@ // 閫�娆鹃噾棰� BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(userGetMoney.multiply(fanMoney), sumFee); + if (drawBackMoney.compareTo(userGetMoney) > 0) + drawBackMoney = userGetMoney;// 閫�娆鹃噾棰濅笉鑳芥瘮鑾峰緱鐨勯噾棰濆ぇ // 璁＄畻璧勯噾鏄惁鍏呰冻 UserInfo user = userInfoMapper.selectByPKey(uid); if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 璧勯噾涓嶈冻 @@ -261,8 +261,8 @@ userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail); // 鏂扮増閫氱煡 - userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, drawBackMoney, - userInfoMapper.selectByPrimaryKey(uid).getMyHongBao()); + userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId,Constant.SOURCE_TYPE_TAOBAO, drawBackMoney, + userInfoMapper.selectByPKey(uid).getMyHongBao()); userNotificationService.weiQuanFanli(uid, orderId, drawBackMoney); } @@ -366,6 +366,8 @@ // 閫�娆鹃噾棰� BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(userGetMoney.multiply(fanMoney), sumFee); + if (drawBackMoney.compareTo(userGetMoney) > 0) + drawBackMoney = userGetMoney; for (TaoBaoWeiQuanDrawBack drawBack : newWeiQuanDrawBackList) taoBaoWeiQuanDrawBackMapper.insertSelective(drawBack); @@ -434,7 +436,7 @@ } userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail); - userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, drawBackMoney, + userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao()); userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney); @@ -486,6 +488,8 @@ if (weiQuanDrawBack != null) continue; BigDecimal drawBackMoney = MoneyBigDecimalUtil.div(child.getMoney().multiply(fanMoney), sumFee); + if (drawBackMoney.compareTo(child.getMoney()) > 0) + drawBackMoney = child.getMoney(); weiQuanDrawBack = new TaoBaoWeiQuanDrawBack(); weiQuanDrawBack.setCreateTime(new Date()); weiQuanDrawBack.setDrawBackMoney(drawBackMoney); @@ -522,7 +526,7 @@ userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail); // 鏂扮増閫氱煡 - userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, drawBackMoney, + userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId,Constant.SOURCE_TYPE_TAOBAO, drawBackMoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao()); } } -- Gitblit v1.8.0