update

.gitignore

-.idea
-.DS_Store
-/codecept.phar
-/examples/test.php
-/examples/wx/pem
-/vendor/
-/examples_bak/
-/composer.lock
-/examples/wxconfig-bak.php
-/examples/wx/pem/

.idea/.gitignore

+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

.idea/inspectionProfiles/Project_Default.xml

+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="DuplicatedCode" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <Languages>
+        <language minSize="60" name="PHP" />
+      </Languages>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file

.idea/modules.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/payment.iml" filepath="$PROJECT_DIR$/.idea/payment.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file

.idea/payment.iml

+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/spec" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="Payment\" />
+      <sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file

.idea/php.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PhpProjectSharedConfiguration" php_language_level="7" />
+</project>
\ No newline at end of file

.idea/vcs.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file

examples/sw/liteCharge.php

@@ -8,11 +8,13 @@ use Payment\Config;
 
 
 date_default_timezone_set('Asia/Shanghai');
 date_default_timezone_set('Asia/Shanghai');
 
 
-$configStr  = "{\"pay_var\":\"100\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_var":"100","pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false} [] []
+';
 $config = json_decode($configStr,true);
 $config = json_decode($configStr,true);
 
 
 // 订单信息
 // 订单信息
-$payDataStr = "{\"terminal_trace\":\"20190327151722366145505357545320\",\"total_fee\":1,\"order_body\":\"支付测试\",\"open_id\":\"oUlAM0Wp1K1rJEGJ0t__Ls5-qFKE\",\"attach\":\"10054c238f670a2e9649a8b100f20562\"}";
+$payDataStr = '{"service_id":"015","terminal_trace":"20210610120224954476481015748920","total_fee":2,"order_body":"【乐店云】微信支付","open_id":"oDqg_5WEH2ROdZhRN7g3ERebi4e4","attach":"c7264439ab86385bc16a73b85ce3d134"} [] []
+';
 $payData = json_decode($payDataStr,true);
 $payData = json_decode($payDataStr,true);
 
 
 $config['base_url'] = 'https://pay.lcsw.cn/lcsw';
 $config['base_url'] = 'https://pay.lcsw.cn/lcsw';

examples/sw/notify.php

@@ -15,30 +15,17 @@ use Payment\Config;
 use Payment\Utils\ArrayUtil;
 use Payment\Utils\ArrayUtil;
 
 
 date_default_timezone_set('Asia/Shanghai');
 date_default_timezone_set('Asia/Shanghai');
