1

.idea/workspace.xml

@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="1a36929e-c054-4875-a943-593a74e55fa4" name="Default Changelist" comment="" />
+    <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/synth/controller/BillApply.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/synth/controller/BillApply.php" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -391,7 +394,7 @@
       <workItem from="1691543042280" duration="23354000" />
       <workItem from="1691629430810" duration="15054000" />
       <workItem from="1691715404380" duration="18567000" />
-      <workItem from="1691801870842" duration="2784000" />
+      <workItem from="1691801870842" duration="3066000" />
     </task>
     <servers />
   </component>

application/synth/controller/BillApply.php

@@ -1,6 +1,7 @@
 <?php
 namespace app\synth\controller;
 use app\common\model\ActivityApply;
+use app\common\model\LevelOrder;
 use app\common\model\StoreOrderRefund;
 use app\common\model\UserMessage;
 use library\Controller;
@@ -86,7 +87,8 @@ class BillApply extends Controller
             // 退款金额
             $refund_money = StoreOrderRefund::getRefundMoney($data['order_id'],1);
             $data['refund_money'] = $refund_money;
-            $order_info = ActivityApply::where('id',$data['order_id'])->find()->toArray();
+            if($data['order_type'] == 1) $order_info = LevelOrder::where('id',$data['order_id'])->find()->toArray();
+            if($data['order_type'] == 3) $order_info = ActivityApply::where('id',$data['order_id'])->find()->toArray();
             $data['order_info'] = $order_info;
             if($data['address_info']) $data['address_info'] = json_decode($data['address_info'],true);
             $this->data = $data;