修改后台-合并冲突

app/shop/controller/order/OrderRenew.php

@@ -3,7 +3,7 @@
  * @Author: xiaohai zmhwork@qq.com
  * @Date: 2025-03-14 17:27:51
  * @LastEditors: xiaohai zmhwork@qq.com
- * @LastEditTime: 2025-03-17 16:24:30
+ * @LastEditTime: 2025-03-22 18:10:24
  * @FilePath: \opkpm\app\shop\controller\order\OrderRenew.php
  * @Description: 续费订单
  */
@@ -44,6 +44,30 @@ class OrderRenew extends ShopBase
         return view('');
     }
 
+    public function renewLog()
+    {
+        if ($this->request->isAjax()) {
+            $get = $this->request->get();
+            $get['shop_id'] = $this->shop_id;
+            $get['type_id'] = 1;
+            return JsonServer::success('', OrderRenewLogic::renewLog($get));
+        }
+
+        return view('');
+    }
+
+    public function renewMonthLog()
+    {
+        if ($this->request->isAjax()) {
+            $get = $this->request->get();
+            $get['shop_id'] = $this->shop_id;
+            $get['type_id'] = 2;
+            return JsonServer::success('', OrderRenewLogic::renewLog($get));
+        }
+
+        return view('');
+    }
+
     public function buy()
     {
         $get = $this->request->get();

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-17 18:43:05
+ * @LastEditTime: 2025-03-22 18:24:44
  * @FilePath: \opkpm\app\shop\logic\order\OrderRenewLogic.php
  * @Description: 续费订单逻辑处理
  */
@@ -158,7 +158,7 @@ class OrderRenewLogic extends Logic
         $name = $model->getName();
         $post['order_sn'] = createSn($name, 'order_sn');
         $post['renew_name'] = $post['name'];
-        $post['renew_image'] = $post['image']??"";
+        $post['renew_image'] = $post['image'] ?? "";
         $post['renew_desc'] = $post['desc'];
         $post['renew_type_id'] = $post['type_id'];
         $post['renew_price'] = $post['price'];
@@ -291,6 +291,13 @@ class OrderRenewLogic extends Logic
         // 操作数量
         $op_count = $info['renew_op_count'] * $info['total_num'];
         $shop = Shop::find($info['shop_id']);
+
+        // 添加用户套餐时间或者数量
+        $hk = new ShopHkLog();
+        $hk->shop_id = $shop['id'];
+        $hk->source_id = $info->id;
+        $hk->change_count = $op_count;
+
         // 包月
         if ($info['renew_type_id'] == 0) {
             $old_expire_time = $shop['expire_time'];
@@ -302,16 +309,23 @@ class OrderRenewLogic extends Logic
             $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);
+
+            $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->remark = '[' . $info->renew_name . ']，订单号：' . $info->order_sn . '，增加月份数：' . $op_count;
+            $hk->save();
         } else {
             // 按量付费
             // 添加数量记录
             $old_hksy_count = $shop->hksy_count;
-            $hk = new ShopHkLog();
-            $hk->shop_id = $shop['id'];
-            $hk->source_id = $info->id;
-            $hk->change_count = $op_count;
+            //$hk = new ShopHkLog();
+            //$hk->shop_id = $shop['id'];
+            //$hk->source_id = $info->id;
+            //$hk->change_count = $op_count;
             $hk->left_count = $op_count + $old_hksy_count;
-            $hk->remark = '[' . $info->renew_name . ']，订单号：' . $info->order_sn;
+            $hk->remark = '[' . $info->renew_name . ']，订单号：' . $info->order_sn . '，增加总数：' . $op_count;
             $hk->save();
 
             $shop->hksy_count += $op_count;
@@ -322,6 +336,31 @@ class OrderRenewLogic extends Logic
         return true;
     }
 
+    public static function renewLog($get)
+    {
+        $page = $get['page'] ?? 1;
+        $limit = $get['limit'] ?? 10;
+
+        $where = [];
+        $where[] = ['shop_id', '=', $get['shop_id']];
+        $type_id = $get['type_id'] ?? 1;
+        if ($type_id == 1) {
+            $where[] = ['source_type', '>=', 100];
+            $where[] = ['source_type', '<', 200];
+        } else {
+            $where[] = ['source_type', '>=', 200];
+            $where[] = ['source_type', '<', 300];
+        }
+
+        $count = ShopHkLog::where($where)->count();
+        $lists = ShopHkLog::where($where)
+            ->page($page, $limit)
+            ->order('id', 'desc')
+            ->select()->toArray();
+
+        return ['count' => $count, 'lists' => $lists];
+    }
+
     private static function aliPaySucc($order_sn, $result)
     {
         $time = time();

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

@@ -0,0 +1,47 @@
+<!--
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-22 18:02:49
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-22 18:07:46
+ * @FilePath: \opkpm\app\shop\view\order\order_renew\renew_log.html
+ * @Description: 记录
+-->
+{layout name="layout1" /}
+
+<div class="wrapper">
+    <div class="layui-card">
+        <!-- 操作提示 -->
+        <div class="layui-card-body">
+            <div class="layui-collapse" style="border:1px dashed #c4c4c4">
+                <div class="layui-colla-item">
+                    <h2 class="layui-colla-title like-layui-colla-title">操作提示</h2>
+                    <div class="layui-colla-content layui-show">
+                        <p>*按量付费-续费套餐日志记录。</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 主体区域 -->
+        <div class="layui-card-body">
+            <table id="like-table-lists" lay-filter="like-table-lists"></table>
+        </div>
+
+    </div>
+</div>
+
+<script>
+    layui.use(["table", "form"], function () {
+        var table = layui.table;
+        var form = layui.form;
+
+
+        like.tableLists("#like-table-lists", "{:url()}", [
+            { 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: "create_time", width: 200, align: "center", title: "变动时间" }
+        ]);
+    })
+</script>

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

@@ -0,0 +1,48 @@
+<!--
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-22 18:02:49
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-22 18:22:14
+ * @FilePath: \opkpm\app\shop\view\order\order_renew\renew_month_log.html
+ * @Description: 记录
+-->
+{layout name="layout1" /}
+
+<div class="wrapper">
+    <div class="layui-card">
+        <!-- 操作提示 -->
+        <div class="layui-card-body">
+            <div class="layui-collapse" style="border:1px dashed #c4c4c4">
+                <div class="layui-colla-item">
+                    <h2 class="layui-colla-title like-layui-colla-title">操作提示</h2>
+                    <div class="layui-colla-content layui-show">
+                        <p>*包月-续费套餐日志记录。</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <!-- 主体区域 -->
+        <div class="layui-card-body">
+            <table id="like-table-lists" lay-filter="like-table-lists"></table>
+        </div>
+
+    </div>
+</div>
+
+<script>
+    layui.use(["table", "form"], function () {
+        var table = layui.table;
+        var form = layui.form;
+
+
+        like.tableLists("#like-table-lists", "{:url()}", [
+            { field: "id", width: 80, title: "ID" }
+            , { 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: "create_time", width: 200, align: "center", title: "变动时间" }
+        ]);
+    })
+</script>

public/.htaccess

@@ -1,7 +0,0 @@
-<IfModule mod_rewrite.c>
-   Options +FollowSymlinks
-   RewriteEngine On
-   RewriteCond %{REQUEST_FILENAME} !-d
-   RewriteCond %{REQUEST_FILENAME} !-f
-   RewriteRule ^(.*)$ index.php [E=PATH_INFO:$1,QSA,PT,L]
-</IfModule>