订单补贴维权残余代码删除

admin

2020-04-23 0caf6f59c6739d37bbeda702137bf599189f9502

 fanli/src/main/java/com/yeshi/fanli/service/manger/order/HongBaoV2AddManager.java

@@ -30,12 +30,10 @@
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.order.InviteOrderSubsidy;

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

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

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

import com.yeshi.fanli.exception.user.UserAccountException;

import com.yeshi.fanli.log.LogHelper;

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

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

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

@@ -153,31 +151,8 @@
            }

         }



         if (hasAdd) {

            try {

               inviteOrderSubsidyService.addOrUpdateByOrder(orderId, orderType);

            } catch (InviteOrderSubsidyException e) {

               throw new HongBaoException(201, "添加补贴出错");

            } catch (CommonOrderException e) {

               throw new HongBaoException(202, "添加补贴出错");

            }

         }



		
         int state = getOrderState(stateSet);



         if (hasAdd || hasUpdate) {

            // 补贴失效

            if (state == CommonOrder.STATE_SX)

               inviteOrderSubsidyService.invalidByOrderIdAndSourceType(orderId, orderType);

            else

               try {

                  inviteOrderSubsidyService.addOrUpdateByOrder(orderId, orderType);

               } catch (InviteOrderSubsidyException e) {

                  LogHelper.errorDetailInfo(e, "淘宝订单补贴更新失败", orderId);

               } catch (CommonOrderException e) {

                  LogHelper.errorDetailInfo(e, "淘宝订单补贴更新失败", orderId);

               }

         }



         /**

          * 通知用户的返利情况

@@ -194,15 +169,6 @@
               CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();

               Long uid = notify.getUserInfo().getId();



               List<InviteOrderSubsidy> subsidyList = inviteOrderSubsidyService.listByOrderNoAndTypeAndUid(orderId,

                     orderType, uid);

               BigDecimal subsidy = new BigDecimal(0);

               if (subsidyList != null)

                  for (InviteOrderSubsidy s : subsidyList) {

                     if (s.getState() != InviteOrderSubsidy.STATE_INVALID)

                        subsidy = subsidy.add(s.getOriginalMoney());

                  }



               BigDecimal money = notify.getMoney();

               switch (t) {

               case HongBaoV2.TYPE_ZIGOU:

@@ -218,27 +184,27 @@
                  break;

               case HongBaoV2.TYPE_YIJI:

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, subsidy, goodsCount, state,

                        commonOrder.getPayment(), money, new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());



                  break;

               case HongBaoV2.TYPE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, subsidy, goodsCount, state,

                        commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());



                  break;



               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, subsidy, goodsCount, state,

                        commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());

                  break;

               case HongBaoV2.TYPE_SHARE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, subsidy, goodsCount, state,

                        commonOrder.getPayment(), money,  new BigDecimal(0), goodsCount, state,

                        commonOrder.getThirdCreateTime());



                  break;