Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-31 758be4456bb88c8c7fd008d1aa38cb64783880ee

Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -15,10 +15,15 @@
import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;



import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgDeviceReadState;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.config.ConfigService;

import com.yeshi.fanli.service.inter.msg.MsgDeviceReadStateService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.util.StringUtil;



import net.sf.json.JSONObject;



@@ -33,6 +38,9 @@
public class CallBackController {

    @Resource

    private ConfigService configService;



    @Resource

    private PushService pushService;



    @Resource

    private MsgDeviceReadStateService msgDeviceReadStateService;

@@ -97,10 +105,21 @@
            else if (contentType.equalsIgnoreCase("audio"))

                msg = "[语音]";

            String customizedId = json.optJSONObject("customizedData").optString("设备标识");

            String uid = json.optJSONObject("customizedData").optString("用户ID");

            msgDeviceReadStateService.addUnreadDeviceMsg(MsgDeviceReadState.TYPE_KEFU, customizedId,

                    "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());

            if (!StringUtil.isNullOrEmpty(uid))// 推送客服消息

            {

                PushContentDTO dto = PushMsgFactory.createMsgKefu();

                try {

                    pushService.pushZNX(Long.parseLong(uid), dto.getTitle(), dto.getContent(), null, null);

                } catch (NumberFormatException e) {

                    e.printStackTrace();

                } catch (PushException e) {

                    e.printStackTrace();

        }



            }

        }

        

    }




 fanli/src/main/java/com/yeshi/fanli/controller/client/v1/UserInfoController.java

@@ -218,7 +218,6 @@
    @Resource

    private UserTaoLiJinDetailService userTaoLiJinDetailService;

    



    private static final String PASSWORD_MAX_ERROR = "password_max_error";

    private static final String EXTRACT_MIN_MONEY = "extract_min_money";

    private static final String EXTRACT_MAX_MONEY = "extract_max_money";

@@ -1199,7 +1198,7 @@
        } else if (etype == 111) {

            out.print(JsonUtil.loadFalseResult("更换了手机号后7天内不允许提现"));

        } else if (etype == 110) {

            out.print(JsonUtil.loadFalseResult(Constant.znxConfig.getExtractWrongMsg()));

            out.print(JsonUtil.loadFalseResult("有维权订单尚未扣款"));

        }



    }

