1

.idea/workspace.xml

@@ -3,7 +3,7 @@
   <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/operate/controller/DemandReport.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/DemandReport.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" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -443,7 +443,7 @@
       <workItem from="1694739473903" duration="20371000" />
       <workItem from="1694997975324" duration="5574000" />
       <workItem from="1695085328694" duration="21844000" />
-      <workItem from="1695603648860" duration="4348000" />
+      <workItem from="1695603648860" duration="4505000" />
     </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\GoodsOrder;
 use app\common\model\LevelOrder;
 use app\common\model\StoreOrderRefund;
 use app\common\model\UserMessage;
@@ -88,6 +89,7 @@ class BillApply extends Controller
             $refund_money = StoreOrderRefund::getRefundMoney($data['order_id'],1);
             $data['refund_money'] = $refund_money;
             if($data['order_type'] == 1) $order_info = LevelOrder::where('id',$data['order_id'])->find()->toArray();
+            if($data['order_type'] == 2) $order_info = GoodsOrder::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);