修改短信

@@ -2,8 +2,9 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
+      <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" />
       <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" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,11 +15,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="187">
-              <caret line="1979" column="38" lean-forward="true" selection-start-line="1979" selection-start-column="38" selection-end-line="1979" selection-end-column="38" />
+            <state relative-caret-position="300">
+              <caret line="1771" column="0" lean-forward="true" selection-start-line="1771" selection-start-column="0" selection-end-line="1771" selection-end-column="0" />
               <folding>
                 <element signature="e#365#484#0#PHP" expanded="false" />
                 <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -90,11 +91,46 @@
                 <element signature="e#62397#62736#1#PHP" expanded="false" />
                 <element signature="e#62766#63120#1#PHP" expanded="false" />
                 <element signature="e#63959#64651#0#PHP" expanded="false" />
+                <element signature="e#64656#68103#0#PHP" expanded="false" />
                 <element signature="e#64776#64913#1#PHP" expanded="false" />
                 <element signature="e#64943#65083#1#PHP" expanded="false" />
                 <element signature="e#65094#65185#0#PHP" expanded="false" />
-                <element signature="e#66174#66258#0#PHP" expanded="false" />
-                <element signature="e#67543#68052#0#PHP" expanded="false" />
+                <element signature="e#68109#68618#0#PHP" expanded="false" />
+                <element signature="e#68623#69295#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="251">
+              <caret line="621" column="5" lean-forward="true" selection-start-line="621" selection-start-column="5" selection-end-line="621" selection-end-column="5" />
+              <folding>
+                <element signature="e#706#1019#0#PHP" expanded="false" />
+                <element signature="e#1024#3100#0#PHP" expanded="false" />
+                <element signature="e#3106#3426#0#PHP" expanded="false" />
+                <element signature="e#3431#5513#0#PHP" expanded="false" />
+                <element signature="e#5519#5937#0#PHP" expanded="false" />
+                <element signature="e#5942#16057#0#PHP" expanded="false" />
+                <element signature="e#6834#15990#0#PHP" expanded="false" />
+                <element signature="e#7800#9209#0#PHP" expanded="false" />
+                <element signature="e#14215#15990#0#PHP" expanded="false" />
+                <element signature="e#16063#16483#0#PHP" expanded="false" />
+                <element signature="e#16488#26512#0#PHP" expanded="false" />
+                <element signature="e#26529#26826#0#PHP" expanded="false" />
+                <element signature="e#26831#27224#0#PHP" expanded="false" />
+                <element signature="e#27251#30729#0#PHP" expanded="false" />
+                <element signature="e#30758#33662#0#PHP" expanded="false" />
+                <element signature="e#33695#39626#0#PHP" expanded="false" />
+                <element signature="e#34473#35465#0#PHP" expanded="false" />
+                <element signature="e#35511#39016#0#PHP" expanded="false" />
+                <element signature="e#37590#37977#0#PHP" expanded="false" />
+                <element signature="e#38038#38994#0#PHP" expanded="false" />
+                <element signature="e#39064#39166#0#PHP" expanded="false" />
+                <element signature="e#39655#46827#0#PHP" expanded="false" />
+                <element signature="e#46850#47067#0#PHP" expanded="false" />
               </folding>
             </state>
           </provider>
@@ -174,12 +210,12 @@
         <option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
         <option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
         <option value="$PROJECT_DIR$/application/admin/view/common/menu.html" />
-        <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
         <option value="$PROJECT_DIR$/application/admin/controller/Suggest.php" />
         <option value="$PROJECT_DIR$/application/admin/view/suggest/index.html" />
         <option value="$PROJECT_DIR$/public/assets/js/backend/suggest.js" />
         <option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
         <option value="$PROJECT_DIR$/application/api/controller/User.php" />
+        <option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
       </list>
     </option>
   </component>
@@ -197,11 +233,11 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
-  <component name="ProjectFrameBounds">
-    <option name="x" value="606" />
-    <option name="y" value="50" />
+  <component name="ProjectFrameBounds" extendedState="1">
+    <option name="x" value="316" />
+    <option name="y" value="71" />
     <option name="width" value="1569" />
-    <option name="height" value="949" />
+    <option name="height" value="937" />
   </component>
   <component name="ProjectView">
     <navigator currentView="ProjectPane" proportions="" version="1">
@@ -218,8 +254,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -249,6 +283,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="Scratches" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -344,7 +380,8 @@
       <workItem from="1575959458925" duration="956000" />
       <workItem from="1575979358020" duration="2589000" />
       <workItem from="1576028218954" duration="680000" />
-      <workItem from="1576128183316" duration="6352000" />
+      <workItem from="1576128183316" duration="7364000" />
+      <workItem from="1576135696788" duration="8501000" />
     </task>
     <task id="LOCAL-00001" summary="调试">
       <created>1574145133364</created>