@@ -1362,7 +1361,8 @@
    }



    @RequestMapping("collectionGoods")

    public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType, PrintWriter out) {

    public void collectionGoods(AcceptData acceptData, long uid, long auctionId, int type, Integer goodsType,

            PrintWriter out) {

        if (goodsType ==  null) {

            goodsType = Constant.SOURCE_TYPE_TAOBAO;

        }

@@ -1439,7 +1439,8 @@
     * @param out

     */

    @RequestMapping("collectionGoodsJp")

    public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType, PrintWriter out) {

    public void collectionGoodsJp(String callback, AcceptData acceptData, Long uid, Long auctionId, Integer goodsType,

            PrintWriter out) {



        if (uid == null || auctionId == null) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(""));

@@ -1565,14 +1566,16 @@
    }



    @RequestMapping("deleteCollectionGoods")

    public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType, PrintWriter out) {

    public void deleteCollectionGoods(AcceptData acceptData, String ids, Integer type, long uid, Integer goodsType,

            PrintWriter out) {

        if (type != null && type == 1) {

            clearConllectionGoods(acceptData, uid, out);

        } else {

            if (!StringUtil.isNullOrEmpty(ids)) {

                Arrays.asList(ids.split(",")).parallelStream().forEach(auctionIdStr -> {

                    try {

                        collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr), goodsType);

                        collectionGoodsV2Service.cancelCollectionByAuctionId(uid, Long.parseLong(auctionIdStr),

                                goodsType);

                    } catch (Exception e) {

                        e.printStackTrace();

                    }

@@ -2152,9 +2155,6 @@
            }

            data.put("moduleState", mySettings);

            

			
			


            int welfareCenterNews = 0;

            String invitCode = null;

            UserInfoExtra userInfoExtra = userInfoExtraService.getUserInfoExtra(uid);

@@ -2235,9 +2235,9 @@
        }

    }



	
    /**

     * 用户更换头像

     * 
     * @param acceptData

     * @param fileList

     * @param uid

@@ -2245,7 +2245,8 @@
     * @param out

     */

    @RequestMapping(value = "uploadPortrait")

    public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request, PrintWriter out) {

    public void uploadPortrait(AcceptData acceptData, MultipartFile file, Long uid, HttpServletRequest request,

            PrintWriter out) {

        try {

            if (uid == null) {

                out.print(JsonUtil.loadFalseResult("用户未登录"));

@@ -2287,6 +2288,7 @@
    

    /**

     * 更换昵称

     * 
     * @param acceptData

     * @param nickName

     * @param uid


 fanli/src/main/java/com/yeshi/fanli/dto/push/PushContentDTO.java

New file
@@ -0,0 +1,31 @@
package com.yeshi.fanli.dto.push;



//推送内容

public class PushContentDTO {

    private String title;

    private String content;



    public PushContentDTO(String title, String content) {

        this.title = title;

        this.content = content;

    }



    public PushContentDTO() {

    }



    public String getTitle() {

        return title;

    }



    public void setTitle(String title) {

        this.title = title;

    }



    public String getContent() {

        return content;

    }



    public void setContent(String content) {

        this.content = content;

    }

}


 fanli/src/main/java/com/yeshi/fanli/entity/config/ZNXConfig.java

@@ -3,235 +3,109 @@
import org.yeshi.utils.annotation.Map;



public class ZNXConfig {

    // 站内信和推送消息

    // 新人红包

    @Map("newer_hongbao_title")

    private String newerHongbaoTitle;

    @Map("newer_hongbao_push")

    private String newerHongbaoPush;

    @Map("newer_hongbao_msg")

    private String newerHongbaoMsg;



    // 订单返利到账

    @Map("order_fanli_recieve_title")

    private String orderFanliRecieveTitle;

    @Map("order_fanli_recieve_push")

    private String orderFanliRecievePush;

    @Map("order_fanli_recieve_msg")

    private String orderFanliRecieveMsg;



    // 返利订单被统计

    // 返利订单被统计（失效订单无推送）

    @Map("fanli_order_statisticed_title")

    private String fanliOrderStatisticedTitle;

    @Map("fanli_order_statisticed_push")

    private String fanliOrderStatisticedPush;

    @Map("fanli_order_statisticed_msg")

    private String fanliOrderStatisticedMsg;



    // 分享订单被统计

    // 分享订单被统计（注意订单号隐藏）

    @Map("share_order_statisticed_title")

    private String shareOrderStatisticedTitle;

    @Map("share_order_statisticed_push")

    private String shareOrderStatisticedPush;

    @Map("share_order_statisticed_msg")

    private String shareOrderStatisticedMsg;



    // 邀请订单被统计

    // 邀请订单被统计（注意订单号隐藏）

    @Map("invite_order_statisticed_title")

    private String inviteOrderStatisticedTitle;

    @Map("invite_order_statisticed_push")

    private String inviteOrderStatisticedPush;

    @Map("invite_order_statisticed_msg")

    private String inviteOrderStatisticedMsg;



    // 提成订单被统计

    @Map("ticheng_order_statisticed_title")

    private String tichengOrderStatisticedTitle;

    @Map("ticheng_order_statisticed_push")

    private String tichengOrderStatisticedPush;

    @Map("ticheng_order_statisticed_msg")

    private String tichengOrderStatisticedMsg;

    // 返利到账

    @Map("money_fanli_recieved_title")

    private String moneyFanliRecievedTitle;

    @Map("money_fanli_recieved_msg")

    private String moneyFanliRecievedMsg;

    // 分享奖金到账

    @Map("money_share_recieved_title")

    private String moneyShareRecievedTitle;

    @Map("money_share_recieved_msg")

    private String moneyShareRecievedMsg;

    // 邀请奖金到账

    @Map("money_invite_recieved_title")

    private String moneyInviteRecievedTitle;

    @Map("money_invite_recieved_msg")

    private String moneyInviteRecievedMsg;



    // 邀请赚上月收入到账提示



    @Map("invite_money_recieve_title")

    private String inviteMoneyRecieveTitle;

    @Map("invite_money_recieve_push")

    private String inviteMoneyRecievePush;

    @Map("invite_money_recieve_msg")

    private String inviteMoneyRecieveMsg;



    // 分享赚商业收入到账提示

    @Map("share_money_recieve_title")

    private String shareMoneyRecieveTitle;

    @Map("share_money_recieve_push")

    private String shareMoneyRecievePush;

    @Map("share_money_recieve_msg")

    private String shareMoneyRecieveMsg;



    // 售后维权订单扣款提示



    @Map("weiquan_drawback_fanli_title")

    private String weiquanDrawbackFanliTitle;



    @Map("weiquan_drawback_fanli_msg")

    private String weiquanDrawbackFanliMsg;



    @Map("weiquan_drawback_fanli_push")

    private String weiquanDrawbackFanliPush;



    // 邀请赚维权

    @Map("weiquan_drawback_invite_title")

    private String weiquanDrawbackInviteTitle;



    @Map("weiquan_drawback_invite_msg")

    private String weiquanDrawbackInviteMsg;



    @Map("weiquan_drawback_invite_push")

    private String weiquanDrawbackInvitePush;



    // 分享赚维权

    @Map("weiquan_drawback_share_title")

    private String weiquanDrawbackShareTitle;



    @Map("weiquan_drawback_share_msg")

    private String weiquanDrawbackShareMsg;



    @Map("weiquan_drawback_share_push")

    private String weiquanDrawbackSharePush;



    // 提交提现申请

    @Map("extract_applay_title")

    private String extractApplayTitle;

    @Map("extract_applay_push")

    private String extractApplayPush;

    @Map("extract_applay_msg")

    private String extractApplayMsg;



    // 提现申请不成功，账号有误

    @Map("extract_transfer_fail_title")

    private String extractTransferFailTitle;



    @Map("extract_transfer_fail_push")

    private String extractTransferFailPush;



    @Map("extract_transfer_fail_msg")

    private String extractTransferFailMsg;



    // 提现不成功，账户出现错误

    @Map("extract_wrong_title")

    private String extractWrongTitle;



    @Map("extract_wrong_push")

    private String extractWrongPush;



    @Map("extract_wrong_msg")

    private String extractWrongMsg;



    // 系统补齐

    @Map("money_system_compensate_title")

    private String moneySystemCompensateTitle;

    @Map("money_system_compensate_msg")

    private String moneySystemCompensateMsg;

    // 系统扣除

    @Map("money_system_sub_title")

    private String moneySystemSubTitle;

    @Map("money_system_sub_msg")

    private String moneySystemSubMsg;

    // 系统奖励

    @Map("money_system_reward_title")

    private String moneySystemRewardTitle;

    @Map("money_system_reward_msg")

    private String moneySystemRewardMsg;

    // 维权扣除

    @Map("money_weiquan_title")

    private String moneyWeiquanTitle;

    @Map("money_weiquan_msg")

    private String moneyWeiquanMsg;

    // 提现成功

    @Map("extract_success_title")

    private String extractSuccessTitle;



    @Map("extract_success_push")

    private String extractSuccessPush;



    @Map("extract_success_msg")

    private String extractSuccessMsg;



    // 支付宝账户验证

    @Map("money_extract_success_title")

    private String moneyExtractSuccessTitle;

    @Map("money_extract_success_msg")

    private String moneyExtractSuccessMsg;

    // 提现失败

    @Map("money_extract_fail_title")

    private String moneyExtractFailTitle;

    @Map("money_extract_fail_msg")

    private String moneyExtractFailMsg;

    // 现金红包

    @Map("hongbao_recieved_title")

    private String hongbaoRecievedTitle;

    @Map("hongbao_recieved_msg")

    private String hongbaoRecievedMsg;

    // 支付宝账号验证

    @Map("alipay_account_valid_title")

    private String alipayAccountValidTitle;



    @Map("alipay_account_valid_msg")

    private String alipayAccountValidMsg;



    public String getInviteMoneyRecieveTitle() {

        return inviteMoneyRecieveTitle;

    }



    public void setInviteMoneyRecieveTitle(String inviteMoneyRecieveTitle) {

        this.inviteMoneyRecieveTitle = inviteMoneyRecieveTitle;

    }



    public String getInviteMoneyRecievePush() {

        return inviteMoneyRecievePush;

    }



    public void setInviteMoneyRecievePush(String inviteMoneyRecievePush) {

        this.inviteMoneyRecievePush = inviteMoneyRecievePush;

    }



    public String getInviteMoneyRecieveMsg() {

        return inviteMoneyRecieveMsg;

    }



    public void setInviteMoneyRecieveMsg(String inviteMoneyRecieveMsg) {

        this.inviteMoneyRecieveMsg = inviteMoneyRecieveMsg;

    }



    public String getShareMoneyRecieveTitle() {

        return shareMoneyRecieveTitle;

    }



    public void setShareMoneyRecieveTitle(String shareMoneyRecieveTitle) {

        this.shareMoneyRecieveTitle = shareMoneyRecieveTitle;

    }



    public String getShareMoneyRecievePush() {

        return shareMoneyRecievePush;

    }



    public void setShareMoneyRecievePush(String shareMoneyRecievePush) {

        this.shareMoneyRecievePush = shareMoneyRecievePush;

    }



    public String getShareMoneyRecieveMsg() {

        return shareMoneyRecieveMsg;

    }



    public void setShareMoneyRecieveMsg(String shareMoneyRecieveMsg) {

        this.shareMoneyRecieveMsg = shareMoneyRecieveMsg;

    }



    public String getWeiquanDrawbackInviteTitle() {

        return weiquanDrawbackInviteTitle;

    }



    public void setWeiquanDrawbackInviteTitle(String weiquanDrawbackInviteTitle) {

        this.weiquanDrawbackInviteTitle = weiquanDrawbackInviteTitle;

    }



    public String getWeiquanDrawbackInviteMsg() {

        return weiquanDrawbackInviteMsg;

    }



    public void setWeiquanDrawbackInviteMsg(String weiquanDrawbackInviteMsg) {

        this.weiquanDrawbackInviteMsg = weiquanDrawbackInviteMsg;

    }



    public String getWeiquanDrawbackInvitePush() {

        return weiquanDrawbackInvitePush;

    }



    public void setWeiquanDrawbackInvitePush(String weiquanDrawbackInvitePush) {

        this.weiquanDrawbackInvitePush = weiquanDrawbackInvitePush;

    }



    public String getAlipayAccountValidTitle() {

        return alipayAccountValidTitle;

    }



    public void setAlipayAccountValidTitle(String alipayAccountValidTitle) {

        this.alipayAccountValidTitle = alipayAccountValidTitle;

    }



    public String getAlipayAccountValidMsg() {

        return alipayAccountValidMsg;

    }



    public void setAlipayAccountValidMsg(String alipayAccountValidMsg) {

        this.alipayAccountValidMsg = alipayAccountValidMsg;

    }

    // 积分兑换成功

    @Map("score_exchange_success_title")

    private String scoreExchangeSuccessTitle;

    @Map("score_exchange_success_msg")

    private String scoreExchangeSuccessMsg;

    // 积分兑换失败

    @Map("score_exchange_fail_title")

    private String scoreExchangeFailTitle;

    @Map("score_exchange_fail_msg")

    private String scoreExchangeFailMsg;

    // 功能开通成功

    @Map("function_get_success_title")

    private String functionGetSuccessTitle;

    @Map("function_get_success_msg")

    private String functionGetSuccessMsg;

    // 功能开通失败

    @Map("function_get_fail_title")

    private String functionGetFailTitle;

    @Map("function_get_fail_msg")

    private String functionGetFailMsg;

    // 邀请队员成功

    @Map("invite_team_success_title")

    private String inviteTeamSuccessTitle;

    @Map("invite_team_success_msg")

    private String inviteTeamSuccessMsg;

    // 客服唤起

    @Map("msg_kefu_title")

    private String msgKefuTitle;

    @Map("msg_kefu_msg")

    private String msgKefuMsg;



    public String getFanliOrderStatisticedTitle() {

        return fanliOrderStatisticedTitle;

@@ -239,14 +113,6 @@


    public void setFanliOrderStatisticedTitle(String fanliOrderStatisticedTitle) {

        this.fanliOrderStatisticedTitle = fanliOrderStatisticedTitle;

    }



    public String getFanliOrderStatisticedPush() {

        return fanliOrderStatisticedPush;

    }



    public void setFanliOrderStatisticedPush(String fanliOrderStatisticedPush) {

        this.fanliOrderStatisticedPush = fanliOrderStatisticedPush;

    }



    public String getFanliOrderStatisticedMsg() {

@@ -257,236 +123,12 @@
        this.fanliOrderStatisticedMsg = fanliOrderStatisticedMsg;

    }



    public String getTichengOrderStatisticedTitle() {

        return tichengOrderStatisticedTitle;

    }



    public void setTichengOrderStatisticedTitle(String tichengOrderStatisticedTitle) {

        this.tichengOrderStatisticedTitle = tichengOrderStatisticedTitle;

    }



    public String getTichengOrderStatisticedPush() {

        return tichengOrderStatisticedPush;

    }



    public void setTichengOrderStatisticedPush(String tichengOrderStatisticedPush) {

        this.tichengOrderStatisticedPush = tichengOrderStatisticedPush;

    }



    public String getTichengOrderStatisticedMsg() {

        return tichengOrderStatisticedMsg;

    }



    public void setTichengOrderStatisticedMsg(String tichengOrderStatisticedMsg) {

        this.tichengOrderStatisticedMsg = tichengOrderStatisticedMsg;

    }



    public String getNewerHongbaoTitle() {

        return newerHongbaoTitle;

    }



    public void setNewerHongbaoTitle(String newerHongbaoTitle) {

        this.newerHongbaoTitle = newerHongbaoTitle;

    }



    public String getExtractApplayMsg() {

        return extractApplayMsg;

    }



    public void setExtractApplayMsg(String extractApplayMsg) {

        this.extractApplayMsg = extractApplayMsg;

    }



    public String getOrderFanliRecieveTitle() {

        return orderFanliRecieveTitle;

    }



    public void setOrderFanliRecieveTitle(String orderFanliRecieveTitle) {

        this.orderFanliRecieveTitle = orderFanliRecieveTitle;

    }



    public String getWeiquanDrawbackFanliTitle() {

        return weiquanDrawbackFanliTitle;

    }



    public void setWeiquanDrawbackFanliTitle(String weiquanDrawbackFanliTitle) {

        this.weiquanDrawbackFanliTitle = weiquanDrawbackFanliTitle;

    }



    public String getExtractApplayTitle() {

        return extractApplayTitle;

    }



    public void setExtractApplayTitle(String extractApplayTitle) {

        this.extractApplayTitle = extractApplayTitle;

    }



    public String getExtractTransferFailTitle() {

        return extractTransferFailTitle;

    }



    public void setExtractTransferFailTitle(String extractTransferFailTitle) {

        this.extractTransferFailTitle = extractTransferFailTitle;

    }



    public String getExtractWrongTitle() {

        return extractWrongTitle;

    }



    public void setExtractWrongTitle(String extractWrongTitle) {

        this.extractWrongTitle = extractWrongTitle;

    }



    public String getExtractSuccessTitle() {

        return extractSuccessTitle;

    }



    public void setExtractSuccessTitle(String extractSuccessTitle) {

        this.extractSuccessTitle = extractSuccessTitle;

    }



    public String getNewerHongbaoPush() {

        return newerHongbaoPush;

    }



    public void setNewerHongbaoPush(String newerHongbaoPush) {

        this.newerHongbaoPush = newerHongbaoPush;

    }



    public String getNewerHongbaoMsg() {

        return newerHongbaoMsg;

    }



    public void setNewerHongbaoMsg(String newerHongbaoMsg) {

        this.newerHongbaoMsg = newerHongbaoMsg;

    }



    public String getOrderFanliRecievePush() {

        return orderFanliRecievePush;

    }



    public void setOrderFanliRecievePush(String orderFanliRecievePush) {

        this.orderFanliRecievePush = orderFanliRecievePush;

    }



    public String getOrderFanliRecieveMsg() {

        return orderFanliRecieveMsg;

    }



    public void setOrderFanliRecieveMsg(String orderFanliRecieveMsg) {

        this.orderFanliRecieveMsg = orderFanliRecieveMsg;

    }



    public String getWeiquanDrawbackFanliMsg() {

        return weiquanDrawbackFanliMsg;

    }



    public void setWeiquanDrawbackFanliMsg(String weiquanDrawbackFanliMsg) {

        this.weiquanDrawbackFanliMsg = weiquanDrawbackFanliMsg;

    }



    public String getWeiquanDrawbackShareMsg() {

        return weiquanDrawbackShareMsg;

    }



    public void setWeiquanDrawbackShareMsg(String weiquanDrawbackShareMsg) {

        this.weiquanDrawbackShareMsg = weiquanDrawbackShareMsg;

    }



    public String getExtractApplayPush() {

        return extractApplayPush;

    }



    public void setExtractApplayPush(String extractApplayPush) {

        this.extractApplayPush = extractApplayPush;

    }



    public String getExtractTransferFailPush() {

        return extractTransferFailPush;

    }



    public void setExtractTransferFailPush(String extractTransferFailPush) {

        this.extractTransferFailPush = extractTransferFailPush;

    }



    public String getExtractTransferFailMsg() {

        return extractTransferFailMsg;

    }



    public void setExtractTransferFailMsg(String extractTransferFailMsg) {

        this.extractTransferFailMsg = extractTransferFailMsg;

    }



    public String getExtractWrongPush() {

        return extractWrongPush;

    }



    public void setExtractWrongPush(String extractWrongPush) {

        this.extractWrongPush = extractWrongPush;

    }



    public String getExtractWrongMsg() {

        return extractWrongMsg;

    }



    public void setExtractWrongMsg(String extractWrongMsg) {

        this.extractWrongMsg = extractWrongMsg;

    }



    public String getExtractSuccessPush() {

        return extractSuccessPush;

    }



    public void setExtractSuccessPush(String extractSuccessPush) {

        this.extractSuccessPush = extractSuccessPush;

    }



    public String getExtractSuccessMsg() {

        return extractSuccessMsg;

    }



    public void setExtractSuccessMsg(String extractSuccessMsg) {

        this.extractSuccessMsg = extractSuccessMsg;

    }



    public String getWeiquanDrawbackFanliPush() {

        return weiquanDrawbackFanliPush;

    }



    public void setWeiquanDrawbackFanliPush(String weiquanDrawbackFanliPush) {

        this.weiquanDrawbackFanliPush = weiquanDrawbackFanliPush;

    }



    public String getWeiquanDrawbackShareTitle() {

        return weiquanDrawbackShareTitle;

    }



    public void setWeiquanDrawbackShareTitle(String weiquanDrawbackShareTitle) {

        this.weiquanDrawbackShareTitle = weiquanDrawbackShareTitle;

    }



    public String getWeiquanDrawbackSharePush() {

        return weiquanDrawbackSharePush;

    }



    public void setWeiquanDrawbackSharePush(String weiquanDrawbackSharePush) {

        this.weiquanDrawbackSharePush = weiquanDrawbackSharePush;

    }



    public String getShareOrderStatisticedTitle() {

        return shareOrderStatisticedTitle;

    }



    public void setShareOrderStatisticedTitle(String shareOrderStatisticedTitle) {

        this.shareOrderStatisticedTitle = shareOrderStatisticedTitle;

    }



    public String getShareOrderStatisticedPush() {

        return shareOrderStatisticedPush;

    }



    public void setShareOrderStatisticedPush(String shareOrderStatisticedPush) {

        this.shareOrderStatisticedPush = shareOrderStatisticedPush;

    }



    public String getShareOrderStatisticedMsg() {

@@ -505,14 +147,6 @@
        this.inviteOrderStatisticedTitle = inviteOrderStatisticedTitle;

    }



    public String getInviteOrderStatisticedPush() {

        return inviteOrderStatisticedPush;

    }



    public void setInviteOrderStatisticedPush(String inviteOrderStatisticedPush) {

        this.inviteOrderStatisticedPush = inviteOrderStatisticedPush;

    }



    public String getInviteOrderStatisticedMsg() {

        return inviteOrderStatisticedMsg;

    }

@@ -521,4 +155,276 @@
        this.inviteOrderStatisticedMsg = inviteOrderStatisticedMsg;

    }



    public String getMoneyFanliRecievedTitle() {

        return moneyFanliRecievedTitle;

    }



    public void setMoneyFanliRecievedTitle(String moneyFanliRecievedTitle) {

        this.moneyFanliRecievedTitle = moneyFanliRecievedTitle;

    }



    public String getMoneyFanliRecievedMsg() {

        return moneyFanliRecievedMsg;

    }



    public void setMoneyFanliRecievedMsg(String moneyFanliRecievedMsg) {

        this.moneyFanliRecievedMsg = moneyFanliRecievedMsg;

    }



    public String getMoneyShareRecievedTitle() {

        return moneyShareRecievedTitle;

    }



    public void setMoneyShareRecievedTitle(String moneyShareRecievedTitle) {

        this.moneyShareRecievedTitle = moneyShareRecievedTitle;

    }



    public String getMoneyShareRecievedMsg() {

        return moneyShareRecievedMsg;

    }



    public void setMoneyShareRecievedMsg(String moneyShareRecievedMsg) {

        this.moneyShareRecievedMsg = moneyShareRecievedMsg;

    }



    public String getMoneySystemCompensateTitle() {

        return moneySystemCompensateTitle;

    }



    public void setMoneySystemCompensateTitle(String moneySystemCompensateTitle) {

        this.moneySystemCompensateTitle = moneySystemCompensateTitle;

    }



    public String getMoneySystemCompensateMsg() {

        return moneySystemCompensateMsg;

    }



    public void setMoneySystemCompensateMsg(String moneySystemCompensateMsg) {

        this.moneySystemCompensateMsg = moneySystemCompensateMsg;

    }



    public String getMoneySystemSubTitle() {

        return moneySystemSubTitle;

    }



    public void setMoneySystemSubTitle(String moneySystemSubTitle) {

        this.moneySystemSubTitle = moneySystemSubTitle;

    }



    public String getMoneySystemSubMsg() {

        return moneySystemSubMsg;

    }



    public void setMoneySystemSubMsg(String moneySystemSubMsg) {

        this.moneySystemSubMsg = moneySystemSubMsg;

    }



    public String getMoneySystemRewardTitle() {

        return moneySystemRewardTitle;

    }



    public void setMoneySystemRewardTitle(String moneySystemRewardTitle) {

        this.moneySystemRewardTitle = moneySystemRewardTitle;

    }



    public String getMoneySystemRewardMsg() {

        return moneySystemRewardMsg;

    }



    public void setMoneySystemRewardMsg(String moneySystemRewardMsg) {

        this.moneySystemRewardMsg = moneySystemRewardMsg;

    }



    public String getMoneyWeiquanTitle() {

        return moneyWeiquanTitle;

    }



    public void setMoneyWeiquanTitle(String moneyWeiquanTitle) {

        this.moneyWeiquanTitle = moneyWeiquanTitle;

    }



    public String getMoneyWeiquanMsg() {

        return moneyWeiquanMsg;

    }



    public void setMoneyWeiquanMsg(String moneyWeiquanMsg) {

        this.moneyWeiquanMsg = moneyWeiquanMsg;

    }



    public String getMoneyExtractSuccessTitle() {

        return moneyExtractSuccessTitle;

    }



    public void setMoneyExtractSuccessTitle(String moneyExtractSuccessTitle) {

        this.moneyExtractSuccessTitle = moneyExtractSuccessTitle;

    }



    public String getMoneyExtractSuccessMsg() {

        return moneyExtractSuccessMsg;

    }



    public void setMoneyExtractSuccessMsg(String moneyExtractSuccessMsg) {

        this.moneyExtractSuccessMsg = moneyExtractSuccessMsg;

    }



    public String getMoneyExtractFailTitle() {

        return moneyExtractFailTitle;

    }



    public void setMoneyExtractFailTitle(String moneyExtractFailTitle) {

        this.moneyExtractFailTitle = moneyExtractFailTitle;

    }



    public String getMoneyExtractFailMsg() {

        return moneyExtractFailMsg;

    }



    public void setMoneyExtractFailMsg(String moneyExtractFailMsg) {

        this.moneyExtractFailMsg = moneyExtractFailMsg;

    }



    public String getHongbaoRecievedTitle() {

        return hongbaoRecievedTitle;

    }



    public void setHongbaoRecievedTitle(String hongbaoRecievedTitle) {

        this.hongbaoRecievedTitle = hongbaoRecievedTitle;

    }



    public String getHongbaoRecievedMsg() {

        return hongbaoRecievedMsg;

    }



    public void setHongbaoRecievedMsg(String hongbaoRecievedMsg) {

        this.hongbaoRecievedMsg = hongbaoRecievedMsg;

    }



    public String getAlipayAccountValidTitle() {

        return alipayAccountValidTitle;

    }



    public void setAlipayAccountValidTitle(String alipayAccountValidTitle) {

        this.alipayAccountValidTitle = alipayAccountValidTitle;

    }



    public String getAlipayAccountValidMsg() {

        return alipayAccountValidMsg;

    }



    public void setAlipayAccountValidMsg(String alipayAccountValidMsg) {

        this.alipayAccountValidMsg = alipayAccountValidMsg;

    }



    public String getScoreExchangeSuccessTitle() {

        return scoreExchangeSuccessTitle;

    }



    public void setScoreExchangeSuccessTitle(String scoreExchangeSuccessTitle) {

        this.scoreExchangeSuccessTitle = scoreExchangeSuccessTitle;

    }



    public String getScoreExchangeSuccessMsg() {

        return scoreExchangeSuccessMsg;

    }



    public void setScoreExchangeSuccessMsg(String scoreExchangeSuccessMsg) {

        this.scoreExchangeSuccessMsg = scoreExchangeSuccessMsg;

    }



    public String getScoreExchangeFailTitle() {

        return scoreExchangeFailTitle;

    }



    public void setScoreExchangeFailTitle(String scoreExchangeFailTitle) {

        this.scoreExchangeFailTitle = scoreExchangeFailTitle;

    }



    public String getScoreExchangeFailMsg() {

        return scoreExchangeFailMsg;

    }



    public void setScoreExchangeFailMsg(String scoreExchangeFailMsg) {

        this.scoreExchangeFailMsg = scoreExchangeFailMsg;

    }



    public String getFunctionGetSuccessTitle() {

        return functionGetSuccessTitle;

    }



    public void setFunctionGetSuccessTitle(String functionGetSuccessTitle) {

        this.functionGetSuccessTitle = functionGetSuccessTitle;

    }



    public String getFunctionGetSuccessMsg() {

        return functionGetSuccessMsg;

    }



    public void setFunctionGetSuccessMsg(String functionGetSuccessMsg) {

        this.functionGetSuccessMsg = functionGetSuccessMsg;

    }



    public String getFunctionGetFailTitle() {

        return functionGetFailTitle;

    }



    public void setFunctionGetFailTitle(String functionGetFailTitle) {

        this.functionGetFailTitle = functionGetFailTitle;

    }



    public String getFunctionGetFailMsg() {

        return functionGetFailMsg;

    }



    public void setFunctionGetFailMsg(String functionGetFailMsg) {

        this.functionGetFailMsg = functionGetFailMsg;

    }



    public String getInviteTeamSuccessTitle() {

        return inviteTeamSuccessTitle;

    }



    public void setInviteTeamSuccessTitle(String inviteTeamSuccessTitle) {

        this.inviteTeamSuccessTitle = inviteTeamSuccessTitle;

    }



    public String getInviteTeamSuccessMsg() {

        return inviteTeamSuccessMsg;

    }



    public void setInviteTeamSuccessMsg(String inviteTeamSuccessMsg) {

        this.inviteTeamSuccessMsg = inviteTeamSuccessMsg;

    }



    public String getMsgKefuTitle() {

        return msgKefuTitle;

    }



    public void setMsgKefuTitle(String msgKefuTitle) {

        this.msgKefuTitle = msgKefuTitle;

    }



    public String getMsgKefuMsg() {

        return msgKefuMsg;

    }



    public void setMsgKefuMsg(String msgKefuMsg) {

        this.msgKefuMsg = msgKefuMsg;

    }



    public String getMoneyInviteRecievedTitle() {

        return moneyInviteRecievedTitle;

    }



    public void setMoneyInviteRecievedTitle(String moneyInviteRecievedTitle) {

        this.moneyInviteRecievedTitle = moneyInviteRecievedTitle;

    }



    public String getMoneyInviteRecievedMsg() {

        return moneyInviteRecievedMsg;

    }



    public void setMoneyInviteRecievedMsg(String moneyInviteRecievedMsg) {

        this.moneyInviteRecievedMsg = moneyInviteRecievedMsg;

    }



}


 fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java

New file
@@ -0,0 +1,321 @@
package com.yeshi.fanli.entity.config.push;



import java.math.BigDecimal;

import java.util.Date;



import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.account.UserUtil;



public class PushMsgFactory {



    /**

     * 返利订单被统计

     * 
     * @param sourceType

     * @param orderId

     * @param money

     * @return

     */

    public static PushContentDTO createFanLiOrderStatisticed(int sourceType, String orderId, BigDecimal money) {

        String title = Constant.znxConfig.getFanliOrderStatisticedTitle();

        String content = Constant.znxConfig.getFanliOrderStatisticedMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType)).replace("[订单号]", orderId)

                .replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 分享订单被统计

     * 
     * @param sourceType

     * @param orderId

     * @param money

     * @return

     */

    public static PushContentDTO createShareOrderStatisticed(int sourceType, String orderId, BigDecimal money) {

        String title = Constant.znxConfig.getShareOrderStatisticedTitle();

        String content = Constant.znxConfig.getShareOrderStatisticedMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType))

                .replace("[订单号]", orderId.substring(0, orderId.length() - 6) + "******")

                .replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 邀请订单被统计

     * 
     * @param sourceType

     * @param orderId

     * @param money

     * @return

     */

    public static PushContentDTO createInviteOrderStatisticed(int sourceType, String orderId, BigDecimal money) {

        String title = Constant.znxConfig.getInviteOrderStatisticedTitle();

        String content = Constant.znxConfig.getInviteOrderStatisticedMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType))

                .replace("[订单号]", orderId.substring(0, orderId.length() - 6) + "******")

                .replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 返利到账

     * 
     * @param sourceType

     * @param orderId

     * @param money

     * @return

     */

    public static PushContentDTO createMoneyFanliRecieved(int sourceType, String orderId, BigDecimal money) {

        String title = Constant.znxConfig.getMoneyFanliRecievedTitle();

        String content = Constant.znxConfig.getMoneyFanliRecievedMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType)).replace("[订单号]", orderId)

                .replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 分享奖金到账

     * 
     * @param sourceType

     * @param orderId

     * @param money

     * @return

     */



    public static PushContentDTO createMoneyShareRecieved(int sourceType, BigDecimal money) {

        String title = Constant.znxConfig.getMoneyShareRecievedTitle();

        String content = Constant.znxConfig.getMoneyShareRecievedMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType)).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 邀请奖金到账

     * 
     * @param sourceType

     * @param orderId

     * @param money

     * @return

     */

    public static PushContentDTO createMoneyInviteRecieved(int sourceType, BigDecimal money) {

        String title = Constant.znxConfig.getMoneyInviteRecievedTitle();

        String content = Constant.znxConfig.getMoneyInviteRecievedMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType)).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 系统补齐

     * 
     * @param reason

     * @param money

     * @return

     */

    public static PushContentDTO createMoneySystemCompensate(String reason, BigDecimal money) {

        String title = Constant.znxConfig.getMoneySystemCompensateTitle();

        String content = Constant.znxConfig.getMoneySystemCompensateMsg();

        content = content.replace("[原因]", reason).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 系统扣除

     * @param reason

     * @param money

     * @return

     */

    public static PushContentDTO createMoneySystemSub(String reason, BigDecimal money) {

        String title = Constant.znxConfig.getMoneySystemSubTitle();

        String content = Constant.znxConfig.getMoneySystemSubMsg();

        content = content.replace("[原因]", reason).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 系统奖励

     * @param reason

     * @param money

     * @return

     */

    public static PushContentDTO createMoneySystemReward(String reason, BigDecimal money) {

        String title = Constant.znxConfig.getMoneySystemRewardTitle();

        String content = Constant.znxConfig.getMoneySystemRewardMsg();

        content = content.replace("[原因]", reason).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 返利维权扣除

     * 
     * @param sourceType

     * @param orderId

     * @param part-是否为部分维权

     * @param money

     * @return

     */

    public static PushContentDTO createMoneyOrderFanLiWeiquan(int sourceType, String orderId, boolean part,

            BigDecimal money) {

        String title = Constant.znxConfig.getMoneyWeiquanTitle();

        String content = Constant.znxConfig.getMoneyWeiquanMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType)).replace("[订单号]", orderId)

                .replace("[部分]", part ? "部分" : "").replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 分享或邀请维权扣除

     * 
     * @param sourceType

     * @param orderId

     * @param part

     * @param money

     * @return

     */



    public static PushContentDTO createMoneyOrderShareOrInviteWeiquan(int sourceType, String orderId, boolean part,

            BigDecimal money) {

        String title = Constant.znxConfig.getMoneyWeiquanTitle();

        String content = Constant.znxConfig.getMoneyWeiquanMsg();

        content = content.replace("[订单类型]", Constant.getSourceName(sourceType))

                .replace("[订单号]", orderId.substring(0, orderId.length() - 6) + "******")

                .replace("[部分]", part ? "部分" : "").replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 提现成功

     * @param applyTime

     * @param money

     * @param alipayAccount

     * @return

     */

    public static PushContentDTO createMoneyExtractSuccess(Date applyTime, BigDecimal money, String alipayAccount) {

        String title = Constant.znxConfig.getMoneyExtractSuccessTitle();

        String content = Constant.znxConfig.getMoneyExtractSuccessMsg();

        content = content.replace("[提现时间]", TimeUtil.getGernalTime(applyTime.getTime(), "yyyy.MM.dd HH:mm"))

                .replace("[支付宝账号]",UserUtil.filterAlipayAccount(alipayAccount)).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 提现失败

     * @param applyTime

     * @param money

     * @param alipayAccount

     * @return

     */

    public static PushContentDTO createmoneyExtractFail(Date applyTime, BigDecimal money, String alipayAccount) {

        String title = Constant.znxConfig.getMoneyExtractFailTitle();

        String content = Constant.znxConfig.getMoneyExtractFailMsg();

        content = content.replace("[提现时间]", TimeUtil.getGernalTime(applyTime.getTime(), "yyyy.MM.dd HH:mm"))

                .replace("[支付宝账号]", UserUtil.filterAlipayAccount(alipayAccount)).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 现金红包

     * @param reason

     * @param money

     * @return

     */

    public static PushContentDTO createHongbaoRecieved(String reason, BigDecimal money) {

        String title = Constant.znxConfig.getHongbaoRecievedTitle();

        String content = Constant.znxConfig.getHongbaoRecievedMsg();

        content = content.replace("[原因]", reason).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 支付宝账号验证

     * @param alipayAccount

     * @param money

     * @return

     */

    public static PushContentDTO createAlipayAccountValid(String alipayAccount, BigDecimal money) {

        String title = Constant.znxConfig.getAlipayAccountValidTitle();

        String content = Constant.znxConfig.getAlipayAccountValidMsg();

        content = content.replace("[支付宝账号]", UserUtil.filterAlipayAccount(alipayAccount)).replace("[金额]", money.toString());

        return new PushContentDTO(title, content);

    }



    /**

     * 积分兑换成功

     * @param reason

     * @param time

     * @return

     */

    public static PushContentDTO createScoreExchangeSuccess(Date time, int score) {

        String title = Constant.znxConfig.getScoreExchangeSuccessTitle();

        String content = Constant.znxConfig.getScoreExchangeSuccessMsg();

        content = content.replace("[时间]", TimeUtil.getGernalTime(time.getTime(), "yyyy.MM.dd HH:mm")).replace("[积分数额]",

                score + "");

        return new PushContentDTO(title, content);

    }



    /**

     * 积分兑换失败

     * @param reason

     * @param time

     * @return

     */

    public static PushContentDTO createScoreExchangeFail(String reason, Date time) {

        String title = Constant.znxConfig.getScoreExchangeFailTitle();

        String content = Constant.znxConfig.getScoreExchangeFailMsg();

        content = content.replace("[时间]", TimeUtil.getGernalTime(time.getTime(), "yyyy.MM.dd HH:mm")).replace("[原因]",

                reason);

        return new PushContentDTO(title, content);

    }



	
    /**

     * 功能开通成功

     * @param functionName

     * @return

     */

    public static PushContentDTO createFunctionGetSuccess(String functionName) {

        String title = Constant.znxConfig.getFunctionGetSuccessTitle();

        String content = Constant.znxConfig.getFunctionGetSuccessMsg();

        content = content.replace("[增值功能]", functionName);

        return new PushContentDTO(title, content);

    }



    /**

     * 功能开通失败

     * @param functionName

     * @return

     */

    public static PushContentDTO createFunctionGetFail(String functionName) {

        String title = Constant.znxConfig.getFunctionGetFailTitle();

        String content = Constant.znxConfig.getFunctionGetFailMsg();

        content = content.replace("[增值功能]", functionName);

        return new PushContentDTO(title, content);

    }



    /**

     * 邀请队员成功

     * @param time

     * @param nickName

     * @return

     */

    public static PushContentDTO createInviteTeamSuccess(Date time, String nickName) {

        String title = Constant.znxConfig.getInviteTeamSuccessTitle();

        String content = Constant.znxConfig.getInviteTeamSuccessMsg();

        content = content.replace("[时间]", TimeUtil.getGernalTime(time.getTime(), "yyyy.MM.dd HH:mm")).replace("[队员昵称]",

                nickName);

        return new PushContentDTO(title, content);

    }



    /**

     * 客服唤起

     * @return

     */

    public static PushContentDTO createMsgKefu() {

        String title = Constant.znxConfig.getMsgKefuTitle();

        String content = Constant.znxConfig.getMsgKefuMsg();

        return new PushContentDTO(title, content);

    }



}


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

@@ -25,7 +25,6 @@
import com.yeshi.fanli.dao.mybatis.taobao.TaoBaoWeiQuanOrderMapper;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.dto.HongBaoDTO;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.bus.user.HongBaoV2;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.bus.user.UserExtraTaoBaoInfo;

@@ -48,7 +47,6 @@
import com.yeshi.fanli.service.inter.order.ShareGoodsActivityOrderService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.service.inter.user.UserShareGoodsGroupService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponRecordService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

@@ -95,9 +93,6 @@


    @Resource

    private ThreeSaleSerivce threeSaleSerivce;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private UserOrderMsgNotificationService userOrderMsgNotificationService;

@@ -189,20 +184,17 @@
                                money, goodsCount, state);

                        break;

                    case HongBaoV2.TYPE_SHARE_GOODS:

                        userNotificationService.orderShareStatisticed(uid, orderId, goodsCount, MsgOrderDetail.STATE_FK,

                                null, money);

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

                                money, goodsCount, state);

                        break;

                    case HongBaoV2.TYPE_YIJI:

                        userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,

                                MsgOrderDetail.STATE_FK, null, money);

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

                                money, goodsCount, state);

                        break;

                    case HongBaoV2.TYPE_ERJI:

                        userNotificationService.orderInviteStatisticed(uid, orderId, goodsCount,

                                MsgOrderDetail.STATE_FK, null, money);

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

                                money, goodsCount, state);

                        break;


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserInviteMsgNotificationServiceImpl.java

