郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 49eb26ffd13e5f4454e0c8ba9936826839ccd940 1 个父辈 d7428fbf
1 个管道 的构建 通过 耗费 1 秒

修改支付

内嵌 并排对比
正在显示 2 个修改的文件 包含 78 行增加 和 110 行删除
... ... @@ -2,7 +2,6 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Notify.php" afterPath="$PROJECT_DIR$/application/api/controller/Notify.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -91,54 +90,41 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
<caret line="261" column="58" lean-forward="true" selection-start-line="261" selection-start-column="58" selection-end-line="261" selection-end-column="58" />
<state relative-caret-position="226">
<caret line="152" column="7" lean-forward="true" selection-start-line="152" selection-start-column="7" selection-end-line="152" selection-end-column="7" />
<folding>
<element signature="e#541#660#0#PHP" expanded="false" />
<element signature="e#666#979#0#PHP" expanded="false" />
<element signature="e#984#3059#0#PHP" expanded="false" />
<element signature="e#3065#3385#0#PHP" expanded="false" />
<element signature="e#3390#5471#0#PHP" expanded="false" />
<element signature="e#5477#5895#0#PHP" expanded="false" />
<element signature="e#6701#13133#0#PHP" expanded="false" />
<element signature="e#7536#7824#0#PHP" expanded="false" />
<element signature="e#7901#8174#0#PHP" expanded="false" />
<element signature="e#8330#8640#0#PHP" expanded="false" />
<element signature="e#8715#9166#0#PHP" expanded="false" />
<element signature="e#9243#10287#0#PHP" expanded="false" />
<element signature="e#10381#10499#0#PHP" expanded="false" />
<element signature="e#13217#13514#0#PHP" expanded="false" />
<element signature="e#13520#13915#0#PHP" expanded="false" />
<element signature="e#13921#14341#0#PHP" expanded="false" />
<element signature="e#14346#21642#0#PHP" expanded="false" />
<element signature="e#15980#16268#0#PHP" expanded="false" />
<element signature="e#16344#16617#0#PHP" expanded="false" />
<element signature="e#16772#17082#0#PHP" expanded="false" />
<element signature="e#17157#17608#0#PHP" expanded="false" />
<element signature="e#17685#18729#0#PHP" expanded="false" />
<element signature="e#18823#18941#0#PHP" expanded="false" />
<element signature="e#21669#25371#0#PHP" expanded="false" />
<element signature="e#25401#28345#0#PHP" expanded="false" />
<element signature="e#28374#31863#0#PHP" expanded="false" />
<element signature="e#29289#29894#0#PHP" expanded="false" />
<element signature="e#29915#31352#0#PHP" expanded="false" />
<element signature="e#31400#31502#0#PHP" expanded="false" />
<element signature="e#31892#35629#0#PHP" expanded="false" />
<element signature="e#35652#35869#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Notify.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="26" column="22" lean-forward="true" selection-start-line="26" selection-start-column="22" selection-end-line="26" selection-end-column="22" />
<folding>
<element signature="e#1386#1991#0#PHP" expanded="false" />
<element signature="e#2012#3449#0#PHP" expanded="false" />
<element signature="e#3497#3599#0#PHP" expanded="false" />
<element signature="e#577#696#0#PHP" expanded="false" />
<element signature="e#702#1015#0#PHP" expanded="false" />
<element signature="e#1020#3095#0#PHP" expanded="false" />
<element signature="e#3101#3421#0#PHP" expanded="false" />
<element signature="e#3426#5507#0#PHP" expanded="false" />
<element signature="e#5513#5931#0#PHP" expanded="false" />
<element signature="e#5936#13233#0#PHP" expanded="false" />
<element signature="e#6737#13166#0#PHP" expanded="false" />
<element signature="e#7572#7860#0#PHP" expanded="false" />
<element signature="e#7937#8210#0#PHP" expanded="false" />
<element signature="e#8366#8676#0#PHP" expanded="false" />
<element signature="e#8751#9202#0#PHP" expanded="false" />
<element signature="e#9279#10323#0#PHP" expanded="false" />
<element signature="e#10417#10535#0#PHP" expanded="false" />
<element signature="e#13250#13547#0#PHP" expanded="false" />
<element signature="e#13553#13948#0#PHP" expanded="false" />
<element signature="e#13954#14374#0#PHP" expanded="false" />
<element signature="e#14379#21675#0#PHP" expanded="false" />
<element signature="e#16013#16301#0#PHP" expanded="false" />
<element signature="e#16377#16650#0#PHP" expanded="false" />
<element signature="e#16805#17115#0#PHP" expanded="false" />
<element signature="e#17190#17641#0#PHP" expanded="false" />
<element signature="e#17718#18762#0#PHP" expanded="false" />
<element signature="e#18856#18974#0#PHP" expanded="false" />
<element signature="e#21702#25404#0#PHP" expanded="false" />
<element signature="e#25434#28378#0#PHP" expanded="false" />
<element signature="e#28407#31857#0#PHP" expanded="false" />
<element signature="e#29283#29888#0#PHP" expanded="false" />
<element signature="e#29909#31346#0#PHP" expanded="false" />
<element signature="e#31394#31496#0#PHP" expanded="false" />
<element signature="e#31886#35623#0#PHP" expanded="false" />
<element signature="e#35646#35863#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ... @@ -230,8 +216,9 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="187" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="192" />
<option name="y" value="69" />
<option name="width" value="1776" />
<option name="height" value="1082" />
</component>
... ... @@ -258,24 +245,6 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -341,7 +310,7 @@
<workItem from="1574727687281" duration="17586000" />
<workItem from="1574759184313" duration="4793000" />
<workItem from="1574814989178" duration="1007000" />
<workItem from="1574831367903" duration="11678000" />
<workItem from="1574831367903" duration="12070000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -354,7 +323,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="265335000" />
<option name="totallyTimeSpent" value="265727000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -366,7 +335,7 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="187" y="0" width="1776" height="1082" extended-state="0" />
<frame x="192" y="69" width="1776" height="1082" extended-state="1" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1462704" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
... ... @@ -419,7 +388,7 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<option name="time" value="10" />
<option name="time" value="11" />
</breakpoint-manager>
<watches-manager />
</component>
... ... @@ -845,40 +814,41 @@
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-450">
<caret line="261" column="58" lean-forward="true" selection-start-line="261" selection-start-column="58" selection-end-line="261" selection-end-column="58" />
<state relative-caret-position="226">
<caret line="152" column="7" lean-forward="true" selection-start-line="152" selection-start-column="7" selection-end-line="152" selection-end-column="7" />
<folding>
<element signature="e#541#660#0#PHP" expanded="false" />
<element signature="e#666#979#0#PHP" expanded="false" />
<element signature="e#984#3059#0#PHP" expanded="false" />
<element signature="e#3065#3385#0#PHP" expanded="false" />
<element signature="e#3390#5471#0#PHP" expanded="false" />
<element signature="e#5477#5895#0#PHP" expanded="false" />
<element signature="e#6701#13133#0#PHP" expanded="false" />
<element signature="e#7536#7824#0#PHP" expanded="false" />
<element signature="e#7901#8174#0#PHP" expanded="false" />
<element signature="e#8330#8640#0#PHP" expanded="false" />
<element signature="e#8715#9166#0#PHP" expanded="false" />
<element signature="e#9243#10287#0#PHP" expanded="false" />
<element signature="e#10381#10499#0#PHP" expanded="false" />
<element signature="e#13217#13514#0#PHP" expanded="false" />
<element signature="e#13520#13915#0#PHP" expanded="false" />
<element signature="e#13921#14341#0#PHP" expanded="false" />
<element signature="e#14346#21642#0#PHP" expanded="false" />
<element signature="e#15980#16268#0#PHP" expanded="false" />
<element signature="e#16344#16617#0#PHP" expanded="false" />
<element signature="e#16772#17082#0#PHP" expanded="false" />
<element signature="e#17157#17608#0#PHP" expanded="false" />
<element signature="e#17685#18729#0#PHP" expanded="false" />
<element signature="e#18823#18941#0#PHP" expanded="false" />
<element signature="e#21669#25371#0#PHP" expanded="false" />
<element signature="e#25401#28345#0#PHP" expanded="false" />
<element signature="e#28374#31863#0#PHP" expanded="false" />
<element signature="e#29289#29894#0#PHP" expanded="false" />
<element signature="e#29915#31352#0#PHP" expanded="false" />
<element signature="e#31400#31502#0#PHP" expanded="false" />
<element signature="e#31892#35629#0#PHP" expanded="false" />
<element signature="e#35652#35869#0#PHP" expanded="false" />
<element signature="e#577#696#0#PHP" expanded="false" />
<element signature="e#702#1015#0#PHP" expanded="false" />
<element signature="e#1020#3095#0#PHP" expanded="false" />
<element signature="e#3101#3421#0#PHP" expanded="false" />
<element signature="e#3426#5507#0#PHP" expanded="false" />
<element signature="e#5513#5931#0#PHP" expanded="false" />
<element signature="e#5936#13233#0#PHP" expanded="false" />
<element signature="e#6737#13166#0#PHP" expanded="false" />
<element signature="e#7572#7860#0#PHP" expanded="false" />
<element signature="e#7937#8210#0#PHP" expanded="false" />
<element signature="e#8366#8676#0#PHP" expanded="false" />
<element signature="e#8751#9202#0#PHP" expanded="false" />
<element signature="e#9279#10323#0#PHP" expanded="false" />
<element signature="e#10417#10535#0#PHP" expanded="false" />
<element signature="e#13250#13547#0#PHP" expanded="false" />
<element signature="e#13553#13948#0#PHP" expanded="false" />
<element signature="e#13954#14374#0#PHP" expanded="false" />
<element signature="e#14379#21675#0#PHP" expanded="false" />
<element signature="e#16013#16301#0#PHP" expanded="false" />
<element signature="e#16377#16650#0#PHP" expanded="false" />
<element signature="e#16805#17115#0#PHP" expanded="false" />
<element signature="e#17190#17641#0#PHP" expanded="false" />
<element signature="e#17718#18762#0#PHP" expanded="false" />
<element signature="e#18856#18974#0#PHP" expanded="false" />
<element signature="e#21702#25404#0#PHP" expanded="false" />
<element signature="e#25434#28378#0#PHP" expanded="false" />
<element signature="e#28407#31857#0#PHP" expanded="false" />
<element signature="e#29283#29888#0#PHP" expanded="false" />
<element signature="e#29909#31346#0#PHP" expanded="false" />
<element signature="e#31394#31496#0#PHP" expanded="false" />
<element signature="e#31886#35623#0#PHP" expanded="false" />
<element signature="e#35646#35863#0#PHP" expanded="false" />
</folding>
</state>
</provider>
... ...
... ... @@ -18,7 +18,8 @@ use app\nsms\sendAPI;
*/
class Pay extends Api
{
protected $noNeedRight = ['payOrderNotify','vippayOrderNotify','picOrderNotify','videoOrderNotify'];
protected $noNeedLogin = ['payOrderNotify','vippayOrderNotify','picOrderNotify','videoOrderNotify'];
protected $noNeedRight = ['*'];
protected $uid = '';//token存贮uid
protected $order_status = [];//订单状态
public function _initialize()
... ... @@ -265,7 +266,7 @@ class Pay extends Api
'body' => '山东航拍',
'out_trade_no' => $data['num'],//支付订单号
'total_fee' => $data['total']*100,//单位分
'notify_url' => 'http://areial.w.brotop.cn/api/notify/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'notify_url' => 'http://areial.w.brotop.cn/api/pay/picOrderNotify', // 支付结果通知网址，如果不设置则会使用配置里的默认地址
'trade_type' => 'JSAPI', // 请对应换成你的支付方式对应的值类型
'openid' => $openid['openid'],
]);
... ... @@ -618,9 +619,6 @@ class Pay extends Api
$config = config('verify.wx_pay');
$app = Factory::payment($config);
$response = $app->handlePaidNotify(function($message, $fail){
var_dump($message);exit;
//return_code 表示通信状态
if ($message['return_code'] === 'SUCCESS') {
if ($message['result_code'] === 'SUCCESS') {
... ...