fanli-server.git

parent: cebb7039 | 补丁 | 提交 | ignore whitespace

admin

2019-07-31 c0a5ac3b8c30cc3c97b0f4b82172ed0a7f1db6bb

添加新版本的消息推送

5个文件已修改

	fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java	23 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/entity/config/push/PushMsgFactory.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserInviteMsgNotificationServiceImpl.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserMoneyMsgNotificationServiceImpl.java	105 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fanli/src/main/java/com/yeshi/fanli/service/impl/msg/UserOrderMsgNotificationServiceImpl.java	45 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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;

@@ -71,7 +79,7 @@
        } catch (IOException e) {

            e.printStackTrace();

        }

		


        LogHelper.test("美洽:body----" + sb.toString());



        String sign = "";

@@ -97,11 +105,22 @@
            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();

                }

            }

        }



		
    }



    public String sign(String raw_body) throws java.security.SignatureException {


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

@@ -85,7 +85,7 @@
     * @return

     */



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

    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());

@@ -100,7 +100,7 @@
     * @param money

     * @return

     */

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

    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());


 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();

        }



        try {

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

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

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

        } catch (PushException e) {

            e.printStackTrace();

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

            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();

            }

        }

    }



@@ -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

			@@ -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;
			@@ -71,7 +79,7 @@
			} catch (IOException e) {
			e.printStackTrace();
			}


			LogHelper.test("美洽:body----" + sb.toString());

			String sign = "";
			@@ -97,11 +105,22 @@
			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();
			}
			}
			}


			}

			public String sign(String raw_body) throws java.security.SignatureException {

			@@ -85,7 +85,7 @@
			* @return
			*/

			public static PushContentDTO createMoneyShareRecieved(int sourceType, String orderId, BigDecimal money) {
			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());
			@@ -100,7 +100,7 @@
			* @param money
			* @return
			*/
			public static PushContentDTO createMoneyInviteRecieved(int sourceType, String orderId, BigDecimal money) {
			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());

			@@ -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

			@@ -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();
			}
			}

			}

			@@ -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();
			}

			try {
			if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0)
			pushService.pushZNX(uid, Constant.znxConfig.getFanliOrderStatisticedTitle(),
			Constant.znxConfig.getFanliOrderStatisticedMsg().replace("[订单号]", orderId), null, null);
			} catch (PushException e) {
			e.printStackTrace();
			if (payMoney != null && payMoney.compareTo(new BigDecimal(0)) > 0) {
			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();
			}
			}
			}

			@@ -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