admin
2020-04-29 5a4dde9e5aae1460e9969753593c5944dc23ad12
Merge remote-tracking branch 'origin/div' into div
3个文件已修改
12 ■■■■ 已修改文件
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserMsgController.java
@@ -202,8 +202,8 @@
                for (MsgOrderDetail detail : detailList) {
                    JSONObject params = new JSONObject();
                    params.put("orderNo", detail.getOrderId());
                    if (detail.getType() == MsgTypeOrderTypeEnum.share
                            || detail.getType() == MsgTypeOrderTypeEnum.invite)
                    if (detail.getType() == MsgTypeOrderTypeEnum.share || detail.getType() == MsgTypeOrderTypeEnum.invite
                        || detail.getType() == MsgTypeOrderTypeEnum.orderShare || detail.getType() == MsgTypeOrderTypeEnum.orderInvite)
                        params.put("orderHideNo", UserUtil.filterOrderId(detail.getOrderId()));
                    list.add(UserMsgVOFactory.create(detail, jumpDetailV2Service.getByTypeCache("order_search"),
                            params));
fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgOrderDetail.java
@@ -29,6 +29,8 @@
        foundSucceed("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        foundFail("订单找回", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
        orderStatistics("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"), 
        orderShare("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
        orderInvite("订单统计", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
        businessRunning("订单失效", "http://img.flqapp.com/resource/msg/icon_msg_order.png"),
        elme("饿了么订单", "http://img.flqapp.com/resource/msg/icon_msg_order.png");
        
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
@@ -41,16 +41,20 @@
            return null;
        String fanliName = "";
        MsgTypeOrderTypeEnum orderTypeEnum = null;
        String sourceName = Constant.getSourceName(source);
        if (Constant.TYPE_REBATE == type) {
            fanliName = "预估返利:";
            sourceName += "-返利订单";
            orderTypeEnum = MsgTypeOrderTypeEnum.orderStatistics;
        } else if (Constant.TYPE_SHAER == type) {
            fanliName = "预估奖金:";
            sourceName += "-分享订单";
            orderTypeEnum = MsgTypeOrderTypeEnum.orderShare;
        } else if (Constant.TYPE_INVITE == type) {
            fanliName = "预估收益:";
            sourceName += "-团队订单";
            orderTypeEnum = MsgTypeOrderTypeEnum.orderInvite;
        }
        // 添加内容
@@ -97,7 +101,7 @@
        detail.setOrderType(source);
        detail.setPayMoney(payMoney);
        detail.setRead(false);
        detail.setType(MsgTypeOrderTypeEnum.orderStatistics);
        detail.setType(orderTypeEnum);
        detail.setUser(new UserInfo(uid));
        detail.setExtraInfo(new Gson().toJson(listMsg));
        return detail;