查询默认有效调整

yujian

2019-06-12 c007868c62c7da5c9ce1bf0e77d9e5f8619826e4

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

@@ -85,7 +85,6 @@
   @Resource

   private TaoBaoOrderService taoBaoOrderService;





   @Resource

   private LostOrderService lostOrderService;



@@ -115,7 +114,7 @@


   @Resource

   private TaoBaoBuyRelationMapService taoBaoBuyRelationMapService;

	


   @Resource

   private CommonOrderService commonOrderService;



@@ -123,7 +122,7 @@
   private HongBaoV2Service hongBaoV2Service;



   @Override

   public void processOrder(Map<String, List<TaoBaoOrder>> orders) {

   public synchronized void processOrder(Map<String, List<TaoBaoOrder>> orders) {

      List<TaoBaoUnionConfig> configList = taoBaoUnionConfigService.getConfigByTypeCache(PidUser.TYPE_FANLI_ANDROID);



      // 分离出返利订单与分享赚订单

@@ -144,18 +143,19 @@
            } else if (!StringUtil.isNullOrEmpty(list.get(0).getRelationId())) {

               shareOrderMap.put(orderId, list);

            } else {

               // 通过红包查询

               CommonOrder commonOrder = commonOrderService

                     .selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO, list.get(0).getTradeId());



               PidUser pidUser = null;//pidUserMapper.selectByPid(pid);

               if (pidUser != null && pidUser.getType() == PidUser.TYPE_SHARE_GOODS) {// 商品分享订单

                  // List<PidOrder> pidOrderList = new ArrayList<>();

                  // for (TaoBaoOrder order : list) {

                  // pidOrderList.add(TaoBaoOrderUtil.convertToPidOrder(order));

                  // }

                  // sharePidOrderMap.put(orderId, pidOrderList);

                  shareOrderMap.put(orderId, list);

               } else {// 普通返利订单

                  fanliOrderMap.put(orderId, list);

               if (commonOrder != null) {

                  HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

                  if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null

                        && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {

                     shareOrderMap.put(orderId, list);

                     continue;

                  }

               }

               fanliOrderMap.put(orderId, list);

            }

         }

      }

@@ -282,7 +282,6 @@
      }

   }





   @Resource

   private HongBaoOrderMapper hongBaoOrderMapper;



@@ -387,7 +386,7 @@
         }



         // 站内信+推送

         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

         UserInfo user = userInfoMapper.selectByPKey(uid);

         try {

            userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                  userGoodsCount.get(uid), user.getMyHongBao(), money);

@@ -641,7 +640,6 @@


      // 邀请赚到账

      if (invitemoney.compareTo(new BigDecimal(0)) > 0) {

         userInfoMapper.addHongBaoByUid(uid, invitemoney);



         // 添加新版详情记录

         try {

@@ -662,7 +660,9 @@


            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

            userMoneyDetailMapper.insert(userMoneyDetail);



            // 增加资金

            userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);

            // 添加到红包返利记录集合

            accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());

         } catch (UserMoneyDetailException e) {

@@ -739,7 +739,6 @@
       */



      if (sharemoney.compareTo(new BigDecimal(0)) > 0) {

         userInfoMapper.addHongBaoByUid(uid, sharemoney);

         // 添加新版详情记录

         try {

            // 计算本月的有效订单，失效订单，维权订单

@@ -760,7 +759,9 @@


            UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, (int) validCount,

                  (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

            userMoneyDetailMapper.insert(userMoneyDetail);

            // 添加资金

            userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



            // 添加到红包返利记录集合

            accountDetailsHongBaoMapService.saveAccountDetailsHongBaoMap(hbIdList, userMoneyDetail.getId());

         } catch (UserMoneyDetailException e) {

@@ -790,8 +791,6 @@


   }







   @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)

   @Override

   public void processShopingFanliOrderNew(String orderId, List<TaoBaoOrder> orderList)

@@ -811,7 +810,7 @@
         // 原来不存在订单

         Long uid = null;

         if (oldOrder == null) {

            PidUser pidUser =null;// pidUserMapper.selectByPid(pid);

            PidUser pidUser = null;// pidUserMapper.selectByPid(pid);

            if (pidUser != null) {

               uid = pidUser.getUid();



@@ -829,7 +828,6 @@
               orderMapper.insertSelective(order);

               oldOrder = order;

            } else {



               Long targetUid = null;

               if (pid.equalsIgnoreCase(TaoBaoConstant.TAOBAO_RELATION_AS_SPECIAL_PID)

                     && !StringUtil.isNullOrEmpty(orderList.get(0).getRelationId())) {

@@ -897,8 +895,7 @@
         try {

            commonOrderList = commonOrderService.addTaoBaoOrder(orderList, uid);

            hongBaoV2Service.addHongBao(commonOrderList, HongBaoV2.TYPE_ZIGOU);

				
				


         } catch (CommonOrderException e) {

            try {

               LogHelper.errorDetailInfo(e, "addTaoBaoOrder或addHongBao出错", "订单号:" + orderId);

@@ -917,7 +914,7 @@
               orderList.get(0).getSourceMediaId(), orderList.get(0).getAdPositionId());

         // 原来不存在订单

         Long uid = null;

         PidUser pidUser =null; //pidUserMapper.selectByPid(pid);-PID机制移除

         PidUser pidUser = null; // pidUserMapper.selectByPid(pid);-PID机制移除

         if (pidUser != null)

            uid = pidUser.getUid();

         else {

@@ -927,6 +924,20 @@
         }



         // 尚未找到和PID对应的用户

         if (uid == null) {

            // 通过红包查询

            CommonOrder commonOrder = commonOrderService.selectBySourceTypeAndTradeId(Constant.SOURCE_TYPE_TAOBAO,

                  orderList.get(0).getTradeId());



            if (commonOrder != null) {

               HongBaoOrder hongBaoOrder = hongBaoOrderMapper.selectByCommonOrderId(commonOrder.getId());

               if (hongBaoOrder != null && hongBaoOrder.getHongBaoV2() != null

                     && hongBaoOrder.getHongBaoV2().getType() == HongBaoV2.TYPE_SHARE_GOODS) {

                  uid = hongBaoOrder.getHongBaoV2().getUserInfo().getId();

               }

            }

         }

			
         if (uid == null)

            return;