消息

yujian

2020-04-13 a5bc9c4e52f98032b287a42fd243c2ffcb7d58f6

 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,22 +190,28 @@
               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,  commonOrder.getState(), commonOrder.getThirdCreateTime());



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

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

                  break;



               case HongBaoV2.TYPE_SHARE_YIJI:

@@ -276,7 +283,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());

@@ -663,7 +670,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) {// 获取自购的返利比例

@@ -885,7 +892,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());

@@ -1176,8 +1183,7 @@
   public List<HongBaoV2> listByIds(List<Long> idList) {

      return hongBaoV2Mapper.listByIds(idList);

   }

	
	


   @Override

   public List<HongBaoDTO> listByOrderTradeId(String tradeId) {

      return hongBaoV2Mapper.listByOrderTradeId(tradeId);