add union

@@ -295,3 +295,12 @@ union_types:
     
     
   - value: 195
   - value: 195
     name: mobvista5
     name: mobvista5
+    
+  - value: 196
+    name: ASZM-fensitong4
+    
+  - value: 197
+    name: ASZM-fensitong5
+    
+  - value: 198
+    name: ASZM-fensitong6

@@ -282,10 +282,14 @@ public class UnionServiceImpl implements IUnionService {
 					//改成httpclient方式调用
 					//改成httpclient方式调用
 					
 					
 					Pair<Integer, String> pair = HttpUtils.httpGet(url);
 					Pair<Integer, String> pair = HttpUtils.httpGet(url);
-					
 					log.info("activateUnion call union success url={}, and result={}", url, pair);
 					log.info("activateUnion call union success url={}, and result={}", url, pair);
+					if (pair.getLeft() != 200) {
+						log.warn("callback error with request={}", request);
+						return new UnionResponse(204, "callback error");
+					}
 				} catch (Exception e) {
 				} catch (Exception e) {
 					log.error("callback error with request={}", request, e);
 					log.error("callback error with request={}", request, e);
+					return new UnionResponse(204, "callback error");
 				}
 				}
 			}
 			}
 			// 调用成功，更新数据库
 			// 调用成功，更新数据库