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

admin

2020-06-10 271ae63c20fcbe28d29c47f1881138ff6551a2a1

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

@@ -22,28 +22,23 @@
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;

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

   private UserMoneyService userMoneyService;



   @Resource

   private InviteOrderSubsidyService inviteOrderSubsidyService;



   @Resource

   private InviteOrderSubsidyDebtService inviteOrderSubsidyDebtService;



   @Resource

   private UserMoneyDetailService userMoneyDetailService;

@@ -557,11 +547,6 @@
               weiQuanDrawBack.setOrderItemId(weiQuanOrder.getOrderItemId());

               weiQuanDrawBack.setUser(child.getUserInfo());

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



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

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

                     weiQuanOrder.getOrderItemId());



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



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

@@ -593,42 +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, String tradeId) 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());

         debt.setSourceId(subSidy.getId());

         debt.setTradeId(tradeId);

         try {

            inviteOrderSubsidyDebtService.addDebt(debt);

         } catch (InviteOrderSubsidyDebtException e) {

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

         }



         // TODO 删除团队奖励维权处理

      }

   }