From f5ad4a8171b20ab75eaac90c9717fe7fd801d6cd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 08 三月 2019 16:18:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java
index 3d49b7b..a0e3225 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java
@@ -124,7 +124,6 @@
// 鏇存柊鏁版嵁
updateByPrimaryKey(current);
}
-
}
@Override
@@ -143,13 +142,10 @@
}
- // TODO 鎺ㄩ�佽烦杞�
-
-
String uids = pushCoupon.getUids();
if (uids == null || uids.trim().length() == 0) {
// 鍏ㄦ帹
- //pushService.pushZNX(null, title, content);
+ pushService.pushWelfareCenter(null, title, content);
} else {
// 鎸囧畾鐢ㄦ埛鎺ㄩ��
@@ -159,7 +155,7 @@
for (int i = 0; i < uidArray.length; i++) {
String str_uid = uidArray[i];
if (str_uid != null && str_uid.trim().length() > 0) {
- //pushService.pushZNX(Long.parseLong(str_uid), title, content);
+ pushService.pushWelfareCenter(Long.parseLong(str_uid), title, content);
}
}
}
--
Gitblit v1.8.0