Merge remote-tracking branch 'origin/div' into div

admin

2020-04-13 dd5b15229cb15459fa7c31ccea77dac28cbfafbd

 fanli/src/main/java/com/yeshi/fanli/service/impl/order/HongBaoV2ServiceImpl.java

@@ -34,6 +34,7 @@
import com.yeshi.fanli.entity.order.CommonOrderGoods;

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

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

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

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

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

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

@@ -146,7 +147,7 @@
      return hongBaoV2Mapper.selectByPrimaryKey(id);

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   @Override

   public int addHongBao(List<CommonOrder> commonOrderList, int type) throws HongBaoException, UserAccountException {

      Set<Integer> stateSet = new HashSet<>();// 订单状态Set

@@ -189,63 +190,36 @@
               switch (t) {

               case HongBaoV2.TYPE_ZIGOU:

                  userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,

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

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

                        commonOrder.getThirdCreateTime());



                  break;

               case HongBaoV2.TYPE_SHARE_GOODS:



                  userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,

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

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

                        commonOrder.getThirdCreateTime());



                  break;

               case HongBaoV2.TYPE_YIJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

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

                        commonOrder.getThirdCreateTime());

                  break;

               case HongBaoV2.TYPE_ERJI:



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,    commonOrder.getPayment(), money,

                        goodsCount,  commonOrder.getState(), commonOrder.getThirdCreateTime());

                  break;



               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderShareFirstLevelStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state, notify.getBeizhu());

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                        commonOrder.getThirdCreateTime());

						
               case HongBaoV2.TYPE_SHARE_ERJI:

                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,    commonOrder.getPayment(), money,

                        goodsCount,  commonOrder.getState(), commonOrder.getThirdCreateTime());

                  break;

               }

            }

         }



         // 添加新版本通知



         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();

               String orderId = commonOrderList.get(0).getOrderNo();

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

               BigDecimal money = notify.getMoney();

               switch (t) {

               case HongBaoV2.TYPE_ZIGOU:

                  userOrderMsgNotificationService.orderFanLiStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_SHARE_GOODS:

                  userOrderMsgNotificationService.orderShareStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_YIJI:

                  userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_ERJI:

                  userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderShareFirstLevelStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

               }

            }

         }

@@ -276,7 +250,7 @@
      return CommonOrder.STATE_SX;

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   private boolean updateHongBao(HongBaoOrder hongBaoOrder, CommonOrder commonOrder, int type,

         Map<Integer, HongBaoOrder> notificationMap) throws HongBaoException, UserAccountException {

      System.out.println(commonOrder.getOrderNo());

@@ -285,7 +259,7 @@
      if (oldHongBao == null)

         throw new HongBaoException(10, "红包对象不存在");

      // 已经失效，已经领取，新老状态一致的红包不做处理

      if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO||oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)

      if (oldHongBao.getState() == HongBaoV2.STATE_SHIXIAO || oldHongBao.getState() == HongBaoV2.STATE_YILINGQU)

         return false;



      if (type == HongBaoV2.TYPE_ZIGOU) {// 获取自购的返利比例

@@ -371,6 +345,9 @@
         List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());

         if (children != null && children.size() > 0)

            for (HongBaoV2 child : children) {

               if (child.getState() == HongBaoV2.STATE_YILINGQU)

                  continue;



               HongBaoV2 childUpdate = new HongBaoV2(child.getId());

               childUpdate.setState(hongBao.getState());

               childUpdate.setUpdateTime(new Date());

@@ -592,6 +569,9 @@
         List<HongBaoV2> children = hongBaoV2Mapper.listChildrenById(hongBao.getId());

         if (children != null)

            for (HongBaoV2 child : children) {

               if (child.getState() == HongBaoV2.STATE_YILINGQU)

                  continue;



               HongBaoV2 childUpdate = new HongBaoV2(child.getId());

               // 统一设置状态

               childUpdate.setState(hongBao.getState());

@@ -657,7 +637,7 @@
      return true;

   }



   @Transactional

   @Transactional(rollbackFor = Exception.class)

   private void saveHongBao(CommonOrder commonOrder, int type, Map<Integer, HongBaoOrder> notificationMap)

         throws HongBaoException, UserAccountException {

      if (type == HongBaoV2.TYPE_ZIGOU) {// 获取自购的返利比例

@@ -879,7 +859,7 @@
            shareRate = hongBaoManageService.getShareRate(commonOrder.getCreateTime().getTime());



         // 判断订单分享活动是否开启

         if ("1".equalsIgnoreCase(configService.get("share_goods_activity_open"))) {

         if ("1".equalsIgnoreCase(configService.get(ConfigKeyEnum.shareGoodsActivityOpen.getKey()))) {

            // 没有订单，并且是渠道ID来的，并且

            UserExtraTaoBaoInfo taoBaoExtraInfo = userExtraTaoBaoInfoService

                  .getByUid(commonOrder.getUserInfo().getId());

@@ -1171,4 +1151,9 @@
      return hongBaoV2Mapper.listByIds(idList);

   }



   @Override

   public List<HongBaoDTO> listByOrderTradeId(String tradeId) {

      return hongBaoV2Mapper.listByOrderTradeId(tradeId);

   }



}