Merge branch 'master' into dev-moneydetail

admin

2018-12-19 d1bf4588a39bcba69fd39f3cc3b3a6c439e25cb6

 fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushServiceImpl.java

@@ -22,6 +22,7 @@
import com.yeshi.fanli.service.inter.user.AccountMessageService;

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

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;



@Service

public class PushServiceImpl implements PushService {

@@ -54,20 +55,24 @@


   @Resource

   private XMPushService xmPushService;

	


   @Resource

   private PushRecordMapper pushRecordMapper;

	


   @Resource

   private AccountMessageMapper accountMessageMapper;

	
	


   @Async("pushExecutor")

   @Override

   public void pushGoods(Long uid, String url, String title, String content) throws PushException {

      String gids = url.split("id=")[1];

      String gid = gids.split("&")[0];

      if (StringUtil.isNullOrEmpty(gid))

         throw new PushException(1, "商品解析失败");

      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "请填写推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "请填写推送内容");



      PushRecord pushRecord = new PushRecord();

      pushRecord.setState(1);

@@ -79,7 +84,7 @@


      xmPushService.pushGoods(uid, Long.parseLong(gid), title, content);

      iosPushService.pushGoods(uid, Long.parseLong(gid), title, content);

      //hwPushService.pushGoods(uid, Long.parseLong(gid), title, content);

      // hwPushService.pushGoods(uid, Long.parseLong(gid), title, content);



      pushRecordMapper.insertSelective(pushRecord);

   }

@@ -87,6 +92,14 @@
   @Async("pushExecutor")

   @Override

   public void pushUrl(Long uid, String url, String title, String content) throws PushException {



      if (StringUtil.isNullOrEmpty(url))

         throw new PushException(1, "无推送链接");

      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");



      PushRecord pushRecord = new PushRecord();

      pushRecord.setState(1);

      pushRecord.setType(PushController.URL);

@@ -103,9 +116,13 @@
   @Async("pushExecutor")

   @Override

   public void pushZNX(Long uId, String title, String content) throws PushException {

      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");



      /* 无uid , 广播 数据插入系统表 */

      if (uId == null||uId==0) {

      if (uId == null || uId == 0) {

         // 插入数据库（系统站内信数据）

         SystemZnx systemZnx = new SystemZnx();

         systemZnx.setTitle(title);

@@ -147,5 +164,18 @@
      }

   }



   @Override

   public void pushWEEX(Long uid, String title, String content, String weexUrl) throws PushException {

      if (StringUtil.isNullOrEmpty(title))

         throw new PushException(1, "无推送标题");

      if (StringUtil.isNullOrEmpty(content))

         throw new PushException(1, "无推送内容");

      iosPushService.pushWEEX(uid, title, content, weexUrl);

   }



   @Override

   public void pushBaiChuanUrl(Long uid, String title, String content, String url) throws PushException {

      iosPushService.pushBaiChuanUrl(uid, title, content, url);

   }



}