@@ -1,14 +1,20 @@
package com.yeshi.fanli.service.impl.msg;



import java.util.Date;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;



import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgInviteDetail;

import com.yeshi.fanli.entity.bus.user.ThreeSale;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.msg.MsgInviteDetailException;

import com.yeshi.fanli.service.inter.msg.MsgInviteDetailService;

import com.yeshi.fanli.service.inter.msg.UserInviteMsgNotificationService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.util.factory.msg.MsgInviteDetailFactory;



@Service

@@ -16,6 +22,9 @@


    @Resource

    private MsgInviteDetailService msgInviteDetailService;



    @Resource

    private PushService pushService;



    @Override

    public void inviteScan(Long uid, ThreeSale sale) {

@@ -35,6 +44,16 @@
        } catch (MsgInviteDetailException e) {

            e.printStackTrace();

        }



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

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }



    }



    @Override


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java

@@ -1,17 +1,22 @@
package com.yeshi.fanli.service.impl.msg;



import java.math.BigDecimal;

import java.util.Date;



import javax.annotation.Resource;



import org.springframework.stereotype.Service;



import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgMoneyDetail;

import com.yeshi.fanli.entity.bus.user.AlipayAccountValidNormalHistory;

import com.yeshi.fanli.entity.bus.user.Extract;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.msg.MsgMoneyDetailException;

