唯品会订单bug修复，APP端佣金比例展示错误bug修复

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

 fanli/src/main/java/com/yeshi/fanli/service/impl/money/tb/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -22,32 +22,27 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanDrawBackMapper;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.UserInfo;

import com.yeshi.fanli.entity.money.InviteOrderSubsidyDebt;

import com.yeshi.fanli.entity.money.UserMoneyDebt;

import com.yeshi.fanli.entity.money.UserMoneyDebt.UserMoneyDebtTypeEnum;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.entity.order.CommonOrder;

import com.yeshi.fanli.entity.order.HongBaoOrder;

import com.yeshi.fanli.entity.order.InviteOrderSubsidy;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanDrawBack;

import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;

import com.yeshi.fanli.exception.money.InviteOrderSubsidyDebtException;

import com.yeshi.fanli.exception.money.UserMoneyDebtException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.exception.order.TaoBaoWeiQuanException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.InviteOrderSubsidyDebtService;

import com.yeshi.fanli.service.inter.money.UserMoneyDebtService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.UserMoneyService;

import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.money.tb.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.order.InviteOrderSubsidyService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

import com.yeshi.fanli.vo.order.CommonOrderVO;



@Service

public class TaoBaoWeiQuanDrawBackServiceImpl implements TaoBaoWeiQuanDrawBackService {

@@ -84,11 +79,9 @@
   @Resource

   private UserMoneyService userMoneyService;



   @Resource

   private InviteOrderSubsidyService inviteOrderSubsidyService;



   @Resource

   private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;

   private UserMoneyDetailService userMoneyDetailService;



   @Override

