chuweiqiang 1 year ago
parent
commit
03b25ab307

+ 4 - 6
.idea/workspace.xml

@@ -3,10 +3,8 @@
   <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/ActivityApplyItem.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/controller/ActivityApplyItem.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/operate/view/activity_apply_item/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/operate/view/activity_apply_item/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/cache/4c/d9aaff68a897261d9d4e25ac10435f.php" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/cache/4c/d9aaff68a897261d9d4e25ac10435f.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/runtime/log/single_sql.log" beforeDir="false" afterPath="$PROJECT_DIR$/runtime/log/single_sql.log" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -573,7 +571,7 @@
       <workItem from="1710808231575" duration="7017000" />
       <workItem from="1710817453185" duration="16334000" />
       <workItem from="1710896140284" duration="18662000" />
-      <workItem from="1710981036861" duration="6498000" />
+      <workItem from="1710981036861" duration="6726000" />
     </task>
     <servers />
   </component>
@@ -715,10 +713,10 @@
       <screen x="0" y="0" width="2194" height="1194" />
     </state>
     <state x="754" y="279" key="run.anything.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1702458428181" />
-    <state x="1355" y="482" width="672" height="579" key="search.everywhere.popup" timestamp="1709602284482">
+    <state x="1355" y="482" width="672" height="579" key="search.everywhere.popup" timestamp="1710988514959">
       <screen x="0" y="0" width="2194" height="1194" />
     </state>
-    <state x="1355" y="482" width="672" height="579" key="search.everywhere.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1709602284482" />
+    <state x="1355" y="482" width="672" height="579" key="search.everywhere.popup/0.0.2194.1194@0.0.2194.1194" timestamp="1710988514959" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>

+ 2 - 2
application/operate/controller/ActivityApplyItem.php

@@ -353,12 +353,12 @@ class ActivityApplyItem extends Controller
      * @throws \think\exception\PDOException
      */
     public function remind(){
-        $order = \app\common\model\ActivityApply::where('id','in',input('id'))->select()->toArray();
+        $order = \app\common\model\ActivityApplyItem::where('id','in',input('id'))->group('apply_id')->select()->toArray();
         $ret_val = true;$msg='';
         Db::startTrans();
         try{
             foreach ($order as $k => $v){
-                $order_info = $v;
+                $order_info = \app\common\model\ActivityApply::where('id',$v['apply_id'])->find();
                 // 更改订单状态
                 //\app\common\model\ActivityApply::where('id',$order_info['id'])->update(['status'=>1,'pay_state'=>1,'pay_at'=>date('Y-m-d H:i:s')]);
                 $item_list =  \app\common\model\ActivityApplyItem::where('apply_id',$order_info['id'])->select()->toArray();

+ 2 - 2
application/operate/view/activity_apply_item/index.html

@@ -49,7 +49,7 @@
 
             <div class="layui-form-item layui-inline">
                 <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-                <button data-action='{:url("remind")}'   data-confirm="确定要重新提醒吗?"data-csrf="{:systoken('remind')}" data-rule="apply_id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量提醒</button>
+                <button data-action='{:url("remind")}'   data-confirm="确定要重新提醒吗?"data-csrf="{:systoken('remind')}" data-rule="id#{key}" class='layui-btn layui-btn-sm layui-btn-primary'>批量提醒</button>
             </div>
 
             <div class="layui-form-item layui-inline" style="margin-left: 5px;">
@@ -121,7 +121,7 @@
                 {eq name='vo.refund_status' value='4'}
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('确认退款','refund','{$vo.id}');">退款</span>
                 {/eq}
-                <span class="layui-btn layui-btn-sm layui-btn-warm" onclick="btn_confirm('重新提醒','remind','{$vo.apply_id}');">重新提醒</span>
+                <span class="layui-btn layui-btn-sm layui-btn-warm" onclick="btn_confirm('重新提醒','remind','{$vo.id}');">重新提醒</span>
             </td>
         </tr>
         {/foreach}