update

examples/yspay/cancel.php

@@ -18,7 +18,7 @@ $config = [
 ];
 ];
 $payData = [
 $payData = [
     'tradetrace' => '11620210303155407146230',
     'tradetrace' => '11620210303155407146230',
-    'oritradetrace' => '2019062017085196425851101913',
+    'oritradetrace' => '2019062017085196425851101914',
 ];
 ];
 
 
 
 

examples/yspay/close.php

@@ -17,8 +17,9 @@ $config = [
 	'termid'     => '10006468',
 	'termid'     => '10006468',
 ];
 ];
 $payData = [
 $payData = [
-    'tradetrace' => '11620210304155042147189',
-//    'oritradetrace' => '2019062017085196425851101913',
+//    'tradetrace' => '11620210304155042147189',
+    'tradetrace' => '2019062017085196425851101914',
+//    'oritradetrace' => '2019062017085196425851101914',
 ];
 ];
 
 
 
 

examples/yspay/query.php

@@ -18,8 +18,8 @@ $config = [
 ];
 ];
 $payData = [
 $payData = [
 //    'notifyurl'    => 'https://www.test.com/test/test.t',
 //    'notifyurl'    => 'https://www.test.com/test/test.t',
-//    'tradetrace' => '2019062017085196425851101913',
-    'tradetrace' => '2019062017085196425851101915',
+    'tradetrace' => '2019062017085196425851101914',
+//    'tradetrace' => '2019062017085196425851101915',
 //    'openid'    =>'oDqg_5Za0tc23LhTkUR6PfFZ8O2g',
 //    'openid'    =>'oDqg_5Za0tc23LhTkUR6PfFZ8O2g',
 //	'tradeamt'=>1
 //	'tradeamt'=>1
 ];
 ];

src/Notify/YSNotify.php

@@ -108,11 +108,11 @@ class YSNotify extends NotifyStrategy{
 	protected function getRetData(array $data){
 	protected function getRetData(array $data){
 		// TODO: Implement getRetData() method.
 		// TODO: Implement getRetData() method.
 		$retData = [
 		$retData = [
-			'order_no'        => $data['wtorderid'],
-			'out_trade_no'       => $data['tradetrace'],
-			'transaction_id'     => $data['wxtransactionid'],
-			'pay_time'           => $data['wxtimeend'],
-			'user_id'            => $data['wxopenid'],
+			'tradetrace'        => $data['tradetrace'],
+			'wtorderid'       => $data['wtorderid'],
+			'wxtransactionid'     => $data['wxtransactionid'],
+			'wxtimeend'           => $data['wxtimeend'] ?? '',
+			'wxopenid'            => $data['wxopenid'] ?? '',
 			'out_transaction_id' => $data['wxtransactionid'],
 			'out_transaction_id' => $data['wxtransactionid'],
 			'channel'            => Config::YS_CHARGE,
 			'channel'            => Config::YS_CHARGE,
 		];
 		];