Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -266,16 +266,16 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 			logger.info("add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
 			// parse JSON String to Object
 			JSONObject jsonObject = JSONObject.fromObject(result);
-			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-			String oderSn = respData.getString("oder_sn");
+			//JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+			String oderSn = jsonObject.getString("oder_sn");
 			if (oderSn != null) {
-				String msg = respData.getString("msg");
+				String msg = jsonObject.getString("msg");
 				if ("success".equals(msg)) {
 					return true;
 				}
 			}
 			logger.error(this, "add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
-			throw new Exception(respData.getString("msg"));
+			throw new Exception(jsonObject.getString("msg"));
 		} catch (Exception e) {
 			throw e;
 		}

watero-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -301,16 +301,16 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 			logger.info("add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
 			// parse JSON String to Object
 			JSONObject jsonObject = JSONObject.fromObject(result);
-			JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-			String oderSn = respData.getString("oder_sn");
+			//JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+			String oderSn = jsonObject.getString("oder_sn");
 			if (oderSn != null) {
-				String msg = respData.getString("msg");
+				String msg = jsonObject.getString("msg");
 				if ("success".equals(msg)) {
 					return true;
 				}
 			}
 			logger.error(this, "add-推送订单号为:" + order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
-		throw new Exception(respData.getString("msg"));
+		throw new Exception(jsonObject.getString("msg"));
 	} catch (Exception e) {
 		throw e;
 	}

wateroPF-wechat-service/src/main/java/com/iamberry/wechat/service/mq/EfastOrderServiceImpl.java

@@ -392,16 +392,16 @@ public class EfastOrderServiceImpl implements EfastOrderService {
 				logger.info("add-推送订单号为:" + "ZP" +  order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
 				// parse JSON String to Object
 				JSONObject jsonObject = JSONObject.fromObject(result);
-				JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
-				String oderSn = respData.getString("oder_sn");
+				//JSONObject respData = JSONObject.fromObject(jsonObject.get("resp_data"));
+				String oderSn = jsonObject.getString("oder_sn");
 				if (oderSn != null) {
-					String msg = respData.getString("msg");
+					String msg = jsonObject.getString("msg");
 					if (!"success".equals(msg)) {
 						returnFlag = false;
 					}
 				}
 				logger.error(this, "add-推送订单号为:" + "ZP" +  order.getSalesOrderid() + "的订单，百胜返回信息:" + result);
-				//throw new Exception(respData.getString("msg"));
+				throw new Exception(jsonObject.getString("msg"));
 			} catch (Exception e) {
 				//e.printStackTrace();
 			}