   public void addWeiQuanDrawBack(TaoBaoWeiQuanDrawBack taoBaoWeiQuanDrawBack) {

@@ -96,7 +89,7 @@
            taoBaoWeiQuanDrawBack.getUser().getId());

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   private void addDebt(Long uid, Long hbId, BigDecimal money) throws UserMoneyDebtException {

      UserMoneyDebt debt = new UserMoneyDebt();

      debt.setBeiZhu(null);

@@ -124,19 +117,19 @@
      return money;

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void doWeiQuanFanli(String orderId) throws TaoBaoWeiQuanException {

   public Map<Long, BigDecimal> doWeiQuanFanli(String orderId, boolean subMoneySync) throws TaoBaoWeiQuanException {

      if (StringUtil.isNullOrEmpty(orderId))

         throw new TaoBaoWeiQuanException(1, "订单号为空值");

      // 查询是否为维权订单

      List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);

      if (list == null || list.size() == 0)

         return;

         return null;

      List<HongBaoV2> mainHongBaoList = getWeiQuanMainHongBao(list, orderId);



      if (mainHongBaoList == null || mainHongBaoList.size() == 0)

         return;

         return null;

      for (int i = 0; i < mainHongBaoList.size(); i++) {

         // 锁行，防止重复 操作

         HongBaoV2 hb = hongBaoV2Mapper.selectByPrimaryKeyForUpdate(mainHongBaoList.get(i).getId());

@@ -149,7 +142,7 @@
      }



      if (mainHongBaoList == null || mainHongBaoList.size() == 0)

         return;

         return null;



      // 主用户ID

      Map<Long, BigDecimal> fanMoneyMap = new HashMap<>();

@@ -168,6 +161,7 @@


      // 计算每个用户的返利比例

      Iterator<Long> its = fanMoneyMap.keySet().iterator();

      Map<Long, BigDecimal> userSubMoneyMap = new HashMap<>();

      while (its.hasNext()) {

         Long uid = its.next();

         BigDecimal userGetMoney = fanMoneyMap.get(uid);

@@ -222,53 +216,96 @@


         // 退款金额

         BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, wqMoney, userGetMoney);



         // 计算资金是否充足

         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

         if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 资金不足

         {

            // 添加债务

            for (TaoBaoWeiQuanDrawBack drawBack : newWeiQuanDrawBackList) {

               TaoBaoOrder taoBaoOrder = taoBaoOrderMapper.selectTaoBaoOrderByTradeId(drawBack.getOrderItemId());

               if (taoBaoOrder != null) {

                  TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService

                        .selectByTradeId(drawBack.getOrderItemId());

                  CommonOrder co = commonOrderMapper.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

                        drawBack.getOrderItemId());

                  if (co != null) {

                     HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(co.getId());

                     if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {

                        BigDecimal drawback = computeDrawBackMoney(taoBaoOrder.getSettlement(),

                              weiQuanOrder.getMoney(), hongBaoOrder.getHongBaoV2().getMoney());

                        try {

                           addDebt(uid, hongBaoOrder.getHongBaoV2().getId(), drawback);

                        } catch (UserMoneyDebtException e) {

                           throw new TaoBaoWeiQuanException(101, "资金借贷异常");

         userSubMoneyMap.put(uid, drawBackMoney);

         if (subMoneySync) {

            // 计算资金是否充足

            UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

            if (user != null && user.getMyHongBao().compareTo(drawBackMoney) < 0)// 资金不足

            {

               // 添加债务

               for (TaoBaoWeiQuanDrawBack drawBack : newWeiQuanDrawBackList) {

                  TaoBaoOrder taoBaoOrder = taoBaoOrderMapper

                        .selectTaoBaoOrderByTradeId(drawBack.getOrderItemId());

                  if (taoBaoOrder != null) {

                     TaoBaoWeiQuanOrder weiQuanOrder = taoBaoWeiQuanOrderService

                           .selectByTradeId(drawBack.getOrderItemId());

                     CommonOrder co = commonOrderMapper.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

                           drawBack.getOrderItemId());

                     if (co != null) {

                        HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(co.getId());

                        if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null) {

                           BigDecimal drawback = computeDrawBackMoney(taoBaoOrder.getSettlement(),

                                 weiQuanOrder.getMoney(), hongBaoOrder.getHongBaoV2().getMoney());

                           try {

                              addDebt(uid, hongBaoOrder.getHongBaoV2().getId(), drawback);

                           } catch (UserMoneyDebtException e) {

                              throw new TaoBaoWeiQuanException(101, "资金借贷异常");

                           }

                        }

                     }

                  }

               }

               continue;

            }

            continue;

         }



         UserMoneyDetail userMoneyDetail = null;

         // 新版资金记录

         try {

            userMoneyDetail = UserMoneyDetailFactory.createFanLiWeiQuan(uid, weiQuanDrawBack, drawBackMoney);

         } catch (UserMoneyDetailException e) {

            UserMoneyDetail userMoneyDetail = null;

            // 新版资金记录

            try {

               LogHelper.errorDetailInfo(e);

            } catch (Exception e1) {

               e1.printStackTrace();

               userMoneyDetail = UserMoneyDetailFactory.createFanLiWeiQuan(uid, weiQuanDrawBack, drawBackMoney);

            } catch (UserMoneyDetailException e) {

               try {

                  LogHelper.errorDetailInfo(e);

               } catch (Exception e1) {

                  e1.printStackTrace();

               }

            }

            if (userMoneyDetail == null)

               throw new TaoBaoWeiQuanException(110, "资金记录生成失败");

            userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



            // 新版通知

            List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndOrderNo(Constant.SOURCE_TYPE_TAOBAO,

                  orderId);

            int goodsCount = 0;

            for (CommonOrder co : orderList) {

               if (co.getState() != CommonOrder.STATE_SX)

                  goodsCount += co.getCount();

            }



            BigDecimal fanliMoney = new BigDecimal(0);

            List<HongBaoOrder> hongBaoOrderList = hongBaoOrderMapper.listDetailByOrderIdAndSourceType(orderId,

                  Constant.SOURCE_TYPE_TAOBAO);

            for (HongBaoOrder hb : hongBaoOrderList) {

               fanliMoney = fanliMoney.add(hb.getHongBaoV2().getMoney());

            }



            userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,

                  drawBackMoney, fanliMoney, goodsCount, orderList.get(0).getThirdCreateTime());



         } else {// 记录资金记录，但是不显示给用户



            UserMoneyDetail userMoneyDetail = null;

            // 新版资金记录

            try {

               userMoneyDetail = UserMoneyDetailFactory.createFanLiWeiQuan(uid, weiQuanDrawBack, drawBackMoney);

            } catch (UserMoneyDetailException e) {

               try {

                  LogHelper.errorDetailInfo(e);

               } catch (Exception e1) {

                  e1.printStackTrace();

               }

            }

            if (userMoneyDetail == null)

               throw new TaoBaoWeiQuanException(110, "资金记录生成失败");

            userMoneyDetail.setShow(false);

            try {

               userMoneyDetailService.addUserMoneyDetail(userMoneyDetail);

            } catch (UserMoneyDetailException e) {

               throw new TaoBaoWeiQuanException(111, "插入记录生成失败");

            }

         }

         userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



         // 新版通知

         userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

      }

      return userSubMoneyMap;

   }



   private List<HongBaoV2> getWeiQuanMainHongBao(List<TaoBaoWeiQuanOrder> list, String orderId) {

@@ -305,14 +342,14 @@
      return mainHongBaoList;

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void doWeiQuanShare(String orderId) throws TaoBaoWeiQuanException {

      if (StringUtil.isNullOrEmpty(orderId))

         throw new TaoBaoWeiQuanException(1, "订单号为空值");



      List<TaoBaoWeiQuanOrder> list = taoBaoWeiQuanOrderService.getWeiQuanSuccessOrders(orderId);

      if(list==null||list.size()==0)

      if (list == null || list.size() == 0)

         return;

      List<HongBaoV2> mainHongBaoList = getWeiQuanMainHongBao(list, orderId);



@@ -438,13 +475,29 @@
            }

         }

         userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);

         userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,



               userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());

