1

.idea/workspace.xml

@@ -3,7 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/common/model/UserMessage.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/UserMessage.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -328,7 +327,7 @@
       <workItem from="1684543423796" duration="10653000" />
       <workItem from="1684716593546" duration="15730000" />
       <workItem from="1684743465298" duration="6526000" />
-      <workItem from="1684802887863" duration="12789000" />
+      <workItem from="1684802887863" duration="12945000" />
     </task>
     <servers />
   </component>

application/synth/controller/BillApply.php

@@ -93,13 +93,10 @@ class BillApply extends Controller
         }
 
         if ($this->request->isPost() && $this->request->action() == 'deliver') {
-            $act_id = \app\common\model\BillApply::where('b.id',$data['id'])->alias('b')
-                ->leftJoin('ActivityApply y','y.id = b.order_id')->value('y.act_id');
             $express_company =  Db::name('express_company')->field('id,express_title')->find($data['express_company_id']);
             $data['express_company_title'] = $express_company['express_title'] ? $express_company['express_title'] : '';
             $data['express_send_at'] = date("Y-m-d H:i:s");
             $data['express_state'] = 1;
-            UserMessage::sendUserMessage($data['user_id'],'activity',5,1,0,$act_id,'',$data['id']);
         }
     }
 
@@ -143,6 +140,9 @@ class BillApply extends Controller
             $vo['express_send_at'] = empty($order['express_send_at']) ? date('Y-m-d H:i:s') : $order['express_send_at'];
             $vo['express_state'] = '1';
             $vo['bill_time'] = date("Y-m-d H:i:s");
+            $info = \app\common\model\BillApply::where('b.id', $vo['id'])->alias('b')->field('b.user_id,y.act_id')
+                ->leftJoin('ActivityApply y','y.id = b.order_id')->find()->toArray();
+            UserMessage::sendUserMessage($info['user_id'],'activity',5,1,0,$info['act_id'],'',$vo['id']);
         }
     }