import com.yeshi.fanli.service.inter.msg.MsgMoneyDetailService;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.push.PushService;

import com.yeshi.fanli.util.factory.msg.MsgMoneyDetailFactory;



@Service

@@ -19,6 +24,8 @@


    @Resource

    private MsgMoneyDetailService msgMoneyDetailService;

    @Resource

    private PushService pushService;



    @Override

    public void extractApplay(Extract extract) {

@@ -41,6 +48,15 @@
            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createmoneyExtractFail(new Date(extract.getExtractTime()),

                extract.getMoney(), extract.getAccount());

        try {

            pushService.pushZNX(extract.getUserInfo().getId(), dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -52,7 +68,15 @@
        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneyExtractSuccess(new Date(extract.getExtractTime()),

                extract.getMoney(), extract.getAccount());

        try {

            pushService.pushZNX(extract.getUserInfo().getId(), dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -62,6 +86,15 @@
        try {

            msgMoneyDetailService.addMsgMoneyDetail(detail);

        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createAlipayAccountValid(history.getAccount(), new BigDecimal("0.1"));

        try {

            pushService.pushZNX(history.getUid(), dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }

@@ -77,6 +110,14 @@
            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneyFanliRecieved(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -86,6 +127,16 @@
        try {

            msgMoneyDetailService.addMsgMoneyDetail(detail);

        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        // TODO 需要传入是否部分维权

        PushContentDTO dto = PushMsgFactory.createMoneyOrderFanLiWeiquan(orderType, orderId, false, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }

@@ -100,6 +151,14 @@
        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }

        PushContentDTO dto = PushMsgFactory.createMoneyShareRecieved(orderType, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -109,6 +168,15 @@
        try {

            msgMoneyDetailService.addMsgMoneyDetail(detail);

        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneyOrderShareOrInviteWeiquan(orderType, orderId, false, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }



@@ -125,6 +193,14 @@
            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneyInviteRecieved(orderType, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -136,7 +212,14 @@
        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneyOrderShareOrInviteWeiquan(orderType, orderId, false, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -148,6 +231,15 @@
        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneySystemReward("使用返利奖励券", money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



    @Override

@@ -158,6 +250,15 @@
        } catch (MsgMoneyDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createMoneySystemCompensate(reason, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }



}


 fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java

@@ -7,7 +7,9 @@


import org.springframework.stereotype.Service;



import com.yeshi.fanli.dto.push.PushContentDTO;

import com.yeshi.fanli.entity.bus.msg.MsgOrderDetail;

import com.yeshi.fanli.entity.config.push.PushMsgFactory;

import com.yeshi.fanli.exception.PushException;

import com.yeshi.fanli.exception.msg.MsgOrderDetailException;

import com.yeshi.fanli.service.inter.msg.MsgOrderDetailService;

@@ -37,12 +39,15 @@
            e.printStackTrace();

        }



        if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) {

            PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(orderType, orderId, money);

        try {

            if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)

                pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),

                        Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[订单号]", orderId), null, null);

                pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

            } catch (NumberFormatException e) {

                e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

            }

        }

    }



@@ -72,6 +77,15 @@
            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createFanLiOrderStatisticed(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }



    }



    @Override

@@ -97,6 +111,15 @@
            msgOrderDetailService.addMsgOrderDetail(detail,

                    (money == null || money.compareTo(new BigDecimal(0)) <= 0) ? false : true);

        } catch (MsgOrderDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }

    }

@@ -133,6 +156,16 @@
        } catch (MsgOrderDetailException e) {

            e.printStackTrace();

        }



        PushContentDTO dto = PushMsgFactory.createInviteOrderStatisticed(orderType, orderId, money);

        try {

            pushService.pushZNX(uid, dto.getTitle(), dto.getContent(), null, null);

        } catch (NumberFormatException e) {

            e.printStackTrace();

        } catch (PushException e) {

            e.printStackTrace();

        }



    }



    @Override


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

@@ -54,7 +54,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.service.inter.user.UserSystemCouponService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

@@ -72,9 +71,6 @@


    @Resource

    private UserInfoMapper userInfoMapper;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private TaoBaoUnionConfigService taoBaoUnionConfigService;

@@ -391,20 +387,10 @@


            // 站内信+推送

            UserInfo user = userInfoMapper.selectByPKey(uid);

            try {

                userNotificationService.orderFanliRecieved(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                        userGoodsCount.get(uid), user.getMyHongBao(), money);

            } catch (Exception e) {

                try {

                    LogHelper.errorDetailInfo(e);

                } catch (Exception e1) {

                    e1.printStackTrace();

                }

            }



            // 新版通知

            userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),hongBaoOrder.getCommonOrder().getSourceType(),

                    userGoodsCount.get(uid), money, user.getMyHongBao());

            userMoneyMsgNotificationService.fanliOrderReceived(uid, hongBaoOrder.getCommonOrder().getOrderNo(),

                    hongBaoOrder.getCommonOrder().getSourceType(), userGoodsCount.get(uid), money, user.getMyHongBao());

        }

        // 通知免单到账

        try {

@@ -661,8 +647,8 @@
                long invalidCount = hongBaoV2Mapper.countInviteOrderCountByUidAndSettleTime(uid, CommonOrder.STATE_SX,

                        minDate, maxDate);



                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,

                        (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());

                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createInvite(uid, Constant.SOURCE_TYPE_TAOBAO,

                        (int) validCount, (int) weiQuanCount, (int) invalidCount, invitemoney, new Date());



                // 增加资金

                userMoneyService.addUserMoney(uid, invitemoney, userMoneyDetail);

@@ -676,18 +662,9 @@
                }

            }



            // 发送推送

            try {

                // 提成到账消息通知

                userNotificationService.tiChengInviteRecieved(uid, inviteOrders.size(), inviteGoodsCount, null,

                        invitemoney);

            } catch (Exception e) {

                e.printStackTrace();

            }



            // 新版通知

            userMoneyMsgNotificationService.inviteOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(), inviteGoodsCount, invitemoney,

                    userInfoMapper.selectByPKey(uid).getMyHongBao());

            userMoneyMsgNotificationService.inviteOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, inviteOrders.size(),

                    inviteGoodsCount, invitemoney, userInfoMapper.selectByPKey(uid).getMyHongBao());



            for (String orderId : drawBackOrders)

                taoBaoWeiQuanDrawBackService.doWeiQuanInvite(orderId);