         // 新版通知

         List<CommonOrder> orderList = commonOrderMapper.listBySourceTypeAndOrderNo(Constant.SOURCE_TYPE_TAOBAO,

               orderId);

         int goodsCount = 0;

         for (CommonOrder co : orderList) {

            if (co.getState() != CommonOrder.STATE_SX)

               goodsCount += co.getCount();

         }



         BigDecimal fanliMoney = new BigDecimal(0);

         List<HongBaoOrder> hongBaoOrderList = hongBaoOrderMapper.listDetailByOrderIdAndSourceType(orderId,

               Constant.SOURCE_TYPE_TAOBAO);

         for (HongBaoOrder hb : hongBaoOrderList) {

            fanliMoney = fanliMoney.add(hb.getHongBaoV2().getMoney());

         }



         userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,

               fanliMoney, goodsCount, orderList.get(0).getThirdCreateTime());

      }

   }



   @Transactional(rollbackFor=Exception.class)

   @Transactional(rollbackFor = Exception.class)

   @Override

   public void doWeiQuanInvite(String orderId) throws TaoBaoWeiQuanException {

      if (StringUtil.isNullOrEmpty(orderId))

@@ -494,10 +547,6 @@
               weiQuanDrawBack.setOrderItemId(weiQuanOrder.getOrderItemId());

               weiQuanDrawBack.setUser(child.getUserInfo());

               taoBaoWeiQuanDrawBackMapper.insertSelective(weiQuanDrawBack);// 加入返还记录



               // 加入邀请补贴返还记录

               doInviteOrderSubsidy(orderId, Constant.SOURCE_TYPE_TAOBAO, uid, settleMent, wqMoney);



               // 如果资金大于0才扣除



               if (drawBackMoney != null && drawBackMoney.compareTo(new BigDecimal(0)) > 0) {

@@ -529,38 +578,8 @@


                  userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



                  // 新版通知

                  userMoneyMsgNotificationService.inviteOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,

                        drawBackMoney, userInfoMapper.selectAvailableByPrimaryKey(uid).getMyHongBao());

               }

            }

      }

   }



   /**

    * 邀请订单补贴维权处理

    * 
    * @param orderId

    * @param sourceType

    */

   private void doInviteOrderSubsidy(String orderId, int sourceType, Long uid, BigDecimal settleMent,

         BigDecimal weiQuanMoney) throws TaoBaoWeiQuanException {

      InviteOrderSubsidy subSidy = inviteOrderSubsidyService.getByOrderNoAndType(uid, orderId, sourceType);

      if (subSidy != null)// 添加借贷关系

      {

         BigDecimal drawBackMoney = computeDrawBackMoney(settleMent, weiQuanMoney, subSidy.getOriginalMoney());

         if (drawBackMoney.compareTo(new BigDecimal(0)) <= 0)

            return;

         InviteOrderSubsidyDebt debt = new InviteOrderSubsidyDebt();

         debt.setBeiZhu("订单售后:" + orderId + "-" + sourceType);

         debt.setOriginMoney(drawBackMoney);

         debt.setUid(uid);

         debt.setCreateTime(new Date());

         try {

            inviteOrderSubsidyDebtService.addDebt(debt);

         } catch (InviteOrderSubsidyDebtException e) {

            throw new TaoBaoWeiQuanException(101, "邀请订单补贴异常");

         }

      }

   }



@@ -572,18 +591,17 @@
      else

         return null;

   }

	


   @Override

   public List<TaoBaoWeiQuanDrawBack> getByOrderItemId(String orderItemId) {

      return taoBaoWeiQuanDrawBackMapper.selectByOrderItemId(orderItemId);

   }

	


   @Override

   public TaoBaoWeiQuanDrawBack selectByOrderItemIdAndUid(String orderItemId, Long uid) {

      return taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(orderItemId,uid);

      return taoBaoWeiQuanDrawBackMapper.selectByOrderItemIdAndUid(orderItemId, uid);

   }

	


   @Override

   public TaoBaoWeiQuanDrawBack selectByHongBaoId(Long hbId) {

      Long uid = null;