Merge branch 'develop' of https://gitea.zx2049.com/yituan/opkpm into local-develop

app/shop/logic/order/OrderRenewLogic.php

@@ -3,7 +3,7 @@
  * @Author: xiaohai zmhwork@qq.com
  * @Date: 2025-03-14 17:38:50
  * @LastEditors: xiaohai zmhwork@qq.com
- * @LastEditTime: 2025-03-22 18:24:44
+ * @LastEditTime: 2025-03-23 21:29:28
  * @FilePath: \opkpm\app\shop\logic\order\OrderRenewLogic.php
  * @Description: 续费订单逻辑处理
  */
@@ -300,7 +300,7 @@ class OrderRenewLogic extends Logic
 
         // 包月
         if ($info['renew_type_id'] == 0) {
-            $old_expire_time = $shop['expire_time'];
+            $old_expire_time = $shop->getData('expire_time');
             if ($old_expire_time < $time) {
                 $old_expire_time = $time;
             }
@@ -308,11 +308,11 @@ class OrderRenewLogic extends Logic
             $di = \DateInterval::createFromDateString(strval($op_count) . ' months');
             $dt = date_create_from_format('Y-m-d H:i:s', date('Y-m-d H:i:s', $old_expire_time))->add($di);
             $dt_str = $dt->format('Y-m-d 00:00:00');
-            $shop->expire_time = strtotime($dt_str);
+            $shop->expire_time = $dt->getTimestamp();
 
             $hk->source_type = 200;
             $hk->before_date = date('Y-m-d H:i:s', $old_expire_time);
-            $hk->after_date = date('Y-m-d H:i:s', $shop->expire_time);
+            $hk->after_date = date('Y-m-d H:i:s', $dt->getTimestamp());
 
             $hk->remark = '[' . $info->renew_name . ']，订单号：' . $info->order_sn . '，增加月份数：' . $op_count;
             $hk->save();

app/shop/view/order/order_renew/renew_log.html

@@ -2,7 +2,7 @@
  * @Author: xiaohai zmhwork@qq.com
  * @Date: 2025-03-22 18:02:49
  * @LastEditors: xiaohai zmhwork@qq.com
- * @LastEditTime: 2025-03-22 18:07:46
+ * @LastEditTime: 2025-03-23 21:35:18
  * @FilePath: \opkpm\app\shop\view\order\order_renew\renew_log.html
  * @Description: 记录
 -->
@@ -22,6 +22,22 @@
             </div>
         </div>
 
+        <!-- 搜索区域 -->
+        <div class="layui-card-body layui-form">
+            <div class="layui-form-item">
+                <label class="layui-form-label">类型</label>
+                <div class="layui-input-inline">
+                    <select name="type_id">
+                        <option value=""></option>
+                    </select>
+                </div>
+                <div class="layui-inline">
+                    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="search">搜索</a>
+                    <a class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="clear-search">重置</a>
+                </div>
+            </div>
+        </div>
+
         <!-- 主体区域 -->
         <div class="layui-card-body">
             <table id="like-table-lists" lay-filter="like-table-lists"></table>
@@ -40,8 +56,29 @@
             { field: "id", width: 80, title: "ID" }
             , { field: "change_count", width: 200, align: "center", title: "变动数量" }
             , { field: "left_count", width: 200, align: "center", title: "变动后总数" }
-            , { field: "remark", width: 300, align: "center", title: "备注" }
+            , { field: "remark", width: 400, align: "center", title: "备注" }
             , { field: "create_time", width: 200, align: "center", title: "变动时间" }
         ]);
+
+        form.on("submit(search)", function (data) {
+            table.reload("like-table-lists", {
+                where: data.field,
+                page: {
+                    curr: 1
+                }
+            });
+        });
+
+
+        form.on("submit(clear-search)", function () {
+            $("#name").val("");
+            form.render("select");
+            table.reload("like-table-lists", {
+                where: {},
+                page: {
+                    curr: 1
+                }
+            });
+        });
     })
 </script>

app/shop/view/order/order_renew/renew_month_log.html

@@ -2,7 +2,7 @@
  * @Author: xiaohai zmhwork@qq.com
  * @Date: 2025-03-22 18:02:49
  * @LastEditors: xiaohai zmhwork@qq.com
- * @LastEditTime: 2025-03-22 18:22:14
+ * @LastEditTime: 2025-03-23 21:36:08
  * @FilePath: \opkpm\app\shop\view\order\order_renew\renew_month_log.html
  * @Description: 记录
 -->
@@ -22,6 +22,22 @@
             </div>
         </div>
 
+         <!-- 搜索区域 -->
+         <div class="layui-card-body layui-form">
+            <div class="layui-form-item">
+                <label class="layui-form-label">类型</label>
+                <div class="layui-input-inline">
+                    <select name="type_id">
+                        <option value=""></option>
+                    </select>
+                </div>
+                <div class="layui-inline">
+                    <a class="layui-btn layui-btn-sm layui-btn-normal" lay-submit lay-filter="search">搜索</a>
+                    <a class="layui-btn layui-btn-sm layui-btn-primary" lay-submit lay-filter="clear-search">重置</a>
+                </div>
+            </div>
+        </div>
+
         <!-- 主体区域 -->
         <div class="layui-card-body">
             <table id="like-table-lists" lay-filter="like-table-lists"></table>
@@ -41,8 +57,29 @@
             , { field: "change_count", width: 200, align: "center", title: "变动数量" }
             , { field: "before_date", width: 200, align: "center", title: "变动前到期时间" }
             , { field: "after_date", width: 200, align: "center", title: "变动后到期时间" }
-            , { field: "remark", width: 300, align: "center", title: "备注" }
+            , { field: "remark", width: 400, align: "center", title: "备注" }
             , { field: "create_time", width: 200, align: "center", title: "变动时间" }
         ]);
+
+        form.on("submit(search)", function (data) {
+            table.reload("like-table-lists", {
+                where: data.field,
+                page: {
+                    curr: 1
+                }
+            });
+        });
+
+
+        form.on("submit(clear-search)", function () {
+            $("#name").val("");
+            form.render("select");
+            table.reload("like-table-lists", {
+                where: {},
+                page: {
+                    curr: 1
+                }
+            });
+        });
     })
 </script>