@@ -371,7 +408,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="396586000" />
+    <option name="totallyTimeSpent" value="406099000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -383,18 +420,19 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="606" y="50" width="1569" height="949" extended-state="0" />
+    <frame x="316" y="71" width="1569" height="937" 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.22332671" 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.17760105" 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="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="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.47413793" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.47413793" sideWeight="0.5" order="2" 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="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="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" />
       <window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -435,7 +473,7 @@
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
-      <option name="time" value="22" />
+      <option name="time" value="23" />
     </breakpoint-manager>
     <watches-manager />
   </component>
@@ -900,33 +938,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="673">
-          <caret line="624" column="40" lean-forward="false" selection-start-line="624" selection-start-column="40" selection-end-line="624" selection-end-column="40" />
-          <folding>
-            <element signature="e#706#1019#0#PHP" expanded="false" />
-            <element signature="e#1024#3100#0#PHP" expanded="false" />
-            <element signature="e#3106#3426#0#PHP" expanded="false" />
-            <element signature="e#3431#5513#0#PHP" expanded="false" />
-            <element signature="e#5519#5937#0#PHP" expanded="false" />
-            <element signature="e#5942#16036#0#PHP" expanded="false" />
-            <element signature="e#16042#16462#0#PHP" expanded="false" />
-            <element signature="e#16467#26491#0#PHP" expanded="false" />
-            <element signature="e#26508#26805#0#PHP" expanded="false" />
-            <element signature="e#26810#27203#0#PHP" expanded="false" />
-            <element signature="e#27230#30708#0#PHP" expanded="false" />
-            <element signature="e#30737#33641#0#PHP" expanded="false" />
-            <element signature="e#33674#39605#0#PHP" expanded="false" />
-            <element signature="e#35490#38995#0#PHP" expanded="false" />
-            <element signature="e#37569#37956#0#PHP" expanded="false" />
-            <element signature="e#38017#38973#0#PHP" expanded="false" />
-            <element signature="e#39634#46806#0#PHP" expanded="false" />
-            <element signature="e#46829#47046#0#PHP" expanded="false" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
@@ -941,7 +952,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -949,9 +959,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="350">
           <caret line="39" column="4" lean-forward="false" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
-          <folding>
-            <marker date="1562338656000" expanded="true" signature="13159:13266" ph="SELECT COLUM... COLUMNS" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -959,7 +966,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-2651">
           <caret line="249" column="23" lean-forward="false" selection-start-line="249" selection-start-column="23" selection-end-line="249" selection-end-column="23" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -967,7 +973,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="369">
           <caret line="45" column="47" lean-forward="true" selection-start-line="45" selection-start-column="47" selection-end-line="45" selection-end-column="47" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -975,7 +980,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="172">
           <caret line="45" column="34" lean-forward="true" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -983,7 +987,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="25">
           <caret line="33" column="144" lean-forward="true" selection-start-line="33" selection-start-column="24" selection-end-line="33" selection-end-column="144" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -991,7 +994,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="300">
           <caret line="30" column="24" lean-forward="true" selection-start-line="30" selection-start-column="24" selection-end-line="36" selection-end-column="26" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -999,7 +1001,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="469">
           <caret line="35" column="55" lean-forward="false" selection-start-line="35" selection-start-column="55" selection-end-line="35" selection-end-column="55" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1007,7 +1008,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="275">
           <caret line="11" column="24" lean-forward="false" selection-start-line="11" selection-start-column="24" selection-end-line="11" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1015,14 +1015,13 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="368">
           <caret line="43" column="10" lean-forward="true" selection-start-line="43" selection-start-column="10" selection-end-line="43" selection-end-column="10" />
-          <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="187">
-          <caret line="1979" column="38" lean-forward="true" selection-start-line="1979" selection-start-column="38" selection-end-line="1979" selection-end-column="38" />
+        <state relative-caret-position="300">
+          <caret line="1771" column="0" lean-forward="true" selection-start-line="1771" selection-start-column="0" selection-end-line="1771" selection-end-column="0" />
           <folding>
             <element signature="e#365#484#0#PHP" expanded="false" />
             <element signature="e#490#1228#0#PHP" expanded="false" />
@@ -1094,11 +1093,44 @@
             <element signature="e#62397#62736#1#PHP" expanded="false" />
             <element signature="e#62766#63120#1#PHP" expanded="false" />
             <element signature="e#63959#64651#0#PHP" expanded="false" />
+            <element signature="e#64656#68103#0#PHP" expanded="false" />
             <element signature="e#64776#64913#1#PHP" expanded="false" />
             <element signature="e#64943#65083#1#PHP" expanded="false" />
             <element signature="e#65094#65185#0#PHP" expanded="false" />
