Merge branch 'dev-hongbao'

admin

2019-01-08 c84d8ecd97d111b01db9cfd807300d0491a95bc8

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

@@ -174,7 +174,8 @@
               Integer hongBaoType = order.getHongBaoType();

               // 邀请订单信息保护

               if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_ERJI == hongBaoType) {

                     || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

                     || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

                  Map<String, String> titleMap = new HashMap<String, String>();

                  titleMap.put("content", "为保障用户隐私，商品信息已隐藏!");

                  titleMap.put("fontColor", "#888888");

@@ -277,14 +278,14 @@
            hongbaoInfo = "返利";

            order.setOrderOrigin("1");

            order.setHongBaoTypePic(CommonOrder.TYPE_FANLI);

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

         } else if (HongBaoV2.TYPE_SHARE_GOODS == hongBaoType) {

            // 分享

            hongbaoInfo = "奖金";

            order.setOrderOrigin("2");

            order.setHongBaoTypePic(CommonOrder.TYPE_SHARE);

         } else if (HongBaoV2.TYPE_YAOQING == hongBaoType || HongBaoV2.TYPE_YIJI == hongBaoType

               || HongBaoV2.TYPE_ERJI == hongBaoType) {

               || HongBaoV2.TYPE_ERJI == hongBaoType || HongBaoV2.TYPE_SHARE_YIJI == hongBaoType

               || HongBaoV2.TYPE_SHARE_ERJI == hongBaoType) {

            // 邀请

            hongbaoInfo = "奖金";

            order.setOrderOrigin("3");