1

.idea/workspace.xml

@@ -3,6 +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/common/model/StoreOrderRefund.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/model/StoreOrderRefund.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/operate/controller/Activity.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/Activity.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -335,7 +336,7 @@
       <workItem from="1685422918249" duration="13139000" />
       <workItem from="1685494086685" duration="21017000" />
       <workItem from="1685580582295" duration="19459000" />
-      <workItem from="1685667434676" duration="1990000" />
+      <workItem from="1685667434676" duration="2081000" />
     </task>
     <servers />
   </component>

application/common/model/StoreOrderRefund.php

@@ -15,7 +15,7 @@ class StoreOrderRefund extends Model
     // 获取退款详情
     public static function getRefundInfo($order_id,$item_id,$type =1)
     {
-        $info = static ::where('order_id',$order_id)->where('item_id',$item_id)->where('type',$type)->find();
+        $info = static ::where('order_id',$order_id)->where('item_id',$item_id)->where('order_type',$type)->find();
         return $info ? $info->toArray() : [];
     }
 

application/operate/controller/Activity.php

@@ -308,7 +308,7 @@ class Activity extends Controller
         }
         ActivityPrice::priceSet($id,$ladder_data);
         \app\common\model\Activity::esAdd($id);
-       // \app\common\service\Activity::activityChange($id);
+        \app\common\service\Activity::activityChange($id);
         $this->success('操作成功', 'javascript:history.back()');
     }