-            <element signature="e#66174#66258#0#PHP" expanded="false" />
-            <element signature="e#67543#68052#0#PHP" expanded="false" />
+            <element signature="e#68109#68618#0#PHP" expanded="false" />
+            <element signature="e#68623#69295#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="251">
+          <caret line="621" column="5" lean-forward="true" selection-start-line="621" selection-start-column="5" selection-end-line="621" selection-end-column="5" />
+          <folding>
+            <element signature="e#706#1019#0#PHP" expanded="false" />
+            <element signature="e#1024#3100#0#PHP" expanded="false" />
+            <element signature="e#3106#3426#0#PHP" expanded="false" />
+            <element signature="e#3431#5513#0#PHP" expanded="false" />
+            <element signature="e#5519#5937#0#PHP" expanded="false" />
+            <element signature="e#5942#16057#0#PHP" expanded="false" />
+            <element signature="e#6834#15990#0#PHP" expanded="false" />
+            <element signature="e#7800#9209#0#PHP" expanded="false" />
+            <element signature="e#14215#15990#0#PHP" expanded="false" />
+            <element signature="e#16063#16483#0#PHP" expanded="false" />
+            <element signature="e#16488#26512#0#PHP" expanded="false" />
+            <element signature="e#26529#26826#0#PHP" expanded="false" />
+            <element signature="e#26831#27224#0#PHP" expanded="false" />
+            <element signature="e#27251#30729#0#PHP" expanded="false" />
+            <element signature="e#30758#33662#0#PHP" expanded="false" />
+            <element signature="e#33695#39626#0#PHP" expanded="false" />
+            <element signature="e#34473#35465#0#PHP" expanded="false" />
+            <element signature="e#35511#39016#0#PHP" expanded="false" />
+            <element signature="e#37590#37977#0#PHP" expanded="false" />
+            <element signature="e#38038#38994#0#PHP" expanded="false" />
+            <element signature="e#39064#39166#0#PHP" expanded="false" />
+            <element signature="e#39655#46827#0#PHP" expanded="false" />
+            <element signature="e#46850#47067#0#PHP" expanded="false" />
           </folding>
         </state>
       </provider>

@@ -172,7 +172,7 @@ class Pay extends Api
             //查询用户表 取出手机号
             $user = Db::name('user')->where('id',$data['user_id'])->find();
             $mobile = $user['mobile'];
-            $str = "【仁甲看见】";
+            $str = "【仁甲看见SHOP】,感谢您购买仁甲看见SHOP素材。";
 
             if($type == 1){
                 if($data){

@@ -1894,43 +1894,51 @@ class User extends Api
         $res['use'] = $param['use'];
         $res['tel'] = $param['tel'];
         $res['createtime'] = time();
-        $order_id = explode(',',$param['order_id']);
-        //循环查询每个订单中的图片ID以及视频ID
-        foreach ($order_id as $key=>$val){
-            //查询出该订单的内容
-            $order = Db::name('order')
-                ->where('id',$val)
-                ->find();
-            //判读图片和视频是否为空
-            if(!empty($order['pic_id'])){
-                //如果图片ID不为空
-               $res['pic_id'] = $order_id['pic_id'];
-            }
-            if(!empty($order['video_id'])){
-                //如果视频ID不为空
-                $video_id = unserialize($order['video_id']);
-                $res['video_id'] = array_column($video_id,'id');
+        $res['order_id'] = $param['order_id'];
+
+        $order = explode(',',$res['order_id']);
+        $shou = Db::name('shou')
+            ->where('user_id',$res['user_id'])
+            ->column('order_id');
+        foreach ($shou as $s_value){
+            $s_arr = explode(',',$s_value);
+            foreach ($order as $item) {
+                if(in_array($item,$s_arr)){
+                    $this->error('包含已下载过的授权书');
+                }
             }
         }
-        print_r($res);die;
-
-        //判断是否已经下载过授权书
-        $info = Db::name('shou')
-            ->where('order_id',$res['order_id'])
-            ->find();
-        if(!empty($info)){
-            $this->error(['code'=>2,'msg'=>'您已经下载过了']);
-        }
-
         $data = Db::name('shou')
             ->insertGetId($res);
         if(!empty($data)){
             //添加成功
-
             $list = Db::name('shou')
                 ->where('id',$data)
                 ->find();
+            $list['order_id'] = explode(',',$list['order_id']);
+            foreach ($list['order_id'] as &$v){
+                $v = Db::name('order')
+                    ->field('pic_id,video_id')
+                    ->where('id',$v)
+                    ->find();
+                if(!empty($v['pic_id'])){
+                    $v['pic_id'] = explode(',',$v['pic_id']);
+                    $pic_number = Db::name('pic')
+                        ->whereIn('id',$v['pic_id'])
+                        ->column('number');
+                    array_push($v['num'],$pic_number);
+                }
+                if(!empty($v['video_id'])){
+                    $v['video_id'] = unserialize($v['video_id']);
+                    $video_number = Db::name('video')
+                        ->whereIn('id',$v['video_id'])
+                        ->column('number');
+                    array_push($v['num'],$video_number);
+                }
+            }
+            print_r($list['order_id']);die;
             $time = date('Y-m-d H:i:s',$list['createtime']);
+
             Db::name('order')
                 ->whereIn('id',$list['order_id'])
                 ->update(['shou_status'=>1]);
@@ -1952,7 +1960,7 @@ class User extends Api
                 $common->test_pdf($param['name'],$param['use'],$param['tel'],$video['number'],$order['num'],$time);
             }
         }else{
-            $this->error('sql运行失败');
+            $this->error('加入授权书表失败');
         }
     }