Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

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

@@ -143,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);

            }

         }

      }

@@ -225,7 +226,7 @@
   @Override

   public void fanli() {

      // 获取主红包

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 100);

      List<HongBaoV2> hongBaoList = hongBaoV2Mapper.listCanBalanceHongBaoByType(HongBao.TYPE_TAOBAO, 1000);

      //

      // /**

      // * 需要实时更新待返利的订单

@@ -295,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(

@@ -385,7 +390,7 @@
         }



         // 站内信+推送

         UserInfo user = userInfoMapper.selectByPrimaryKey(uid);

         UserInfo user = userInfoMapper.selectByPKey(uid);

         try {

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

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

@@ -412,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

@@ -453,7 +457,7 @@
   public void weiQuanOrder(List<TaoBaoWeiQuanOrder> orderList) {

      if (orderList != null)

         for (TaoBaoWeiQuanOrder order : orderList) {

            if (order.getState().equalsIgnoreCase("维权成功")) {

            if (order.getState().contains("维权成功")) {

               CMQManager.getInstance().addWeiQuanOrderMsg(order);

            }

         }

@@ -749,12 +753,9 @@


            Date minDate = new Date(TimeUtil

                  .convertToTimeTemp(ca.get(Calendar.YEAR) + "-" + (ca.get(Calendar.MONTH) + 1), "yyyy-M"));

            long validCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_JS, minDate, maxDate);

            long weiQuanCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_WQ, minDate, maxDate);

            long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                  CommonOrder.STATE_SX, minDate, maxDate);

            long validCount =  hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_JS, minDate, maxDate);

            long weiQuanCount = hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_WQ, minDate, maxDate);

            long invalidCount =hongBaoV2Mapper.countShareOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX, minDate, maxDate);



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

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

@@ -827,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())) {

@@ -924,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;