-$configStr = "{\"pay_var\":\"100\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_var":"201","pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
 $config = json_decode($configStr,true);
 $config = json_decode($configStr,true);
 $callback = new TestNotify();
 $callback = new TestNotify();
 
 
 try {
 try {
     if (!empty($config)){
     if (!empty($config)){
-//        Notify::run(Config::SW_CHARGE,$config,$callback);
-
-       // $retData = Notify::getNotifyData($type, $config);// 获取第三方的原始数据，未进行签名检查
-
         $retDataStr = "{\"attach\":\"a3f7a2b605e84762868ecf92f97146bf\",\"channel_trade_no\":\"4200000277201903277386709856\",\"end_time\":\"20190327172739\",\"key_sign\":\"572c4d043a58f605202e4d2f0e4e66d8\",\"merchant_name\":\"袁梦对接专用(勿动)\",\"merchant_no\":\"858100307000002\",\"out_trade_no\":\"300559730021619032717272800016\",\"pay_type\":\"010\",\"receipt_fee\":\"1\",\"result_code\":\"01\",\"return_code\":\"01\",\"return_msg\":\"支付成功\",\"terminal_id\":\"30055973\",\"terminal_time\":\"20190327172726\",\"terminal_trace\":\"20190327172726469910101555098120\",\"total_fee\":\"1\",\"user_id\":\"oO4lo5KBwCtX5CPayZV2WedgMjRc\"}";
         $retDataStr = "{\"attach\":\"a3f7a2b605e84762868ecf92f97146bf\",\"channel_trade_no\":\"4200000277201903277386709856\",\"end_time\":\"20190327172739\",\"key_sign\":\"572c4d043a58f605202e4d2f0e4e66d8\",\"merchant_name\":\"袁梦对接专用(勿动)\",\"merchant_no\":\"858100307000002\",\"out_trade_no\":\"300559730021619032717272800016\",\"pay_type\":\"010\",\"receipt_fee\":\"1\",\"result_code\":\"01\",\"return_code\":\"01\",\"return_msg\":\"支付成功\",\"terminal_id\":\"30055973\",\"terminal_time\":\"20190327172726\",\"terminal_trace\":\"20190327172726469910101555098120\",\"total_fee\":\"1\",\"user_id\":\"oO4lo5KBwCtX5CPayZV2WedgMjRc\"}";
         $retData = json_decode($retDataStr,true);
         $retData = json_decode($retDataStr,true);
         $notify = new \Payment\Notify\SwNotify($config);
         $notify = new \Payment\Notify\SwNotify($config);
         $ret =  $notify->checkNotifyData($retData);
         $ret =  $notify->checkNotifyData($retData);
         die($ret);
         die($ret);
-
-//        $basePath = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'CacertFile' . DIRECTORY_SEPARATOR;
-//        $publicKeyPath = "{$basePath}mipay".DIRECTORY_SEPARATOR."meepay_public_key.pem";
-
-//        $publicKeyPath = "/project/ldy/payment/src/CacertFile/mipay/meepay_public_key.pem";
-//        $retData = "{\"result_code\":\"SUCCESS\",\"out_trade_sn\":\"SN20181031020706\",\"meepay_trade_no\":\"MF0118103102070684504\",\"transaction_id\":\"4200000203201810316768166604\",\"sub_merchant_id\":\"10002\",\"sub_appid\":\"wx03b4aeb839cc8d85\",\"sub_openid\":\"oUlAM0fD5RsWs9CvOCCMU_nYEDSY\",\"total_amount\":\"1\",\"trade_type\":\"NATIVE\",\"nonce_str\":\"af7rhpf50cjqjadyzthu82hyl7rzdkgk\",\"fee_type\":\"CNY\",\"cash_fee\":\"1\",\"attach\":\"1233\",\"sign_type\":\"RSA2\",\"sign\":\"d0AsaPytw9by+gfD9DLBHp9s1U+aQt9qVd1DYjPP4xvp+7umDU/bLsuxER+0XPF5M0vwdcks/Tge+KCWX3wWdMIOnltVKfDRFfsf7HOznwr4sE5zUxb0nkfCayLMZ/m/kcgqy9QryAl+SY/+MmLlmnxEI6eyjtnX0rf8qZyZDGI=\"}";
-//
-//        $ret = ArrayUtil::SignVerify(json_decode($retData,true),$publicKeyPath);
-//        echo $ret;
     }
     }
 } catch (PayException $e) {
 } catch (PayException $e) {
     echo $e->errorMessage();
     echo $e->errorMessage();

examples/swThree/cancel.php

+<?php
+
+require_once __DIR__ . '/../../autoload.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Cancel;
+use Payment\Config;
+
+date_default_timezone_set('Asia/Shanghai');
+
+//$configStr  = "{\"pay_var\":\"201\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
+$config = json_decode($configStr,true);
+
+// 订单信息
+//$payDataStr = "{\"terminal_trace\":\"20190327151722366145505357545320\",\"total_fee\":1,\"order_body\":\"支付测试\",\"open_id\":\"oUlAM0Wp1K1rJEGJ0t__Ls5-qFKE\",\"attach\":\"10054c238f670a2e9649a8b100f20562\"}";
+$payDataStr = '{"pay_type":"010","terminal_trace":"20210610120232330798565348995620","out_trade_no":"115587081421321062314555821032"}';
+$payData = json_decode($payDataStr,true);
+
+$config['base_url'] = 'https://pay.lcsw.cn/lcsw';
+
+try {
+    $ret = Cancel::run(Config::SW_T_CHARGE, $config, $payData);
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+echo json_encode($ret, JSON_UNESCAPED_UNICODE);
+
+/**
+ * {"attach":"e0c3b706044a99f143be92ee11071370","channel_order_no":"115587081421321062314555821032","channel_trade_no":"","end_time":"20210623155646","merchant_name":"西安乐店蜂抢信息科技有限公司1","mercha816000039","out_trade_no":"115587081421321062314555821032","pay_time":"20210623145558","pay_trace":"20210610120232330798565348995620","pay_type":"010","result_code":"03","return_code":"01","return_msg":"未支付","terminal_id":"11558708","terminal_time":"20210623155645","terminal_trace":"20210610120232330798565348995620","total_fee":"2","trade_state":"NOTPAY","typeMsg":"","user_id":""}%
+ */
\ No newline at end of file

examples/swThree/close.php

+<?php
+
+require_once __DIR__ . '/../../autoload.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Close;
+use Payment\Config;
+
+date_default_timezone_set('Asia/Shanghai');
+
+//$configStr  = "{\"pay_var\":\"201\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
+$config = json_decode($configStr,true);
+
+// 订单信息
+//$payDataStr = "{\"terminal_trace\":\"20190327151722366145505357545320\",\"total_fee\":1,\"order_body\":\"支付测试\",\"open_id\":\"oUlAM0Wp1K1rJEGJ0t__Ls5-qFKE\",\"attach\":\"10054c238f670a2e9649a8b100f20562\"}";
+$payDataStr = '{"pay_type":"010","terminal_trace":"20210610120232330798565348995620","out_trade_no":"115587081421321062314555821032"}';
+$payData = json_decode($payDataStr,true);
+
+$config['base_url'] = 'https://pay.lcsw.cn/lcsw';
+
+try {
+    $ret = Close::run(Config::SW_T_CHARGE, $config, $payData);
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+echo json_encode($ret, JSON_UNESCAPED_UNICODE);
+
+/**
+ * {"package":{"result_code":"01"},"other":{"pay_type":"010","merchant_no":"879104816000039","terminal_id":"11558708","terminal_trace":"20210610120232330798565348995620","terminal_time":"20210623165004"}}
+ */
\ No newline at end of file

examples/swThree/liteCharge.php

+<?php
+
+require_once __DIR__ . '/../../autoload.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+date_default_timezone_set('Asia/Shanghai');
+
+//$configStr  = "{\"pay_var\":\"201\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_var":"201","pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
+$config = json_decode($configStr,true);
+
+// 订单信息
+//$payDataStr = "{\"terminal_trace\":\"20190327151722366145505357545320\",\"total_fee\":1,\"order_body\":\"支付测试\",\"open_id\":\"oUlAM0Wp1K1rJEGJ0t__Ls5-qFKE\",\"attach\":\"10054c238f670a2e9649a8b100f20562\"}";
+$payDataStr = '{"service_id":"015","terminal_trace":"20210610120224954476481015748920","total_fee":2,"order_body":"【乐店云】微信支付","open_id":"oDqg_5WEH2ROdZhRN7g3ERebi4e4","attach":"c7264439ab86385bc16a73b85ce3d134"}';
+$payData = json_decode($payDataStr,true);
+
+$config['base_url'] = 'https://pay.lcsw.cn/lcsw';
+
+try {
+    $ret = Charge::run(Config::SW_T_CHANNEL_LITE, $config, $payData);
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+
+echo json_encode($ret, JSON_UNESCAPED_UNICODE);
+
+/**
+ *{"jspackage":{"timeStamp":"1624435123","nonceStr":"c15e4cbeb7eb4bc0b3e0f854c78aa567","package":"prepay_id=wx231558436993717e6c28d89771ac690000","signType":"RSA","paySign":"HNLOvvAnQ8r4Y1Ciu5wt8fxckykaLMBheT7vqFgZGKcR4aPPJwpJ5OVMs9fhoLIADkPPFaVLIxd7eFxVzQWlW2axzZQrKJwA\/52KtRxlEfwAY2Uko\/lmNecfcdJmwFMtmb+qw+8aQrAo7Ck4p7fnqZnErtwV3R0i8c+g2dnbum37YP1XbvFpXwPCCDoSpcOThDHf4ss\/TxKMJUh3oK36HAXVfJTB\/Vgs3Va\/QaUpWNbhXCoQUbvlAiO26mFXotTxd2Gph7hzkcwJcmyEwvaeenAvmrq5XGihnFVZ0t7Wvec0rxpmfHA2FPcQMWBqfzuDsW4pDK1A9PF5OLmhs3j5mA=="},"other":{"pay_type":"010","merchant_name":"西安乐店蜂抢信息科技有限公司1","merchan16000039","terminal_id":"11558708","terminal_trace":"20210610120224954476481015748920","terminal_time":"20210623155842","total_fee":"2","out_trade_no":"115587084621621062315584324331"}}
+ */
\ No newline at end of file

examples/swThree/notify.php

+<?php
+/**
+ * 第三方支付回调处理
+ *
+ * @createTime: 2016-07-25 15:57
+ * @description: 支付通知回调
+ */
+
+require_once __DIR__ . '/../../autoload.php';
+require_once __DIR__ . '/../testNotify.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Notify;
+use Payment\Config;
+use Payment\Utils\ArrayUtil;
+
+date_default_timezone_set('Asia/Shanghai');
+$configStr = "{\"pay_var\":\"100\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$config = json_decode($configStr,true);
+$callback = new TestNotify();
+
+try {
+    if (!empty($config)){
+//        Notify::run(Config::SW_CHARGE,$config,$callback);
+
+       // $retData = Notify::getNotifyData($type, $config);// 获取第三方的原始数据，未进行签名检查
+
+        $retDataStr = "{\"attach\":\"a3f7a2b605e84762868ecf92f97146bf\",\"channel_trade_no\":\"4200000277201903277386709856\",\"end_time\":\"20190327172739\",\"key_sign\":\"572c4d043a58f605202e4d2f0e4e66d8\",\"merchant_name\":\"袁梦对接专用(勿动)\",\"merchant_no\":\"858100307000002\",\"out_trade_no\":\"300559730021619032717272800016\",\"pay_type\":\"010\",\"receipt_fee\":\"1\",\"result_code\":\"01\",\"return_code\":\"01\",\"return_msg\":\"支付成功\",\"terminal_id\":\"30055973\",\"terminal_time\":\"20190327172726\",\"terminal_trace\":\"20190327172726469910101555098120\",\"total_fee\":\"1\",\"user_id\":\"oO4lo5KBwCtX5CPayZV2WedgMjRc\"}";
+        $retData = json_decode($retDataStr,true);
+        $notify = new \Payment\Notify\SwNotify($config);
+        $ret =  $notify->checkNotifyData($retData);
+        die($ret);
+
+//        $basePath = dirname(dirname(__FILE__)) . DIRECTORY_SEPARATOR . 'CacertFile' . DIRECTORY_SEPARATOR;
+//        $publicKeyPath = "{$basePath}mipay".DIRECTORY_SEPARATOR."meepay_public_key.pem";
+
+//        $publicKeyPath = "/project/ldy/payment/src/CacertFile/mipay/meepay_public_key.pem";
+//        $retData = "{\"result_code\":\"SUCCESS\",\"out_trade_sn\":\"SN20181031020706\",\"meepay_trade_no\":\"MF0118103102070684504\",\"transaction_id\":\"4200000203201810316768166604\",\"sub_merchant_id\":\"10002\",\"sub_appid\":\"wx03b4aeb839cc8d85\",\"sub_openid\":\"oUlAM0fD5RsWs9CvOCCMU_nYEDSY\",\"total_amount\":\"1\",\"trade_type\":\"NATIVE\",\"nonce_str\":\"af7rhpf50cjqjadyzthu82hyl7rzdkgk\",\"fee_type\":\"CNY\",\"cash_fee\":\"1\",\"attach\":\"1233\",\"sign_type\":\"RSA2\",\"sign\":\"d0AsaPytw9by+gfD9DLBHp9s1U+aQt9qVd1DYjPP4xvp+7umDU/bLsuxER+0XPF5M0vwdcks/Tge+KCWX3wWdMIOnltVKfDRFfsf7HOznwr4sE5zUxb0nkfCayLMZ/m/kcgqy9QryAl+SY/+MmLlmnxEI6eyjtnX0rf8qZyZDGI=\"}";
+//
+//        $ret = ArrayUtil::SignVerify(json_decode($retData,true),$publicKeyPath);
+//        echo $ret;
+    }
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+
+var_dump($ret);
+exit;

examples/swThree/query.php

+<?php
+
+require_once __DIR__ . '/../../autoload.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Query;
+use Payment\Config;
+
+date_default_timezone_set('Asia/Shanghai');
+
+//$configStr  = "{\"pay_var\":\"201\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
+$config = json_decode($configStr,true);
+
+// 订单信息
+//$payDataStr = "{\"terminal_trace\":\"20190327151722366145505357545320\",\"total_fee\":1,\"order_body\":\"支付测试\",\"open_id\":\"oUlAM0Wp1K1rJEGJ0t__Ls5-qFKE\",\"attach\":\"10054c238f670a2e9649a8b100f20562\"}";
+$payDataStr = '{"pay_type":"010","terminal_trace":"20210610120232330798565348995620","out_trade_no":"115587081421321062314555821032"}';
+$payData = json_decode($payDataStr,true);
+
+$config['base_url'] = 'https://pay.lcsw.cn/lcsw';
+
+try {
+    $ret = Query::run(Config::SW_T_QUERY, $config, $payData);
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+echo json_encode($ret, JSON_UNESCAPED_UNICODE);
+
+/**
+ * {"attach":"e0c3b706044a99f143be92ee11071370","channel_order_no":"115587081421321062314555821032","channel_trade_no":"","end_time":"20210623155646","merchant_name":"西安乐店蜂抢信息科技有限公司1","mercha816000039","out_trade_no":"115587081421321062314555821032","pay_time":"20210623145558","pay_trace":"20210610120232330798565348995620","pay_type":"010","result_code":"03","return_code":"01","return_msg":"未支付","terminal_id":"11558708","terminal_time":"20210623155645","terminal_trace":"20210610120232330798565348995620","total_fee":"2","trade_state":"NOTPAY","typeMsg":"","user_id":""}%
+ */
\ No newline at end of file

examples/swThree/refund.php

+<?php
+
+require_once __DIR__ . '/../../autoload.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Refund;
+use Payment\Config;
+
+date_default_timezone_set('Asia/Shanghai');
+
+$configStr  = '{"pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
+$config = json_decode($configStr,true);
+
+// 订单信息
+$payDataStr = '{"pay_type":"010","terminal_trace":"20210610120232330798565348995620","out_trade_no":"115587081421321062314555821032","refund_fee":"2"}';
+$payData = json_decode($payDataStr,true);
+
+$config['base_url'] = 'https://pay.lcsw.cn/lcsw';
+
+try {
+    $ret = Refund::run(Config::SW_T_REFUND, $config, $payData);
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+echo json_encode($ret, JSON_UNESCAPED_UNICODE);
+
+/**
+ * 支付平台返回错误提示:02 : 原交易状态为非成功
+ */
\ No newline at end of file

examples/swThree/subCharge.php

+<?php
+
+require_once __DIR__ . '/../../autoload.php';
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+date_default_timezone_set('Asia/Shanghai');
+
+//$configStr  = "{\"pay_var\":\"201\",\"pay_type\":\"010\",\"service_id\":\"015\",\"mch_id\":\"858100307000002\",\"merchant_no\":\"858100307000002\",\"terminal_id\":\"30055973\",\"sub_appid\":\"wx24863377e74518f8\",\"app_id\":\"wx24863377e74518f8\",\"limit_pay\":[\"\"],\"access_token\":\"bae3420022594dd9a14703f890765f9e\",\"notify_url\":\"http://www.ledian.com/payments/notify\",\"use_sandbox\":false,\"return_raw\":false}";
+$configStr  = '{"pay_var":"201","pay_type":"010","mch_id":"879104816000039","merchant_no":"879104816000039","terminal_id":"11558708","sub_appid":"wx2eaddb8e674394aa","app_id":"wx2eaddb8e674394aa","limit_pay":[""],"access_token":"3846bb6b7909488595c58e19a2211131","base_url":"https://pay.lcsw.cn/lcsw","notify_url":"http://api.test.ledianyun.com/payments/notify","use_sandbox":false,"return_raw":false}';
+$config = json_decode($configStr,true);
+
+// 订单信息
+//$payDataStr = "{\"terminal_trace\":\"20190327151722366145505357545320\",\"total_fee\":1,\"order_body\":\"支付测试\",\"open_id\":\"oUlAM0Wp1K1rJEGJ0t__Ls5-qFKE\",\"attach\":\"10054c238f670a2e9649a8b100f20562\"}";
+$payDataStr = '{"pay_ver":"201","pay_type":"010","service_id":"012","terminal_trace":"20210610120232330798565348995620","total_fee":2,"order_body":"【乐店云】微信支付","open_id":"oDqg_5WEH2ROdZhRN7g3ERebi4e4","openid":"oDqg_5WEH2ROdZhRN7g3ERebi4e4","attach":"e0c3b706044a99f143be92ee11071370"}';
+$payData = json_decode($payDataStr,true);
+
+$config['base_url'] = 'https://pay.lcsw.cn/lcsw';
+
+try {
+    $ret = Charge::run(Config::SW_T_CHANNEL_PUB, $config, $payData);
+} catch (PayException $e) {
+    echo $e->errorMessage();
+    exit;
+}
+
+echo json_encode($ret, JSON_UNESCAPED_UNICODE);
+
+/**
+ * {"jspackage":{"appId":"wx2eaddb8e674394aa","timeStamp":"1624435057","nonceStr":"a410b9b125304c2992c8be9cdb752f17","package":"prepay_id=wx23155737206767b91d90be7ec033180000","signType":"RSA","paySign":"3C1FR8cXtqBzbp8dBQSjdfnUGKwv9TqyRbf7RadvNqFCd7I3ayRkzDSVPy7\/Nd2g1FbQIgtyeN7RH1y+RA7If\/jqUP5NVTJJnxmUpqi0a4zFq\/5UYNmGJ0xTXHmquVBvnFaddkyQ\/MmsxMrbTlTDaHb6CQwr6o9qEaTutzMOd97\/MAj1T5h86Vyu4fu5BHcaMWo4mUyBWBXl7bB3fqrlNzKLxijEZzov\/MhTZQ4MpTC7OBOGU7t3yJ+iSw+W87WHiHhsssFO\/jZZ\/PJ0pKiKrVF5hj\/te9whqXpjCpoWoc9hDKd92NrhO82H3acpfjge1FyimbYjPTQXzgkcoZNB7Q=="},"other":{"out_trade_no":"115587085921321062315573623420"}}
+ */
\ No newline at end of file

examples/ysepay/cancel.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => '860010010210008',
+	'key'           => 'fkdkldvkij5dfd24dl24dk2dddflaaf2',
+	'merid' => '880210010215460',
+	'termid'     => '10006468',
+];
+$payData = [
+    'tradetrace' => '11620210303155407146230',
+    'oritradetrace' => '2019062017085196425851101914',
+];
+
+
+try{
+	$ret = \Payment\Client\Cancel::run(Config::YS_CHARGE, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/ysepay/close.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => '860010010210008',
+	'key'           => 'fkdkldvkij5dfd24dl24dk2dddflaaf2',
+	'merid' => '880210010215460',
+	'termid'     => '10006468',
+];
+$payData = [
+//    'tradetrace' => '11620210304155042147189',
+    'tradetrace' => '2019062017085196425851101914',
+//    'oritradetrace' => '2019062017085196425851101914',
+];
+
+
+try{
+	$ret = \Payment\Client\Close::run(Config::YS_CHARGE, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/ysepay/lite.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => '860010010210008',
+	'key'           => 'fkdkldvkij5dfd24dl24dk2dddflaaf2',
+	'merid' => '880210010215460',
+	'termid'     => '10006468'
+];
+$payData = [
+    'notifyurl'    => 'https://www.test.com/test/test.t',
+    'tradetrace' => '2019062017085196425851101915',
+//    'openid'    =>'oDqg_5Za0tc23LhTkUR6PfFZ8O2g',
+    'openid'    =>'ohWpr5L1oy5SK4LMyoazVG4BJVGY',
+	'tradeamt'=>1
+];
+//            $payData = [
+//                "out_trade_no" => "2019062017085196425851101915",
+//                "total_fee" => 1,
+//                "body" => 'hello 你好呀',
+//                "extra_param"   => '',
+//                'open_id' => "oDqg_5Za0tc23LhTkUR6PfFZ8O2g"
+//            ];
+
+
+try{
+	$ret = Charge::run(Config::YS_CHANNEL_LITE, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/ysepay/pub.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'partner_id'     => '826791873720039',
+	'seller_id'           => 'QRY210802574454',
+	'seller_name' => '铜川市耀州区青丝坊发型设计室',
+	'business_code'     => '3010002',
+];
+$payData = [
+//    'method'=>'ysepay.online.weixin.pay',
+    'notify_url'    => 'http://www.test.com/test/test.t',
+    'out_trade_no'  =>'2019062017085196425851101912',
+    'shopdate'  =>date('Ymd'),
+    'timestamp'  =>date('Y-m-d H:i:s',time()),
+    'subject'  =>'乐店云支付测试',
+    'total_amount'  => 0.01,
+    'timeout_express'   => '9h',
+    'sub_openid' => 'ohWpr5HtNcnMC94YBd6i9pqNU07Y',
+    'appid' => 'wxe48ea18f1edba2c7',
+    'extra_common_param' => '123123123213',   //公用回传参数
+];
+
+try{
+	$ret = Charge::run(Config::YSE_CHANNEL_PUB, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/ysepay/query.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Query;
+use Payment\Config;
+
+$config = [
+    'partner_id'     => '826791873720039',
+    'seller_id'           => '826791873720039',
+    'seller_name' => '西安汇集信电子技术有限公司',
+    'business_code'     => '3010002',
+];
+$payData = [
+//    'method'=>'ysepay.online.weixin.pay',
+    'out_trade_no'  =>'2019062017085196425851101912',
+    'shopdate'  =>date('Ymd'),
+    'timestamp'  =>date('Y-m-d H:i:s',time()),
+];
+
+try{
+	$ret = Query::run(Config::YSE_QUERY, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/ysepay/refund.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Refund;
+use Payment\Config;
+
+$config = [
+	'partner_id'     => '826791873720039',
+	'seller_id'           => '826791873720039',
+	'seller_name' => '西安汇集信电子技术有限公司',
+	'business_code'     => '3010002',
+];
+$payData = [
+//    'method'=>'ysepay.online.trade.refund',
+    'out_trade_no'  =>'2019062017085196425851101912',
+    'shopdate'  =>'20210810',
+    'refund_amount'  => 0.01,
+    'refund_reason'   => '测试退款',
+    'out_request_no' => 'out_request_no',
+];
+
+
+try{
+	$ret = Refund::run(Config::YSE_REFUND, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/yspay/cancel.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => 'D01X00000800856',
+	'key'           => 'lldilrd58lr0o1204l3a32ji5ladavf5',
+	'merid' => '531000008882415',
+	'termid'     => 'W0725858',
+];
+
+// {"sign":"5A21EDDAA1092578740FF5CFE4B12F27","wxopenid":"ohWpr5DmiDNk0tOh7eJ2NKEaOfjQ","wxtimeend":"20210814114050","tradetrace":"2021081411404288702697100565","clearamt":"1680","wxtransactionid":"4200001236202108145338315235","acctype":"U","payamt":"1680","wtorderid":"11620210814114046400091"}
+
+$payData = [
+    'tradetrace' => '11620210814155733791279',
+    'oritradetrace' => '2021081415572994384657101545',
+];
+
+
+try{
+	$ret = \Payment\Client\Cancel::run(Config::YS_CHARGE, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/yspay/close.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => '860010010210008',
+	'key'           => 'fkdkldvkij5dfd24dl24dk2dddflaaf2',
+	'merid' => '880210010215460',
+	'termid'     => '10006468',
+];
+$payData = [
+//    'tradetrace' => '11620210304155042147189',
+    'tradetrace' => '2019062017085196425851101914',
+//    'oritradetrace' => '2019062017085196425851101914',
+];
+
+
+try{
+	$ret = \Payment\Client\Close::run(Config::YS_CHARGE, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/yspay/lite.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => '860010010210008',
+	'key'           => 'fkdkldvkij5dfd24dl24dk2dddflaaf2',
+	'merid' => '880210010215460',
+	'termid'     => '10006468'
+];
+$payData = [
+    'notifyurl'    => 'https://www.test.com/test/test.t',
+    'tradetrace' => '2019062017085196425851101915',
+//    'openid'    =>'oDqg_5Za0tc23LhTkUR6PfFZ8O2g',
+    'openid'    =>'ohWpr5L1oy5SK4LMyoazVG4BJVGY',
+	'tradeamt'=>1
+];
+//            $payData = [
+//                "out_trade_no" => "2019062017085196425851101915",
+//                "total_fee" => 1,
+//                "body" => 'hello 你好呀',
+//                "extra_param"   => '',
+//                'open_id' => "oDqg_5Za0tc23LhTkUR6PfFZ8O2g"
+//            ];
+
+
+try{
+	$ret = Charge::run(Config::YS_CHANNEL_LITE, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/yspay/pub.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => 'D01X00000800856',
+	'key'           => 'lldilrd58lr0o1204l3a32ji5ladavf5',
+	'merid' => '531000009218530',
+	'termid'     => 'W0810460',
+];
+$payData = [
+    'notifyurl'    => 'https://www.test.com/test/test.t',
+    'tradetrace' => '2019062017085196425851101912',
+    'openid'    =>'oDqg_5Za0tc23LhTkUR6PfFZ8O2g',
+	'tradeamt'=>1
+];
+
+
+try{
+	$ret = Charge::run(Config::YS_CHANNEL_PUB, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

examples/yspay/query.php

+<?php
+
+date_default_timezone_set('Asia/Shanghai');
+
+require_once __DIR__.'/../../autoload.php';
+//require_once __DIR__.'/common.php';
+
+
+use Payment\Common\PayException;
+use Payment\Client\Charge;
+use Payment\Config;
+
+$config = [
+	'channelid'     => '860010010210008',
+	'key'           => 'fkdkldvkij5dfd24dl24dk2dddflaaf2',
+	'merid' => '880210010215460',
+	'termid'     => '10006468',
+];
+$payData = [
+//    'notifyurl'    => 'https://www.test.com/test/test.t',
+    'tradetrace' => '2019062017085196425851101914',
+//    'tradetrace' => '2019062017085196425851101915',
+//    'openid'    =>'oDqg_5Za0tc23LhTkUR6PfFZ8O2g',
+//	'tradeamt'=>1
+];
+
+
+try{
+	$ret = \Payment\Client\Query::run(Config::YS_QUERY, $config, $payData);
+}catch(PayException $e){
+	exit($e->errorMessage());
+}
+
+echo json_encode($ret, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);

src/CancelContext.php

@@ -11,7 +11,9 @@ use Payment\Cancel\FuCancel;
 use Payment\Charge\LTF\LTFCancel;
 use Payment\Charge\LTF\LTFCancel;
 use Payment\Charge\MiPay\MiCancel;
 use Payment\Charge\MiPay\MiCancel;
 use Payment\Charge\Sw\SwCancel;
 use Payment\Charge\Sw\SwCancel;
+use Payment\Charge\SwThree\SwThreeCancel;
 use Payment\Charge\TLpay\TLCancel;
 use Payment\Charge\TLpay\TLCancel;
+use Payment\Charge\YS\YSCancel;
 use Payment\Common\BaseStrategy;
 use Payment\Common\BaseStrategy;
 use Payment\Common\PayException;
 use Payment\Common\PayException;
 
 
@@ -50,12 +52,18 @@ class CancelContext{
 				case Config::SW_CHARGE:
 				case Config::SW_CHARGE:
 					$this->cancelHandler = new SwCancel($config);
 					$this->cancelHandler = new SwCancel($config);
 					break;
 					break;
+                case Config::SW_T_CHARGE:
+                    $this->cancelHandler = new SwThreeCancel($config);
+                    break;
 				case Config::FU_CHARGE:
 				case Config::FU_CHARGE:
 					$this->cancelHandler = new FuCancel($config);
 					$this->cancelHandler = new FuCancel($config);
 					break;
 					break;
 				case Config::LTF_CHARGE:
 				case Config::LTF_CHARGE:
 					$this->cancelHandler = new LTFCancel($config);
 					$this->cancelHandler = new LTFCancel($config);
 					break;
 					break;
+                case Config::YS_CHARGE:
+                    $this->cancelHandler = new YSCancel($config);
+                    break;
 				default:
 				default:
 					throw new PayException('当前仅支持：通联支付平台');
 					throw new PayException('当前仅支持：通联支付平台');
 			}
 			}