From 3cf41feae65a864fc00d72fdd09a676372fc3b27 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 15 三月 2019 12:22:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/service/impl/push/PushCouponServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 791d4e8..007f2f0 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
@@ -147,29 +147,36 @@
throw new PushCouponException(1, "鏍囬鎴栧唴瀹逛笉鑳戒负绌�");
}
+
+ List<String> listuid = null;
+ String uids = pushCoupon.getUids();
+ if (uids != null && uids.trim().length() > 0) {
+ listuid = Arrays.asList(uids.split(","));
+ if (listuid == null || listuid.size() == 0) {
+ throw new PushCouponException(1, "鐢ㄦ埛id鏍煎紡涓嶆纭�");
+ }
+ }
+
List<String> listVersion = null;
String versions = pushCoupon.getVersions();
if (versions != null && versions.trim().length() > 0) {
listVersion = Arrays.asList(versions.split(","));
+ if (listVersion == null || listVersion.size() == 0) {
+ throw new PushCouponException(1, "鐗堟湰鍙锋牸寮忎笉姝ｇ‘\"");
+ }
}
- String uids = pushCoupon.getUids();
- if (uids == null || uids.trim().length() == 0) {
+
+ if (listuid == null) {
// 鍏ㄦ帹
pushService.pushWelfareCenter(null, title, content, listVersion);
} else {
// 鎸囧畾鐢ㄦ埛鎺ㄩ��
- String[] uidArray = uids.split(",");
-
- if (uidArray != null) {
- for (int i = 0; i < uidArray.length; i++) {
- String str_uid = uidArray[i];
- if (str_uid != null && str_uid.trim().length() > 0) {
- pushService.pushWelfareCenter(Long.parseLong(str_uid), title, content, listVersion);
- }
+ for (String str_uid: listuid) {
+ if (str_uid != null && str_uid.trim().length() > 0) {
+ pushService.pushWelfareCenter(Long.parseLong(str_uid), title, content, listVersion);
}
}
-
}
// 宸叉帹閫�
--
Gitblit v1.8.0