Merge branch 'master' into dev

@@ -2,10 +2,10 @@ package com.yohoufo.order.controller;
 
 import com.yoho.core.dal.datasource.annotation.Database;
 import com.yoho.error.event.PaymentEvent;
-import com.yoho.service.model.order.payment.NotifyResponse;
-import com.yoho.service.model.order.payment.PaymentData;
 import com.yohoufo.common.ApiResponse;
 import com.yohoufo.order.common.Payment;
+import com.yohoufo.order.model.NotifyResponse;
+import com.yohoufo.order.model.PaymentData;
 import com.yohoufo.order.request.PaymentRequest;
 import com.yohoufo.order.response.PaymentConfirmRsp;
 import com.yohoufo.order.response.PrepayResponse;

+package com.yohoufo.order.model;
+
+public class NotifyResponse {
+	/**
+	 * 支付回调处理结果
+	 * 0：处理成功；1：处理失败；2：校验失败
+	 */
+	public static final int PAYMENT_NOTIFY_RESULT_IGNORE = -1;
+	public static final int PAYMENT_NOTIFY_RESULT_SUCCESS = 0;
+	public static final int PAYMENT_NOTIFY_RESULT_FAILED = 1;
+	public static final int PAYMENT_NOTIFY_RESULT_VERFAIL = 2;
+	
+	//支付回调处理结果
+	private int notifyResult = PAYMENT_NOTIFY_RESULT_FAILED;
+	//支付数据
+	private PaymentData paymentData;
+	
+	public int getNotifyResult() {
+		return notifyResult;
+	}
+	public void setNotifyResult(int notifyResult) {
+		this.notifyResult = notifyResult;
+	}
+	public PaymentData getPaymentData() {
+		return paymentData;
+	}
+	public void setPaymentData(PaymentData paymentData) {
+		this.paymentData = paymentData;
+	}
+
+}

 package com.yohoufo.order.model;
 
-import com.yoho.service.model.order.payment.PayDiscount;
 import org.apache.commons.lang3.StringUtils;
 
 public class PaymentData {
@@ -92,9 +91,7 @@ public class PaymentData {
      */
     private String mchId;
 
-    //支付折扣
-    private PayDiscount payDiscount;
-    
+
     //微信支付的appId
     private String appId;
 
@@ -217,13 +214,6 @@ public class PaymentData {
 		this.mchId = mchId;
 	}
 
-	public PayDiscount getPayDiscount() {
-		return payDiscount;
-	}
-
-	public void setPayDiscount(PayDiscount payDiscount) {
-		this.payDiscount = payDiscount;
-	}
 
 	public String getOutTradeNo() {
 		return StringUtils.isEmpty(outTradeNo) ? this.payOrderCode : outTradeNo;

 package com.yohoufo.order.service;
 
-import com.yoho.service.model.order.payment.PaymentData;
 import com.yohoufo.order.request.PaymentRequest;
 import com.yohoufo.order.response.PaymentConfirmRsp;
 import com.yohoufo.order.response.PrepayResponse;

@@ -3,7 +3,6 @@ package com.yohoufo.order.service.pay.alipay;
 import com.alibaba.fastjson.JSONObject;
 import com.yoho.error.ServiceError;
 import com.yoho.error.exception.ServiceException;
-import com.yoho.service.model.order.payment.PaymentData;
 import com.yohoufo.common.utils.DateUtil;
 import com.yohoufo.common.utils.HttpClient;
 import com.yohoufo.common.utils.MD5Utils;
@@ -11,10 +10,7 @@ import com.yohoufo.common.utils.RSAUtils;
 import com.yohoufo.order.common.Payment;
 import com.yohoufo.order.config.AlipayConfig;
 import com.yohoufo.order.constants.RefundContant;
-import com.yohoufo.order.model.AlipayTradeVO;
-import com.yohoufo.order.model.OrderInfo;
-import com.yohoufo.order.model.PayQueryBo;
-import com.yohoufo.order.model.PayRefundBo;
+import com.yohoufo.order.model.*;
 import com.yohoufo.order.service.pay.AbstractPayService;
 import com.yohoufo.order.utils.AlipayUtils;
 import org.apache.commons.lang3.StringUtils;

@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.yoho.core.common.utils.YHMath;
 import com.yoho.error.ServiceError;
 import com.yoho.error.exception.ServiceException;
-import com.yoho.service.model.order.payment.PaymentData;
 import com.yohoufo.common.utils.HttpClient;
 import com.yohoufo.common.utils.TimeUtils;
 import com.yohoufo.common.utils.WXUtils;
@@ -12,6 +11,7 @@ import com.yohoufo.order.common.Payment;
 import com.yohoufo.order.config.WeixinPayConfig;
 import com.yohoufo.order.model.OrderInfo;
 import com.yohoufo.order.model.PayQueryBo;
+import com.yohoufo.order.model.PaymentData;
 import com.yohoufo.order.service.pay.AbstractPayService;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;