From 368d7cdd3f11ab389beec6510040875ac45e0c07 Mon Sep 17 00:00:00 2001
From: guosheng <gs@bronet.cn>
Date: Tue, 26 Nov 2019 11:23:56 +0800
Subject: [PATCH] 修改appid

---
 .idea/workspace.xml                | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
 application/api/controller/Pay.php |  27 +++++++++++++++++++++++++++
 2 files changed, 101 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1173260..c91a183 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,8 +2,8 @@
 <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/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+      <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" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +14,11 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="User.php" pinned="false" current-in-tab="true">
+      <file leaf-file-name="User.php" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="487">
-              <caret line="1674" column="7" lean-forward="true" selection-start-line="1674" selection-start-column="7" selection-end-line="1674" selection-end-column="7" />
+            <state relative-caret-position="544">
+              <caret line="1584" column="5" lean-forward="true" selection-start-line="1584" selection-start-column="5" selection-end-line="1584" selection-end-column="5" />
               <folding>
                 <element signature="e#365#484#0#PHP" expanded="false" />
                 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -82,6 +82,34 @@
                 <element signature="e#54457#55056#0#PHP" expanded="false" />
                 <element signature="e#55061#56003#0#PHP" expanded="false" />
                 <element signature="e#56009#56724#0#PHP" expanded="false" />
+                <element signature="e#56730#57157#0#PHP" expanded="false" />
+                <element signature="e#57162#57427#0#PHP" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <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="457">
+              <caret line="182" column="46" lean-forward="false" selection-start-line="182" selection-start-column="46" selection-end-line="182" selection-end-column="46" />
+              <folding>
+                <element signature="e#450#569#0#PHP" expanded="false" />
+                <element signature="e#575#888#0#PHP" expanded="false" />
+                <element signature="e#893#2938#0#PHP" expanded="false" />
+                <element signature="e#2944#3264#0#PHP" expanded="false" />
+                <element signature="e#3269#5320#0#PHP" expanded="false" />
+                <element signature="e#5326#5744#0#PHP" expanded="false" />
+                <element signature="e#9535#11279#0#PHP" expanded="false" />
+                <element signature="e#11352#11772#0#PHP" expanded="false" />
+                <element signature="e#11777#16446#0#PHP" expanded="false" />
+                <element signature="e#14632#16378#0#PHP" expanded="false" />
+                <element signature="e#16473#20175#0#PHP" expanded="false" />
+                <element signature="e#20205#23149#0#PHP" expanded="false" />
+                <element signature="e#23178#24435#0#PHP" expanded="false" />
+                <element signature="e#24464#25750#0#PHP" expanded="false" />
+                <element signature="e#25773#25990#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -149,7 +177,6 @@
         <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
         <option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
         <option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
-        <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
         <option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
         <option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
         <option value="$PROJECT_DIR$/application/admin/model/User.php" />
@@ -159,6 +186,7 @@
         <option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
         <option value="$PROJECT_DIR$/application/extra/verify.php" />
         <option value="$PROJECT_DIR$/application/api/controller/User.php" />
+        <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
       </list>
     </option>
   </component>
@@ -176,11 +204,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="508" />
-    <option name="y" value="20" />
-    <option name="width" value="1776" />
-    <option name="height" value="1014" />
+  <component name="ProjectFrameBounds" extendedState="7">
+    <option name="x" value="-489" />
+    <option name="y" value="26" />
+    <option name="width" value="1938" />
+    <option name="height" value="966" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -238,7 +266,7 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/../project/competition" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../project/zhaozhao" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
@@ -290,7 +318,7 @@
       <workItem from="1574469667436" duration="25235000" />
       <workItem from="1574641631900" duration="15479000" />
       <workItem from="1574669596135" duration="11747000" />
-      <workItem from="1574727687281" duration="6614000" />
+      <workItem from="1574727687281" duration="10250000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -303,7 +331,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="236885000" />
+    <option name="totallyTimeSpent" value="240521000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -315,16 +343,17 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="508" y="20" width="1776" height="1014" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
+    <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.14160839" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.12953092" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
       <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13568985" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.12948857" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -706,30 +735,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-316">
