动态分享无券 + 下架 不能分享

yujian

2019-08-01 c22963a2ee796e59094524cadc5a78c450ed98f8

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/HongBaoV2ServiceImpl.java

@@ -180,27 +180,27 @@
               BigDecimal money = notify.getMoney();

               switch (t) {

               case HongBaoV2.TYPE_ZIGOU:

                  userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,commonOrder.getPayment(),

                        money, goodsCount, state);

                  userOrderMsgNotificationService.orderFanLiStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state);

                  break;

               case HongBaoV2.TYPE_SHARE_GOODS:

					
                  userOrderMsgNotificationService.orderShareStatistic(uid, orderId,orderType, commonOrder.getPayment(),

                        money, goodsCount, state);



                  userOrderMsgNotificationService.orderShareStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state);

                  break;

               case HongBaoV2.TYPE_YIJI:

					
                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(),

                        money, goodsCount, state);



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state);

                  break;

               case HongBaoV2.TYPE_ERJI:

					
                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId,orderType, commonOrder.getPayment(),

                        money, goodsCount, state);



                  userOrderMsgNotificationService.orderInviteStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state);

                  break;



               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderShareFirstLevelStatistic(uid, orderId,orderType,

                  userOrderMsgNotificationService.orderShareFirstLevelStatistic(uid, orderId, orderType,

                        commonOrder.getPayment(), money, goodsCount, state, notify.getBeizhu());

                  break;

               }

@@ -220,23 +220,23 @@
               BigDecimal money = notify.getMoney();

               switch (t) {

               case HongBaoV2.TYPE_ZIGOU:

                  userOrderMsgNotificationService.orderFanLiStateChanged(uid, orderId,orderType, commonOrder.getPayment(),

                        money, state);

                  userOrderMsgNotificationService.orderFanLiStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_SHARE_GOODS:

                  userOrderMsgNotificationService.orderShareStateChanged(uid, orderId,orderType, commonOrder.getPayment(),

                        money, state);

                  userOrderMsgNotificationService.orderShareStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_YIJI:

                  userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId,orderType, commonOrder.getPayment(),

                        money, state);

                  userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_ERJI:

                  userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId,orderType, commonOrder.getPayment(),

                        money, state);

                  userOrderMsgNotificationService.orderInviteStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

                  break;

               case HongBaoV2.TYPE_SHARE_YIJI:

                  userOrderMsgNotificationService.orderShareFirstLevelStateChanged(uid, orderId,orderType,

                  userOrderMsgNotificationService.orderShareFirstLevelStateChanged(uid, orderId, orderType,

                        commonOrder.getPayment(), money, state);

               }

            }

@@ -621,7 +621,7 @@
         // 查询是否有免单计划

         BigDecimal mianDanMoney = null;

         if (commonOrder.getState() == CommonOrder.STATE_JS || commonOrder.getState() == CommonOrder.STATE_FK) {

            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(Constant.SOURCE_TYPE_TAOBAO,

            List<CommonOrder> orderList = commonOrderService.listBySourceTypeAndOrderId(commonOrder.getSourceType(),

                  commonOrder.getOrderNo());

            if (orderList != null && orderList.size() == 1) {// 只有1个订单才参与免单

               BigDecimal payMent = commonOrder.getPayment();

@@ -645,6 +645,7 @@
               }

            }

         } else if (commonOrder.getState() == CommonOrder.STATE_SX) {// 设置免单券失效

            commonOrder.setPayment(new BigDecimal(0));// 订单失效后的付款金额设置为0

            try {

               userSystemCouponService.updateStateByDrawback(commonOrder.getOrderNo());

            } catch (Exception e) {

@@ -956,7 +957,7 @@
         hb.setMoney(hongBao.getMoney());



         try {

            userShareGoodsGroupService.updateOrderRecord(hb,commonOrder.getSourceType());

            userShareGoodsGroupService.updateOrderRecord(hb, commonOrder.getSourceType());

         } catch (UserShareGoodsRecordException e) {

            try {

               LogHelper.errorDetailInfo(e);