@@ -760,8 +737,8 @@
                long invalidCount = commonOrderService.countByUidAndOrderStateWithOrderBalanceTime(uid,

                        CommonOrder.STATE_SX, minDate, maxDate);



                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid,Constant.SOURCE_TYPE_TAOBAO, (int) validCount,

                        (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

                UserMoneyDetail userMoneyDetail = UserMoneyDetailFactory.createShare(uid, Constant.SOURCE_TYPE_TAOBAO,

                        (int) validCount, (int) weiQuanCount, (int) invalidCount, sharemoney, new Date());

                // 添加资金

                userMoneyService.addUserMoney(uid, sharemoney, userMoneyDetail);



@@ -775,18 +752,9 @@
                }

            }



            // 发送推送

            try {

                // 提成到账消息通知

                userNotificationService.tiChengShareRecieved(uid, shareOrders.size(), shareGoodsCount, null,

                        sharemoney);

            } catch (Exception e) {

                e.printStackTrace();

            }



            // 新版通知

            userMoneyMsgNotificationService.shareOrderReceived(uid,Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(), shareGoodsCount, sharemoney,

                    userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());

            userMoneyMsgNotificationService.shareOrderReceived(uid, Constant.SOURCE_TYPE_TAOBAO, shareOrders.size(),

                    shareGoodsCount, sharemoney, userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



            for (String orderId : drawBackOrders)

                taoBaoWeiQuanDrawBackService.doWeiQuanShare(orderId);


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoWeiQuanDrawBackServiceImpl.java

@@ -39,7 +39,6 @@
import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanDrawBackService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoWeiQuanOrderService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.StringUtil;

@@ -62,9 +61,6 @@


    @Resource

    private UserMoneyDetailMapper userMoneyDetailMapper;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private CommonOrderMapper commonOrderMapper;

@@ -263,8 +259,6 @@
            // 新版通知

            userMoneyMsgNotificationService.fanliOrderWeiQuan(uid, orderId,Constant.SOURCE_TYPE_TAOBAO, drawBackMoney,

                    userInfoMapper.selectByPKey(uid).getMyHongBao());



            userNotificationService.weiQuanFanli(uid, orderId, drawBackMoney);

        }

    }



