分红修改

admin

2020-04-17 fed386fafac07d40fa3f3627b8fcef13e2d2ec4f

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

@@ -26,6 +26,7 @@
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;

@@ -171,59 +172,69 @@
          * 通知用户的返利情况

          */



//         if (!Constant.IS_TEST) {

            if (hasAdd) {

               Iterator<Integer> its = notificationMap.keySet().iterator();

               while (its.hasNext()) {

                  Integer t = its.next();

                  HongBaoV2 notify = notificationMap.get(t).getHongBaoV2();

                  CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();

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

                  BigDecimal money = notify.getMoney();

                  switch (t) {

                  case HongBaoV2.TYPE_ZIGOU:

                     userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,

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

                           commonOrder.getThirdCreateTime());

         // if (!Constant.IS_TEST) {

         if (hasAdd) {

            // 获取订单补贴



                     break;

                  case HongBaoV2.TYPE_SHARE_GOODS:

            Iterator<Integer> its = notificationMap.keySet().iterator();

            while (its.hasNext()) {

               Integer t = its.next();

               HongBaoV2 notify = notificationMap.get(t).getHongBaoV2();

               CommonOrder commonOrder = notificationMap.get(t).getCommonOrder();

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



                     userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,

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

                           commonOrder.getThirdCreateTime());



                     break;

                  case HongBaoV2.TYPE_YIJI:

                     userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                           commonOrder.getThirdCreateTime());



                     break;

                  case HongBaoV2.TYPE_ERJI:



                     userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                           commonOrder.getThirdCreateTime());



                     break;



                  case HongBaoV2.TYPE_SHARE_YIJI:

                     userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                           commonOrder.getThirdCreateTime());

                     break;

                  case HongBaoV2.TYPE_SHARE_ERJI:



                     userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                           commonOrder.getThirdCreateTime());



                     break;



               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:

                  userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state, commonOrder.getThirdCreateTime());



                  break;

               case HongBaoV2.TYPE_SHARE_GOODS:



                  userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state, commonOrder.getThirdCreateTime());



                  break;

               case HongBaoV2.TYPE_YIJI:

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                        commonOrder.getThirdCreateTime());



                  break;

               case HongBaoV2.TYPE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                        commonOrder.getThirdCreateTime());



                  break;



               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                        commonOrder.getThirdCreateTime());

                  break;

               case HongBaoV2.TYPE_SHARE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                        commonOrder.getThirdCreateTime());



                  break;



               }

//            }

            }

            // }

         }



         int resultCode = 0;