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

admin

2020-04-15 d4588f4e43336b26b356b869c29d0c76390167d5

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

@@ -166,7 +166,6 @@
   @Resource

   private HongBaoV2AddManager hongBaoV2AddManager;





   /**

    * 是否是分享订单

    * 

@@ -216,8 +215,8 @@
                  list.get(0).getSourceMediaId(), list.get(0).getAdPositionId());

            if ("饿了么".equalsIgnoreCase(list.get(0).getOrderType())) {

               // 饿了么订单开始归入到淘宝订单

               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(), "yyyy-MM-dd HH:mm:ss") > TimeUtil

                     .convertToTimeTemp("2020-04-15", "yyyy-MM-dd")) {

               if (TimeUtil.convertToTimeTemp(list.get(0).getCreateTime(),

                     "yyyy-MM-dd HH:mm:ss") >= Constant.NEW_ORDER_FANLI_RULE_TIME) {

                  fanliOrderMap.put(orderId, list);

               } else {

                  elmeOrderMap.put(orderId, list);

@@ -407,7 +406,8 @@
               || hb.getPreGetTime().getTime() > System.currentTimeMillis())

            continue;

         try {

            CMQManager.getInstance().addFanLiMsgNew(hb);

            if (Constant.ENABLE_MQ)

               CMQManager.getInstance().addFanLiMsgNew(hb);

         } catch (Exception e) {

            try {

               LogHelper.errorDetailInfo(e);

@@ -521,7 +521,8 @@
         for (TaoBaoWeiQuanOrder order : orderList) {

            try {

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

                  CMQManager.getInstance().addWeiQuanOrderMsg(order);

                  if (Constant.ENABLE_MQ)

                     CMQManager.getInstance().addWeiQuanOrderMsg(order);

               }

            } catch (Exception e) {

               LogHelper.error("维权订单加入到队列出错:" + order != null ? new Gson().toJson(order) : null);

@@ -601,7 +602,8 @@
      while (its.hasNext()) {

         Long uid = its.next();

         try {

            CMQManager.getInstance().addFanLiTiChengMsg(uid);

            if (Constant.ENABLE_MQ)

               CMQManager.getInstance().addFanLiTiChengMsg(uid);

         } catch (Exception e) {

            e.printStackTrace();

            LogHelper.error(e);

@@ -613,20 +615,21 @@
   @Transactional(rollbackFor = Exception.class)

   public void fanliInvaiteAndShare(Long uid) throws TaoBaoWeiQuanException {

      // 邀请赚到账

      Date now = new Date();

      try {

         orderMoneySettleService.inviteSettleTB(uid);

         orderMoneySettleService.inviteSettleTB(uid, now);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      try {

         orderMoneySettleService.inviteSettleJD(uid);

         orderMoneySettleService.inviteSettleJD(uid, now);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

      //

      try {

         orderMoneySettleService.inviteSettlePDD(uid);

         orderMoneySettleService.inviteSettlePDD(uid, now);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

@@ -646,6 +649,29 @@
      //

      try {

         orderMoneySettleService.shareSettlePDD(uid);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

   }



   @Override

   @Transactional(rollbackFor = Exception.class)

   public void fanliPreInvaite(Long uid, Date maxPreGetTime) {

      // 邀请赚到账

      try {

         orderMoneySettleService.inviteSettleTB(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      try {

         orderMoneySettleService.inviteSettleJD(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }



      try {

         orderMoneySettleService.inviteSettlePDD(uid, maxPreGetTime);

      } catch (OrderMoneySettleException e) {

         e.printStackTrace();

      }

@@ -750,7 +776,7 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  if (!Constant.IS_TEST)

                  if (Constant.ENABLE_MQ)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

@@ -801,7 +827,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (Constant.ENABLE_MQ)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }

@@ -923,7 +950,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_JD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -954,7 +982,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_JD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -1063,7 +1092,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_PDD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -1096,7 +1126,8 @@
            order.setOrderType(Constant.SOURCE_TYPE_PDD);

            order.setUserInfo(new UserInfo(uid));

            try {

               PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               if (Constant.ENABLE_MQ)

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

            } catch (Exception e) {

            }

         }

@@ -1194,7 +1225,9 @@
            update.setUpdateTime(new Date());

            hongBaoV2Service.updateByPrimaryKeySelective(update);

         }

      userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId, sourceType, "因商家违约未能结算返利或商家已经关店");

      // TODO 商家关店跑路需要赠送金币

      // userSystemCouponService.systemGiveRewardCoupon(uid, 1, orderId,

      // sourceType, "因商家违约未能结算返利或商家已经关店");

   }



   @Transactional

@@ -1249,7 +1282,7 @@
   public List<HongBaoV2> getCanBalanceElmeFanliHongBao() {

      List<Integer> list = new ArrayList<>();

      list.add(HongBaoV2.TYPE_ELME);

      return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, 0, 1000);

      return hongBaoV2Mapper.listCanBalanceHongBaoByTypeAndUid(list, null, null, new Date(), 0, 1000);

   }



   @Override

@@ -1286,9 +1319,6 @@
         }

         userMoneyService.addUserMoney(hongBao.getUserInfo().getId(), hongBao.getMoney(), detail);

         BigDecimal balance = userInfoMapper.selectByPrimaryKey(hongBao.getUserInfo().getId()).getMyHongBao();

         // 添加消息

         userMoneyMsgNotificationService.elmeFanli(hongBao.getUserInfo().getId(), order.getOrderId(),

               hongBao.getMoney(), balance);

      }

      // 返利到账

   }