@@ -435,11 +429,8 @@
                }

            }

            userMoneyService.subUserMoney(uid, drawBackMoney, userMoneyDetail);



            userMoneyMsgNotificationService.shareOrderWeiQuan(uid, orderId, Constant.SOURCE_TYPE_TAOBAO,drawBackMoney,

                    userInfoMapper.selectByPrimaryKey(uid).getMyHongBao());



            userNotificationService.weiQuanTiCheng(uid, orderId, drawBackMoney);

        }

    }




 fanli/src/main/java/com/yeshi/fanli/service/impl/user/BindingAccountServiceImpl.java

@@ -30,10 +30,10 @@
import com.yeshi.fanli.exception.BindingAccountException;

import com.yeshi.fanli.exception.money.UserMoneyDetailException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.msg.UserMoneyMsgNotificationService;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.user.UserAccountBindingHistoryService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;

@@ -48,18 +48,14 @@
    private AlipayAccountValidNormalHistoryMapper alipayAccountValidNormalHistoryMapper;

    @Resource

    private UserInfoMapper userInfoMapper;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private UserAccountBindingHistoryService userAccountBindingHistoryService;



    @Resource

    private UserMoneyDetailMapper userMoneyDetailMapper;



    @Resource

    private UserMoneyService userMoneyService;

    @Resource

    private UserMoneyMsgNotificationService userMoneyMsgNotificationService;



    public List<BindingAccount> getBindingAccountByUid(long uid) {

        return bindingAccountMapper.selectByUid(uid);

@@ -172,9 +168,7 @@


        // 扣款

        userMoneyService.subUserMoney(uid, money, userMoneyDetail);



        userNotificationService.alipayAccountValidRight(uid, money, account);



        userMoneyMsgNotificationService.alipayAccountValid(history);

    }



    private void transferAlipayWithVerify(String account, String name)


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/ExtractServiceImpl.java

