正在显示
2 个修改的文件
包含
57 行增加
和
46 行删除
@@ -2,6 +2,7 @@ | @@ -2,6 +2,7 @@ | ||
2 | <project version="4"> | 2 | <project version="4"> |
3 | <component name="ChangeListManager"> | 3 | <component name="ChangeListManager"> |
4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> | 4 | <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> |
5 | + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> | ||
5 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> | 6 | <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/Pay.php" afterPath="$PROJECT_DIR$/application/api/controller/Pay.php" /> |
6 | </list> | 7 | </list> |
7 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> | 8 | <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> |
@@ -16,25 +17,26 @@ | @@ -16,25 +17,26 @@ | ||
16 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> | 17 | <file leaf-file-name="Pay.php" pinned="false" current-in-tab="true"> |
17 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 18 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
18 | <provider selected="true" editor-type-id="text-editor"> | 19 | <provider selected="true" editor-type-id="text-editor"> |
19 | - <state relative-caret-position="368"> | ||
20 | - <caret line="713" column="53" lean-forward="true" selection-start-line="713" selection-start-column="53" selection-end-line="713" selection-end-column="53" /> | 20 | + <state relative-caret-position="-150"> |
21 | + <caret line="687" column="4" lean-forward="false" selection-start-line="687" selection-start-column="4" selection-end-line="687" selection-end-column="4" /> | ||
21 | <folding> | 22 | <folding> |
22 | - <element signature="e#699#1012#0#PHP" expanded="false" /> | ||
23 | - <element signature="e#1017#3093#0#PHP" expanded="false" /> | ||
24 | - <element signature="e#3099#3419#0#PHP" expanded="false" /> | ||
25 | - <element signature="e#3424#5506#0#PHP" expanded="false" /> | ||
26 | - <element signature="e#5512#5930#0#PHP" expanded="false" /> | ||
27 | - <element signature="e#5935#16029#0#PHP" expanded="false" /> | ||
28 | - <element signature="e#16035#16455#0#PHP" expanded="false" /> | ||
29 | - <element signature="e#16460#26484#0#PHP" expanded="false" /> | ||
30 | - <element signature="e#26501#26798#0#PHP" expanded="false" /> | ||
31 | - <element signature="e#26803#27196#0#PHP" expanded="false" /> | ||
32 | - <element signature="e#27223#30701#0#PHP" expanded="false" /> | ||
33 | - <element signature="e#30730#33635#0#PHP" expanded="false" /> | ||
34 | - <element signature="e#37558#37945#0#PHP" expanded="false" /> | ||
35 | - <element signature="e#38006#38962#0#PHP" expanded="false" /> | ||
36 | - <element signature="e#39623#46795#0#PHP" expanded="false" /> | ||
37 | - <element signature="e#46818#47035#0#PHP" expanded="false" /> | 23 | + <element signature="e#706#1019#0#PHP" expanded="false" /> |
24 | + <element signature="e#1024#3100#0#PHP" expanded="false" /> | ||
25 | + <element signature="e#3106#3426#0#PHP" expanded="false" /> | ||
26 | + <element signature="e#3431#5513#0#PHP" expanded="false" /> | ||
27 | + <element signature="e#5519#5937#0#PHP" expanded="false" /> | ||
28 | + <element signature="e#5942#16036#0#PHP" expanded="false" /> | ||
29 | + <element signature="e#16042#16462#0#PHP" expanded="false" /> | ||
30 | + <element signature="e#16467#26491#0#PHP" expanded="false" /> | ||
31 | + <element signature="e#26508#26805#0#PHP" expanded="false" /> | ||
32 | + <element signature="e#26810#27203#0#PHP" expanded="false" /> | ||
33 | + <element signature="e#27230#30708#0#PHP" expanded="false" /> | ||
34 | + <element signature="e#30737#33642#0#PHP" expanded="false" /> | ||
35 | + <element signature="e#35491#38996#0#PHP" expanded="false" /> | ||
36 | + <element signature="e#37570#37957#0#PHP" expanded="false" /> | ||
37 | + <element signature="e#38018#38974#0#PHP" expanded="false" /> | ||
38 | + <element signature="e#39635#46807#0#PHP" expanded="false" /> | ||
39 | + <element signature="e#46830#47047#0#PHP" expanded="false" /> | ||
38 | </folding> | 40 | </folding> |
39 | </state> | 41 | </state> |
40 | </provider> | 42 | </provider> |
@@ -274,7 +276,7 @@ | @@ -274,7 +276,7 @@ | ||
274 | <workItem from="1575773423431" duration="694000" /> | 276 | <workItem from="1575773423431" duration="694000" /> |
275 | <workItem from="1575776183372" duration="2267000" /> | 277 | <workItem from="1575776183372" duration="2267000" /> |
276 | <workItem from="1575790089275" duration="377000" /> | 278 | <workItem from="1575790089275" duration="377000" /> |
277 | - <workItem from="1575851041026" duration="13593000" /> | 279 | + <workItem from="1575851041026" duration="14136000" /> |
278 | </task> | 280 | </task> |
279 | <task id="LOCAL-00001" summary="调试"> | 281 | <task id="LOCAL-00001" summary="调试"> |
280 | <created>1574145133364</created> | 282 | <created>1574145133364</created> |
@@ -283,11 +285,25 @@ | @@ -283,11 +285,25 @@ | ||
283 | <option name="project" value="LOCAL" /> | 285 | <option name="project" value="LOCAL" /> |
284 | <updated>1574145133364</updated> | 286 | <updated>1574145133364</updated> |
285 | </task> | 287 | </task> |
286 | - <option name="localTasksCounter" value="2" /> | 288 | + <task id="LOCAL-00002" summary="调试"> |
289 | + <created>1575869249706</created> | ||
290 | + <option name="number" value="00002" /> | ||
291 | + <option name="presentableId" value="LOCAL-00002" /> | ||
292 | + <option name="project" value="LOCAL" /> | ||
293 | + <updated>1575869249706</updated> | ||
294 | + </task> | ||
295 | + <task id="LOCAL-00003" summary="调试"> | ||
296 | + <created>1575869422308</created> | ||
297 | + <option name="number" value="00003" /> | ||
298 | + <option name="presentableId" value="LOCAL-00003" /> | ||
299 | + <option name="project" value="LOCAL" /> | ||
300 | + <updated>1575869422308</updated> | ||
301 | + </task> | ||
302 | + <option name="localTasksCounter" value="4" /> | ||
287 | <servers /> | 303 | <servers /> |
288 | </component> | 304 | </component> |
289 | <component name="TimeTrackingManager"> | 305 | <component name="TimeTrackingManager"> |
290 | - <option name="totallyTimeSpent" value="354060000" /> | 306 | + <option name="totallyTimeSpent" value="354603000" /> |
291 | </component> | 307 | </component> |
292 | <component name="TodoView"> | 308 | <component name="TodoView"> |
293 | <todo-panel id="selected-file"> | 309 | <todo-panel id="selected-file"> |
@@ -799,25 +815,26 @@ | @@ -799,25 +815,26 @@ | ||
799 | </entry> | 815 | </entry> |
800 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> | 816 | <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php"> |
801 | <provider selected="true" editor-type-id="text-editor"> | 817 | <provider selected="true" editor-type-id="text-editor"> |
802 | - <state relative-caret-position="368"> | ||
803 | - <caret line="713" column="53" lean-forward="true" selection-start-line="713" selection-start-column="53" selection-end-line="713" selection-end-column="53" /> | 818 | + <state relative-caret-position="-150"> |
819 | + <caret line="687" column="4" lean-forward="false" selection-start-line="687" selection-start-column="4" selection-end-line="687" selection-end-column="4" /> | ||
804 | <folding> | 820 | <folding> |
805 | - <element signature="e#699#1012#0#PHP" expanded="false" /> | ||
806 | - <element signature="e#1017#3093#0#PHP" expanded="false" /> | ||
807 | - <element signature="e#3099#3419#0#PHP" expanded="false" /> | ||
808 | - <element signature="e#3424#5506#0#PHP" expanded="false" /> | ||
809 | - <element signature="e#5512#5930#0#PHP" expanded="false" /> | ||
810 | - <element signature="e#5935#16029#0#PHP" expanded="false" /> | ||
811 | - <element signature="e#16035#16455#0#PHP" expanded="false" /> | ||
812 | - <element signature="e#16460#26484#0#PHP" expanded="false" /> | ||
813 | - <element signature="e#26501#26798#0#PHP" expanded="false" /> | ||
814 | - <element signature="e#26803#27196#0#PHP" expanded="false" /> | ||
815 | - <element signature="e#27223#30701#0#PHP" expanded="false" /> | ||
816 | - <element signature="e#30730#33635#0#PHP" expanded="false" /> | ||
817 | - <element signature="e#37558#37945#0#PHP" expanded="false" /> | ||
818 | - <element signature="e#38006#38962#0#PHP" expanded="false" /> | ||
819 | - <element signature="e#39623#46795#0#PHP" expanded="false" /> | ||
820 | - <element signature="e#46818#47035#0#PHP" expanded="false" /> | 821 | + <element signature="e#706#1019#0#PHP" expanded="false" /> |
822 | + <element signature="e#1024#3100#0#PHP" expanded="false" /> | ||
823 | + <element signature="e#3106#3426#0#PHP" expanded="false" /> | ||
824 | + <element signature="e#3431#5513#0#PHP" expanded="false" /> | ||
825 | + <element signature="e#5519#5937#0#PHP" expanded="false" /> | ||
826 | + <element signature="e#5942#16036#0#PHP" expanded="false" /> | ||
827 | + <element signature="e#16042#16462#0#PHP" expanded="false" /> | ||
828 | + <element signature="e#16467#26491#0#PHP" expanded="false" /> | ||
829 | + <element signature="e#26508#26805#0#PHP" expanded="false" /> | ||
830 | + <element signature="e#26810#27203#0#PHP" expanded="false" /> | ||
831 | + <element signature="e#27230#30708#0#PHP" expanded="false" /> | ||
832 | + <element signature="e#30737#33642#0#PHP" expanded="false" /> | ||
833 | + <element signature="e#35491#38996#0#PHP" expanded="false" /> | ||
834 | + <element signature="e#37570#37957#0#PHP" expanded="false" /> | ||
835 | + <element signature="e#38018#38974#0#PHP" expanded="false" /> | ||
836 | + <element signature="e#39635#46807#0#PHP" expanded="false" /> | ||
837 | + <element signature="e#46830#47047#0#PHP" expanded="false" /> | ||
821 | </folding> | 838 | </folding> |
822 | </state> | 839 | </state> |
823 | </provider> | 840 | </provider> |
@@ -686,11 +686,6 @@ class Pay extends Api | @@ -686,11 +686,6 @@ class Pay extends Api | ||
686 | $response->send(); | 686 | $response->send(); |
687 | } | 687 | } |
688 | 688 | ||
689 | - public function test() { | ||
690 | - $pic_id = cache('pic_id'); | ||
691 | - var_dump($pic_id); | ||
692 | - } | ||
693 | - | ||
694 | //图片支付订单结果通知(无需调用) | 689 | //图片支付订单结果通知(无需调用) |
695 | public function picOrderNotify(){ | 690 | public function picOrderNotify(){ |
696 | $config = config('verify.wx_pay'); | 691 | $config = config('verify.wx_pay'); |
@@ -698,7 +693,7 @@ class Pay extends Api | @@ -698,7 +693,7 @@ class Pay extends Api | ||
698 | 693 | ||
699 | $response = $app->handlePaidNotify(function($message, $fail){ | 694 | $response = $app->handlePaidNotify(function($message, $fail){ |
700 | //找到该订单信息 | 695 | //找到该订单信息 |
701 | - $data = Db::name('order')->where('id',$message['out_trade_no'])->find(); | 696 | + $data = Db::name('order')->where('num',$message['out_trade_no'])->find(); |
702 | $pic_id = explode(',',$data['pic_id']); | 697 | $pic_id = explode(',',$data['pic_id']); |
703 | $video_id = unserialize($data['video_id']); | 698 | $video_id = unserialize($data['video_id']); |
704 | //查询该用户信息以及是否为会员身份 | 699 | //查询该用户信息以及是否为会员身份 |
@@ -710,7 +705,6 @@ class Pay extends Api | @@ -710,7 +705,6 @@ class Pay extends Api | ||
710 | if ($message['return_code'] === 'SUCCESS') { | 705 | if ($message['return_code'] === 'SUCCESS') { |
711 | if ($message['result_code'] === 'SUCCESS') { | 706 | if ($message['result_code'] === 'SUCCESS') { |
712 | //图片 | 707 | //图片 |
713 | - cache('pic_id',$pic_id); | ||
714 | if(!empty($pic_id)){ | 708 | if(!empty($pic_id)){ |
715 | //将购买次数加1 | 709 | //将购买次数加1 |
716 | foreach ($pic_id as $key => $v){ | 710 | foreach ($pic_id as $key => $v){ |
-
请 注册 或 登录 后发表评论