-          <caret line="38" column="26" lean-forward="true" selection-start-line="38" selection-start-column="26" selection-end-line="38" selection-end-column="26" />
-          <folding>
-            <element signature="e#450#569#0#PHP" expanded="false" />
-            <element signature="e#575#888#0#PHP" expanded="false" />
-            <element signature="e#2944#3264#0#PHP" expanded="false" />
-            <element signature="e#3269#5320#0#PHP" expanded="false" />
-            <element signature="e#5326#5744#0#PHP" expanded="false" />
-            <element signature="e#5749#10343#0#PHP" expanded="false" />
-            <element signature="e#8532#10276#0#PHP" expanded="false" />
-            <element signature="e#10349#10769#0#PHP" expanded="false" />
-            <element signature="e#10774#15443#0#PHP" expanded="false" />
-            <element signature="e#13629#15375#0#PHP" expanded="false" />
-            <element signature="e#15470#19172#0#PHP" expanded="false" />
-            <element signature="e#19202#22146#0#PHP" expanded="false" />
-            <element signature="e#22175#23432#0#PHP" expanded="false" />
-            <element signature="e#23461#24747#0#PHP" expanded="false" />
-            <element signature="e#24770#24987#0#PHP" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/extra/verify.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="100">
@@ -740,8 +745,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="487">
-          <caret line="1674" column="7" lean-forward="true" selection-start-line="1674" selection-start-column="7" selection-end-line="1674" selection-end-column="7" />
+        <state relative-caret-position="544">
+          <caret line="1584" column="5" lean-forward="true" selection-start-line="1584" selection-start-column="5" selection-end-line="1584" selection-end-column="5" />
           <folding>
             <element signature="e#365#484#0#PHP" expanded="false" />
             <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -805,6 +810,32 @@
             <element signature="e#54457#55056#0#PHP" expanded="false" />
             <element signature="e#55061#56003#0#PHP" expanded="false" />
             <element signature="e#56009#56724#0#PHP" expanded="false" />
+            <element signature="e#56730#57157#0#PHP" expanded="false" />
+            <element signature="e#57162#57427#0#PHP" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="457">
+          <caret line="182" column="46" lean-forward="false" selection-start-line="182" selection-start-column="46" selection-end-line="182" selection-end-column="46" />
+          <folding>
+            <element signature="e#450#569#0#PHP" expanded="false" />
+            <element signature="e#575#888#0#PHP" expanded="false" />
+            <element signature="e#893#2938#0#PHP" expanded="false" />
+            <element signature="e#2944#3264#0#PHP" expanded="false" />
+            <element signature="e#3269#5320#0#PHP" expanded="false" />
+            <element signature="e#5326#5744#0#PHP" expanded="false" />
+            <element signature="e#9535#11279#0#PHP" expanded="false" />
+            <element signature="e#11352#11772#0#PHP" expanded="false" />
+            <element signature="e#11777#16446#0#PHP" expanded="false" />
+            <element signature="e#14632#16378#0#PHP" expanded="false" />
+            <element signature="e#16473#20175#0#PHP" expanded="false" />
+            <element signature="e#20205#23149#0#PHP" expanded="false" />
+            <element signature="e#23178#24435#0#PHP" expanded="false" />
+            <element signature="e#24464#25750#0#PHP" expanded="false" />
+            <element signature="e#25773#25990#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>
diff --git a/application/api/controller/Pay.php b/application/api/controller/Pay.php
index 63ac147..6a08f3d 100644
--- a/application/api/controller/Pay.php
+++ b/application/api/controller/Pay.php
@@ -164,6 +164,29 @@ class Pay extends Api
             $data = Db::name('order')->where('id',$order_id)->find();
             $pic_id = explode(',',$data['pic_id']);
             $video_id = unserialize($data['video_id']);
+
+            $user = Db::name('user')->where('id',$data['user_id'])->find();
+            $mobile = $user['mobile'];
+            $str = "【仁甲看见】";
+            if(!empty($pic_id)){
+                foreach ($pic_id as $key => $v){
+                    $pic = Db::name('pic')->field('id,title,url,code')->where('id',$v)->find();
+                    $str .= "图片标题:$pic[title],云盘地址:$pic[url],提取码:$pic[code]";
+                }
+            }
+            if(!empty($video_id)){
+                foreach ($video_id as $key => $val){
+                    $video = Db::name('video')->field('id,title,two_url,two_code,four_url,four_code,eight_url,eight_code')->where('id',$val['id'])->find();
+                    if($val['attr'] == 1){
+                        $video['attr'] = '2k';
+                    }elseif ($val['attr'] == 2){
+                        $video['attr'] = '4k';
+                    }
+                    $str .= "图片标题:$video[title],云盘地址:$pic[url],提取码:$pic[code]";
+                }
+            }
+
+
             if($type == 1){
                 if($data){
                     if($data['status'] == 2){
@@ -176,9 +199,13 @@ class Pay extends Api
                             $this->error(['code'=>2,'msg'=>'余额不足,请充值后重试']);
                         }
                         $money = $res['money'] - $data['total'];
+
+
+
                         // 启动事务
                         Db::startTrans();
                         try{
+
                             foreach ($pic_id as $key => $v){
                                 $pic = Db::name('pic')->field('id,buy_num')->where('id',$v)->find();
                                 Db::name('pic')->where('id',$pic['id'])->update(['buy_num'=>$pic['buy_num']+1]);
--
libgit2 0.24.0