@@ -58,12 +58,10 @@
import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserMoneyService;

import com.yeshi.fanli.service.inter.user.UserNotificationService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.GsonUtil;

import com.yeshi.fanli.util.MoneyBigDecimalUtil;

import com.yeshi.fanli.util.TimeUtil;

import com.yeshi.fanli.util.factory.UserMoneyDetailFactory;



import net.sf.json.JSONObject;

@@ -109,9 +107,6 @@


    @Resource

    private PushService pushService;



    @Resource

    private UserNotificationService userNotificationService;



    @Resource

    private UserMoneyDetailMapper userMoneyDetailMapper;

@@ -224,13 +219,6 @@
        extractAuditRecordMapper.updateByPrimaryKeySelective(auditRecord);

        // 新版资金详情



        try {

            userNotificationService.extractWrong(user.getId(), find,

                    TimeUtil.getGernalTime(find.getExtractTime(), "yyyy-MM-dd HH:mm"));

        } catch (Exception e) {

            e.printStackTrace();

        }



        // 新版通知

        userMoneyMsgNotificationService.extractFail(find, reason);

    }

@@ -303,7 +291,6 @@
        // 减去账户资金

        userMoneyService.subUserMoney(extract.getUserInfo().getId(), extract.getMoney(), userMoneyDetail);



        userNotificationService.extractApply(extract.getUserInfo().getId());

        // 添加新版通知

        userMoneyMsgNotificationService.extractApplay(extract);



