团队补贴按照下单时间兼容

admin

2020-03-20 f0d06601a6be8c09ef5e8e7e76666cb1e8ef72a5

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

@@ -494,6 +494,7 @@
                           hongBaoOrder.getCommonOrder().getSourceType(), key);

                     return TransactionStatus.CommitTransaction;

                  } catch (Exception e) {

                     e.printStackTrace();

                     return TransactionStatus.RollbackTransaction;

                  }

               }

@@ -547,7 +548,7 @@
               if (drawBack == null) {// 还未扣款

                  OrderLogHelper.taoBaoWeiQuan("已到账未扣款处理:子订单号:" + order.getOrderItemId());

                  try {

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanFanli(order.getOrderId(), true);

                     taoBaoWeiQuanDrawBackService.doWeiQuanShare(order.getOrderId());

                     taoBaoWeiQuanDrawBackService.doWeiQuanInvite(order.getOrderId());

                  } catch (TaoBaoWeiQuanException e) {

@@ -738,7 +739,8 @@
               order.setOrderType(Constant.SOURCE_TYPE_TAOBAO);

               order.setUserInfo(new UserInfo(uid));

               try {

                  PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

                  if (!Constant.IS_TEST)

                     PlaceOrderCMQManager.getInstance().addPlaceOrderMsg(order);

               } catch (Exception e) {

               }

            }