订单与资金消息兼容京东与拼多多

admin

2019-07-22 703128867e85a918cd20771fab3e0da1f08ecaa5

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

@@ -296,16 +296,20 @@
         LogHelper.error("返利失败:" + hb1.getId());

         return;

      }

      // 维权中的不返利

      List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

            .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "维权创建");

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

         return;



      taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

            .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "等待处理");

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

         return;

      if (hongBaoOrder.getCommonOrder() != null

            && hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO) {

         // 维权中的不返利

         List<TaoBaoWeiQuanOrder> taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

               .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "维权创建");

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

            return;



         taoBaoWeiQuanList = taoBaoWeiQuanOrderMapper

               .selectListByOrderIdAndState(hongBaoOrder.getCommonOrder().getOrderNo(), "等待处理");

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

            return;

      }



      // 查询同一订单号的红包

      List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(

@@ -399,7 +403,7 @@
         }



         // 新版通知

         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

         userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),hongBaoOrder.getCommonOrder().getSourceType(),

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

      }

      // 通知免单到账

@@ -413,9 +417,8 @@
      if (hongBaoOrder.getCommonOrder().getSettleTime() != null && hongBaoOrder.getCommonOrder().getSettleTime()

            .getTime() >= TimeUtil.convertToTimeTemp("2018-08-05", "yyyy-MM-dd")) {

         try {



            taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());



            if (hongBaoOrder.getCommonOrder().getSourceType() == Constant.SOURCE_TYPE_TAOBAO)

               taoBaoWeiQuanDrawBackService.doWeiQuanFanli(hongBaoOrder.getCommonOrder().getOrderNo());

         } catch (TaoBaoWeiQuanException e) {

            if (e.getCode() == TaoBaoWeiQuanException.CODE_NEDD_UPDATE_ORDER) {

               List<TaoBaoOrder> olist = taoBaoOrderService

@@ -683,7 +686,7 @@
         }



         // 新版通知

         userMoneyMsgNotificationService.inviteOrderReceived(uid, inviteOrders.size(), inviteGoodsCount, invitemoney,

         userMoneyMsgNotificationService.inviteOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(), inviteGoodsCount, invitemoney,

               userInfoMapper.selectByPKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

@@ -782,7 +785,7 @@
         }



         // 新版通知

         userMoneyMsgNotificationService.shareOrderReceived(uid, shareOrders.size(), shareGoodsCount, sharemoney,

         userMoneyMsgNotificationService.shareOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(), shareGoodsCount, sharemoney,

               userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



         for (String orderId : drawBackOrders)

@@ -937,7 +940,7 @@
               }

            }

         }

			


         if (uid == null)

            return;