@@ -470,10 +457,6 @@
            userMoneyService.addUserMoney(user.getId(), extract.getMoney(), userMoneyDetail);



            try {



                userNotificationService.extractTransferFail(user.getId(),

                        TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



                LogHelper.userInfo("支付宝转账失败:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

                        + extract.getName() + ",所转金额：" + extract.getMoney() + ",失败原因" + extract.getReason() + "]");



@@ -511,9 +494,6 @@
        extractMapper.updateByPrimaryKeySelective(updateExtract);



        try {

            userNotificationService.extractSuccess(extract.getUserInfo().getId(), extract,

                    TimeUtil.getGernalTime(extract.getExtractTime(), "yyyy-MM-dd HH:mm"));



            LogHelper.userInfo("支付宝转账成功:[提现IP：" + extract.getIp() + ",所转账号:" + extract.getAccount() + ",真实姓名："

                    + extract.getName() + ",所转金额：" + extract.getMoney() + "]");

        } catch (Exception e) {


 fanli/src/main/java/com/yeshi/fanli/service/impl/user/UserNotificationServiceImpl.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/service/inter/user/UserNotificationService.java

File was deleted

 fanli/src/main/java/com/yeshi/fanli/util/account/UserUtil.java

@@ -69,14 +69,11 @@
        return String.format(Constant.systemCommonConfig.getBaseUserRankIconUrl() + "/rank_picture_%s.png", rank + "");

    }

    

	
    public static String getInviteShortLink (Long uid) {

        return HttpUtil.getShortLink("http://" + Constant.wxGZConfig.getLoginHost() + "/"

                + Constant.systemCommonConfig.getProjectName() +

                "/client/threeShareNew?uid=" + uid +"&_=" + java.lang.System.currentTimeMillis());

        return HttpUtil.getShortLink(

                "http://" + Constant.wxGZConfig.getLoginHost() + "/" + Constant.systemCommonConfig.getProjectName()

                        + "/client/threeShareNew?uid=" + uid + "&_=" + java.lang.System.currentTimeMillis());

    }

	
	
    

    public static String getInviteCode(Long uid) {



@@ -137,37 +134,7 @@
                    name = dest.getName().charAt(0) + "*";

                dest.setName(name);



                String account = "";

                if (dest.getAccount().indexOf("@") > -1) {// 邮箱

                    int index = dest.getAccount().indexOf("@");



                    for (int i = 0; i < dest.getAccount().length(); i++) {

                        if (i < 3 || i >= index)

                            account += dest.getAccount().charAt(i);

                        else

                            account += "*";

                    }

                } else if (StringUtil.isMobile(dest.getAccount())) {// 电话

                    account = dest.getAccount().substring(0, 3) + "*****"

                            + dest.getAccount().substring(dest.getAccount().length() - 2, dest.getAccount().length());



                } else {// 其他

                    if (dest.getAccount().length() >= 6) {

                        for (int i = 0; i < dest.getAccount().length(); i++) {

                            if (i < 3 || i >= dest.getAccount().length() - 2)

                                account += dest.getAccount().charAt(i);

                            else

                                account += "*";

                        }

                    } else {

                        for (int i = 0; i < dest.getAccount().length(); i++) {

                            if (i < 1 || i >= dest.getAccount().length() - 1)

                                account += dest.getAccount().charAt(i);

                            else

                                account += "*";

                        }

                    }

                }

                String account =filterAlipayAccount(dest.getAccount());



                dest.setAccount(account);

            }

@@ -177,4 +144,39 @@
        return dest;

    }



    public static String filterAlipayAccount(String alipayAccount) {

        String account = "";

        if (alipayAccount.indexOf("@") > -1) {// 邮箱

            int index = alipayAccount.indexOf("@");



            for (int i = 0; i < alipayAccount.length(); i++) {

                if (i < 3 || i >= index)

                    account += alipayAccount.charAt(i);

                else

                    account += "*";

            }

        } else if (StringUtil.isMobile(alipayAccount)) {// 电话

            account = alipayAccount.substring(0, 3) + "*****"

                    + alipayAccount.substring(alipayAccount.length() - 2, alipayAccount.length());



        } else {// 其他

            if (alipayAccount.length() >= 6) {

                for (int i = 0; i < alipayAccount.length(); i++) {

                    if (i < 3 || i >= alipayAccount.length() - 2)

                        account += alipayAccount.charAt(i);

                    else

                        account += "*";

                }

            } else {

                for (int i = 0; i < alipayAccount.length(); i++) {

                    if (i < 1 || i >= alipayAccount.length() - 1)

                        account += alipayAccount.charAt(i);

                    else

                        account += "*";

                }

            }

        }

        return account;

    }



}


 fanli/src/main/java/com/yeshi/fanli/util/factory/AccountMessageFactory.java

File was deleted

 fanli/src/main/resource/push_msg.properties

New file
@@ -0,0 +1,95 @@
#推送消息



#返利订单被统计（失效订单无推送）

fanli_order_statisticed_title=返利订单

fanli_order_statisticed_msg=你的[订单类型]返利订单[订单号]，预估返利[金额]元，已被成功统计，请到我的-订单中查看。



#分享订单被统计（注意订单号隐藏）

share_order_statisticed_title=分享订单

share_order_statisticed_msg=你的[订单类型]分享订单[订单号]，预估分享奖金[金额]元，已被成功统计，请到我的-订单中查看。



#邀请订单被统计（注意订单号隐藏）

invite_order_statisticed_title=邀请订单

invite_order_statisticed_msg=你的[订单类型]邀请订单[订单号]，预估邀请奖金[金额]元，已被成功统计，请到我的-订单中查看。



#

#资金类消息

#



#返利到账

money_fanli_recieved_title=返利到账

money_fanli_recieved_msg=[订单类型]订单[订单号]，返利[金额]元，已存入到你的账户余额中，请注意查收。



#分享奖金到账

money_share_recieved_title=分享奖金到账

money_share_recieved_msg=你上月[订单类型]渠道有效分享奖金[金额]元，已存入到你的账户余额中，请注意查收。



#邀请奖金到账

money_invite_recieved_title=邀请奖金到账

money_invite_recieved_msg=你上月[订单类型]渠道有效邀请奖金[金额]元，已存入到你的账户余额中，请注意查收。





#系统补齐

money_system_compensate_title=系统补齐

money_system_compensate_msg=因[原因]已经修复，系统补齐金额[金额]元，已存入到你的账户余额中，请注意查收。



#系统扣除

money_system_sub_title=系统扣除

money_system_sub_msg=因[原因]，系统需从你账户中扣除[金额]元，敬请知晓，如有疑问联系人工客服。



#系统奖励

money_system_reward_title=系统奖励

money_system_reward_msg=因[原因]，奖励金额[金额]元，已存入到你的账户余额中，请注意查收。



#维权扣除

money_weiquan_title=维权扣除

money_weiquan_msg=你的[订单类型]订单[订单号]，[部分]维权成功，对应[金额]元已扣除，请到账户明细中查看。 




#提现成功

money_extract_success_title=提现成功

money_extract_success_msg=恭喜你于[提现时间]提现[金额]元，提现成功，请到[支付宝账号]中查看。





#提现失败

money_extract_fail_title=提现失败

money_extract_fail_msg=你于[提现时间]提现[金额]元，提现失败，如有疑问联系人工客服。







#现金红包

hongbao_recieved_title=现金红包

hongbao_recieved_msg=因[原因]，奖励你[金额]元红包一共，已存入到你的账户余额中，感谢你支持与信任。





#支付宝账号验证

alipay_account_valid_title=提现账号验证

alipay_account_valid_msg=系统已向你提现[提现支付宝账号]成功转账[金额]元，即提现账号成功绑定，感谢使用和信任。





#积分兑换成功

score_exchange_success_title=兑换成功

score_exchange_success_msg=你于[时间]发起的积分兑换已成功，本次兑换共消耗[积分数额][积分单位]，感谢使用和信任。





#积分兑换失败

score_exchange_fail_title=兑换失败

score_exchange_fail_msg=你于[时间]发起的积分兑换失败，失败原因：[原因]，如有疑问请联系人工客服。





#功能开通成功

function_get_success_title=开通成功

function_get_success_msg=你于成功开通[增值功能]，感谢使用和信任。





#功能开通失败

function_get_fail_title=开通失败

function_get_fail_msg=你未能开通[增值功能]，如有疑问请联系人工客服。



#邀请队员成功

invite_team_success_title=邀请成功

invite_team_success_msg=你于[时间]成功邀请队员[队员昵称]，感谢使用和信任。



#客服唤起

msg_kefu_title=客服信息

msg_kefu_msg=人工客服发来了一条消息，请注意查阅（我的-人工客服），以便解决你的疑问。