邀请成功消息 - 新版

yujian

2019-11-20 5fd6e8875d0c4695489fec035a58002f219fab42

邀请成功消息 - 新版

 fanli/src/main/java/com/yeshi/fanli/entity/bus/msg/MsgInviteDetail.java

@@ -17,7 +17,7 @@
@Table("yeshi_ec_msg_invite")

public class MsgInviteDetail {

    public enum MsgTypeInviteTypeEnum {

        invite("邀请消息"), exchangeCode("恭喜你，邀请码兑换成功"), receiveGift("领取礼品"),inviteNew("邀请消息-新版");

        invite("邀请消息"), exchangeCode("恭喜你，邀请码兑换成功"), receiveGift("领取礼品"),inviteSucceed("邀请提醒");

        private final String desc;



        private MsgTypeInviteTypeEnum(String desc) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/ThreeSaleSerivceImpl.java

@@ -603,13 +603,9 @@
    private void inviteSuccess(Long bossId, Long workerId, ThreeSale threeSale) {

        // 邀请消息

        UserActiveLog activeLog = userActiveLogService.getUserLatestActiveInfo(bossId);

        if (activeLog != null) {

            if (VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

                    activeLog.getVersionCode())) { // 2.0.2版本以上

                userInviteMsgNotificationService.inviteSuccess2_0_2(bossId, threeSale);

            } else { // 最初消息

                userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);

            }

        if (activeLog != null && VersionUtil.greaterThan_2_1("appstore".equalsIgnoreCase(activeLog.getChannel()) ? "ios" : "android",

                activeLog.getVersionCode())) { // 2.1版本以上

            userInviteMsgNotificationService.inviteSuccess2_1(bossId, threeSale);

        } else { // 最初消息

            userInviteMsgNotificationService.inviteSuccess(threeSale.getBoss().getId(), threeSale);

        }


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/invite/UserInviteMsgNotificationServiceImpl.java

@@ -58,8 +58,8 @@


    

    @Override

    public void inviteSuccess2_0_2(Long uid, ThreeSale sale) {

        MsgInviteDetail detail = MsgInviteDetailFactory.createInviteSuccess2_0_2(uid, sale);

    public void inviteSuccess2_1(Long uid, ThreeSale sale) {

        MsgInviteDetail detail = MsgInviteDetailFactory.createInviteSuccess2_1(uid, sale);

        msgInviteDetailService.insertSelective(detail);

        PushContentDTO dto = PushMsgFactory.createInviteTeamSuccess(new Date(), sale.getWorker().getNickName());

        try {


 fanli/src/main/java/com/yeshi/fanli/service/inter/user/invite/UserInviteMsgNotificationService.java

@@ -48,5 +48,5 @@
     * @param uid

     * @param sale

     */

    public void inviteSuccess2_0_2(Long uid, ThreeSale sale);

    public void inviteSuccess2_1(Long uid, ThreeSale sale);

}


 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgInviteDetailFactory.java

@@ -44,25 +44,18 @@
     * @param uid

     * @return

     */

    public static MsgInviteDetail createInviteSuccess2_0_2(Long uid, ThreeSale threeSale) {

    public static MsgInviteDetail createInviteSuccess2_1(Long uid, ThreeSale threeSale) {

        if (threeSale == null || uid == null)

            return null;



        MsgInviteContentDTO content = new MsgInviteContentDTO();

        content.setMode("必要条件+选择条件（三选一） ");

        content.setCode("队员绑定电话号码+授权淘宝 ");

        content.setState("成功邀请一个队员，队员熟练使用App还可获得红包 ");

        content.setInviter("1.产生累计≥200金币/2.任意订单/3.成功邀请一个队员");

		
        MsgInviteDetail detail = new MsgInviteDetail();

        detail.setBeiZhu("满足获得红包条件后系统将自动下发到“我的-红包”中");

        detail.setInviteUser(threeSale);

        detail.setCreateTime(new Date());

        detail.setUpdateTime(new Date());

        detail.setDesc(new Gson().toJson(content));

        detail.setMsgType(MsgTypeInviteTypeEnum.inviteNew);

        detail.setRead(false);

        detail.setUser(new UserInfo(uid));

        detail.setInviteUser(threeSale);

        detail.setMsgType(MsgTypeInviteTypeEnum.inviteSucceed);

        detail.setDesc("队员（好友）熟练使用App可获得红包");

        detail.setBeiZhu("满足获得红包条件后系统将自动下发到“我的-红包”中");

        detail.setCreateTime(new Date());

        detail.setUpdateTime(new Date());

        return detail;

    }

    


 fanli/src/main/java/com/yeshi/fanli/util/factory/msg/UserMsgVOFactory.java

@@ -988,14 +988,10 @@


            return new UserMsgVO("http://img.flqapp.com/resource/msg/icon_msg_invite.png", dto.getTitle(),

                    msg.getUpdateTime() == null ? msg.getCreateTime() : msg.getUpdateTime(), items);

        } else if (msgType == MsgTypeInviteTypeEnum.inviteNew) {

            if (StringUtil.isNullOrEmpty(msg.getDesc()))

        } else if (msgType == MsgTypeInviteTypeEnum.inviteSucceed) {

            if (msg.getInviteUser() == null || msg.getInviteUser().getWorker() == null)

                return null;



            MsgInviteContentDTO dto = new Gson().fromJson(msg.getDesc(), MsgInviteContentDTO.class);

            if (dto == null)

                return null;



			
            List<CommonMsgItemVO> items = new ArrayList<>();

            List<ClientTextStyleVO> contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(msg.getInviteUser().getWorker().getNickName() + "", COLOR_CONTENT,

@@ -1003,20 +999,12 @@
            items.add(new CommonMsgItemVO(new ClientTextStyleVO("被邀请人", COLOR_TITLE), contentList));

            

            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getState() + "", COLOR_CONTENT));

            contentList.add(new ClientTextStyleVO("邀请队员成功", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("邀请状态", COLOR_TITLE), contentList));



            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getMode() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("熟练使用", COLOR_TITLE), contentList));

			
            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getCode() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("必要条件", COLOR_TITLE), contentList));



            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(dto.getInviter() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("选择条件", COLOR_TITLE), contentList));

            contentList.add(new ClientTextStyleVO(msg.getDesc() + "", COLOR_CONTENT));

            items.add(new CommonMsgItemVO(new ClientTextStyleVO("红包相关", COLOR_TITLE), contentList));



            contentList = new ArrayList<>();

            contentList.add(new ClientTextStyleVO(StringUtil.isNullOrEmpty(msg.getBeiZhu()) ? "无" : msg.getBeiZhu(),