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

app/admin/logic/shop/GoodsRenewLogic.php

@@ -3,8 +3,8 @@
  * @Author: ZMH
  * @Email: zmhwork@qq.com
  * @Date: 2025-03-13 11:47:30
- * @LastEditTime: 2025-03-13 17:41:19
- * @LastEditors: ZMH
+ * @LastEditTime: 2025-03-14 18:02:56
+ * @LastEditors: xiaohai zmhwork@qq.com
  * @FilePath: \opkpm\app\admin\logic\shop\GoodsRenewLogic.php
  * 
  * @Description: 续费逻辑处理
@@ -28,7 +28,7 @@ class GoodsRenewLogic extends Logic
             ['del', '=', 0]
         ];
 
-        if (!empty($get['name']) and $get['name'])
+        if (!empty($get['name']) && $get['name'])
             $where[] = ['name', 'like', '%' . $get['name'] . '%'];
 
         $model = new ShopGoodsRenew();

app/api/controller/ShopContent.php

@@ -338,8 +338,37 @@ class ShopContent extends Api
         }
     }
 
-    /*
-     *
+    /**
+     * 查询获客剩余数量
+     */
+    public function getHKSYCount() {
+        if ($this->request->isGet()) {
+            $get = $this->request->get();
+            $data = ShopContentLogic::getHKSYCount($get);
+            if ($data === false) {
+                return JsonServer::error(ShopContentLogic::getError(), ['err_code' => ShopContentLogic::getErrCode()]);
+            }
+
+            return JsonServer::success('', $data);
+        }
+
+        return JsonServer::error('请求方式错误', ['err_code' => 10001]);
+    }
+
+    /**
+     * 减少获客剩余数量
      */
+    public function subHKSYCount() {
+        if ($this->request->isPost()) {
+            $post = $this->request->post();
+            $count = ShopContentLogic::subHKSYCount($post);
+            if ($count === false) {
+                return JsonServer::error(ShopContentLogic::getError(), ['err_code' => ShopContentLogic::getErrCode()]);
+            }
+
+            return JsonServer::success('操作成功', ['count' => $count]);
+        }
 
+        return JsonServer::error('请求方式错误', ['err_code' => 10001]);
+    }
 }

app/api/logic/ShopContentLogic.php

@@ -25,7 +25,8 @@ use app\common\model\content\Closure;
 
 use app\common\model\shop\Shop as shopModel;
 use app\common\model\content\EquiCategory as EquiCategoryModel;
-
+use app\common\model\shop\ShopHkLog;
+use think\facade\Db;
 use think\facade\Event;
 
 
@@ -703,5 +704,136 @@ class ShopContentLogic extends Logic
         return $data;
     }
 
+    /**
+     * 加密 ZMH 2025-03-18
+     * @param $data
+     * @return bool|string
+     */
+    public static function encrypt($data)
+    {
+        $key = 'ABCDEFGHIJKLMNOP'; //16位
+        $vi  = '0102030405060708'; //16位
+        if (is_array($data)) {
+            $str = json_encode($data,JSON_UNESCAPED_UNICODE); //讲数组转为字符串
+        } else if (is_string($data)) {
+            $str = $data;
+        } else {
+            return false;
+        }
+
+        $sign = openssl_encrypt($str, 'AES-128-CBC', $key,  OPENSSL_RAW_DATA, $vi);
+        $sign = base64_encode($sign);
+        return $sign;
+    }
+
+    /**
+     * 获取商家信息 ZMH 2025-03-18
+     * @param $code
+     * @return model|bool
+     */
+    public static function getShopByCode($code)
+    {
+        if (empty($code)) {
+            self::$error = "设备编码不能为空";
+            self::$errCode = 2;
+            return false;
+        }
+
+        $where = [
+            "del" => 0,
+            "is_show" => 1,
+            "pid" => 0, //必须是电脑
+            "code" => $code
+        ];
+        $item = EquiCategoryModel::where($where)->find();
+        if (empty($item)) {
+            self::$error = "没有找到对应的设备";
+            self::$errCode = 3;
+            return false;
+        }
+
+        $shop = ShopModel::where("id", $item["shop_id"])->find();
+        if (empty($shop)) {
+            self::$error = "用户信息不存在";
+            self::$errCode = 4;
+            return false;
+        }
+
+        return $shop;
+    }
+
+    /**
+     * 获取剩余数量  ZMH 2025-03-18
+     * @param $get
+     * @return bool|array
+     */
+    public static function getHKSYCount($get) {
+        $code = $get["code"] ?? '';
+        $shop = self::getShopByCode($code);
+        if (empty($shop)) {
+            return false;
+        }
+
+        return ['count' => $shop->hksy_count, 'expire_time' => $shop->expire_time];
+    }
+
+    /**
+     * 扣减剩余数量  ZMH 2025-03-18
+     * @param $get
+     * @return bool|number
+     */
+    public static function subHKSYCount($post) {
+        $code = $post["code"] ?? '';
+        $count = $post["count"] ?? 0;
+        $remark = $post["remark"] ?? '';
+        if ($count <= 0 || empty($remark)) {
+            self::$errCode = 1;
+            self::$error = "参数错误";
+            return false;
+        }
+
+        $shop = self::getShopByCode($code);
+        if (empty($shop)) {
+            return false;
+        }
+
+        // 判断是否过期
+        $expire_time = $shop->expire_time;
+        if (time() < $expire_time) {
+           return true;
+        }
+
+        if ($shop->hksy_count < $count) {
+            self::$errCode = 5;
+            self::$error = "剩余数量不足";
+            return false;
+        }
 
+        Db::startTrans();
+        try {
+            //code...
+            $old_hksy_count = $shop->hksy_count;
+            $shop->hksy_count = $shop->hksy_count - $count;
+            $shop->save();
+            // 添加数量记录
+            $hk = new ShopHkLog();
+            $hk->shop_id = $shop['id'];
+            $hk->source_type = 101;
+            $hk->change_count = 0 - $count;
+            $hk->left_count = $shop->hksy_count;
+            $hk->remark = $remark;
+
+            $hk->save();
+
+            Db::commit();
+        } catch (\Throwable $th) {
+            //throw $th;
+            Db::rollback();
+            self::$errCode = 6;
+            self::$error = "扣除失败";
+            return false;
+        }
+
+        return $shop->hksy_count;
+    }
 }

app/common/basics/Logic.php

@@ -43,4 +43,11 @@ abstract class Logic
     {
         return self::$error;
     }
+
+    // 错误码 ZMH 2025-03-18
+    protected static $errCode = 0;
+    public static function getErrCode()
+    {
+        return self::$errCode;
+    }
 }

app/common/model/content/Closure.php

@@ -42,14 +42,63 @@ class Closure extends Models
         return $content;
     }
 
+    private function replaceContent($content)
+    {
+        // 替换空格
+        $content = preg_replace("/\s+/", "", $content);
+        // var_dump(111, $content);
+        str_replace("|", '|', $content);
+        $arr = explode('|', $content);
+        $arr = array_filter($arr);
+        return implode('|', $arr);
+    }
+
+    private function replaceContent2($content)
+    {
+        // 替换空格
+        $content = preg_replace("/\s+/", "", $content);
+        // str_replace("-", '-', $content);
+        $arr = explode('-', $content);
+        $arr = array_filter($arr);
+        if (count($arr) > 3) {
+            throw new \Exception('匹配词不能超过3个');
+        }
+
+        if (count($arr) <= 0) {
+            throw new \Exception('匹配词选项填写错误');
+        }
+
+        return implode('-', $arr);
+    }
+
     /*
      * 处理表达数据
      */
     public function postDataHandle($post=[]){
+        // var_dump(123, $post['b3']);
+        $post['b3'] = $this->replaceContent($post['b3']);
+        // var_dump(456, $post['b3']);
+        // return true;
+
+        $post['a7'] = $this->replaceContent($post['a7']);
+        $post['e7'] = $this->replaceContent($post['e7']);
+        $post['f10'] = $this->replaceContent($post['f10']);
+        $post['f11'] = $this->replaceContent($post['f11']);
+        $post['f12'] = $this->replaceContent($post['f12']);
+        $post['f13'] = $this->replaceContent($post['f13']);
+        $post['f14'] = $this->replaceContent($post['f14']);
+        $post['f15'] = $this->replaceContent($post['f15']);
+        $post['f17'] = $this->replaceContent($post['f17']);
+        $post['f19'] = $this->replaceContent($post['f19']);
+        $post['f20'] = $this->replaceContent($post['f20']);
+        $post['f24'] = $this->replaceContent($post['f24']);
+        $post['k6'] = $this->replaceContent($post['k6']);
+
         //处理b2
         $str = [];
         foreach ($post['b2_1'] as $k => $v) {
             if(!empty($v)) {
+                $v_str = $this->replaceContent2($v);
                 $str[] = $v . '_' . $post['b2_2'][$k] . '-' . $post['b2_3'][$k] . '-' . $post['b2_4'][$k];
             }
         }
@@ -166,7 +215,7 @@ class Closure extends Models
         $str7 = [];
         foreach ($post['f21_1'] as $k => $v) {
             if(!empty($v)) {
-                $str7[$v] = $post['f21_2'][$k];
+                $str7[$v] = $this->replaceContent($post['f21_2'][$k]);
             }
         }
 
@@ -174,7 +223,7 @@ class Closure extends Models
         $str8 = [];
         foreach ($post['f25_1'] as $k => $v) {
             if(!empty($v)) {
-                $str8[$v] = $post['f25_2'][$k];
+                $str8[$v] = $this->replaceContent($post['f25_2'][$k]);
             }
         }
 
@@ -304,6 +353,7 @@ class Closure extends Models
             "评论钩子内容" =>  $post['k6']
 
         ];
-        return $json;
+
+        return [$json, $post];
     }
 }

app/common/model/shop/OrderRenew.php

@@ -0,0 +1,15 @@
+<?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-14 16:47:53
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-14 17:19:06
+ * @FilePath: \opkpm\app\common\model\shop\OrderRenew.php
+ * @Description: 续费订单
+ */
+
+namespace app\common\model\shop;
+
+use app\common\basics\Models;
+
+class OrderRenew extends Models {}

app/common/model/shop/ShopHkLog.php

@@ -0,0 +1,15 @@
+<?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-17 15:56:14
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-17 15:56:26
+ * @FilePath: \opkpm\app\common\model\shop\ShopHkLog.php
+ * @Description: 获客记录
+ */
+
+namespace app\common\model\shop;
+
+use app\common\basics\Models;
+
+class ShopHkLog extends Models {}

app/shop/controller/content/Closure.php

@@ -33,8 +33,12 @@ class Closure extends ShopBase
 
             $post = $this->request->post();
             $post['shop_id'] = $this->shop_id;
+            $post['a3'] = $post['a2'] ?? 0;
 
             (new ClosureValidate())->goCheck('add',$post);
+            $post['a3'] = intval($post['a3'] / 10);
+            
+
             $res = ClosureLogic::add($post);
             if ($res === false) {
                 $error = ClosureLogic::getError() ?: '新增失败';
@@ -92,8 +96,10 @@ class Closure extends ShopBase
 
             $post = $this->request->post();
             $post['shop_id'] = $this->shop_id;
+            $post['a3'] = $post['a2'] ?? 0;
 
             (new ClosureValidate())->goCheck('edit',$post);
+            $post['a3'] = intval($post['a3'] / 10);
 
             $res = ClosureLogic::edit($post);
             if ($res === false) {

app/shop/controller/content/EquiCategory.php

@@ -75,9 +75,13 @@ class EquiCategory extends ShopBase
         //获取商家信息
         $end_time = EquiCategoryLogic::getShopInfo($this->shop_id);
 
+        // 获取剩余评论数
+        $shop = EquiCategoryLogic::getShop($this->shop_id);
+        $hksy_count =$shop->hksy_count;
 
         return view('lists',['end_time' => $end_time,
             'edui_info' => $str,
+            'hksy_count' => $hksy_count,
             'server_info' => $res]);
     }
 

app/shop/controller/order/OrderRenew.php

@@ -0,0 +1,108 @@
+<?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-14 17:27:51
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-17 16:24:30
+ * @FilePath: \opkpm\app\shop\controller\order\OrderRenew.php
+ * @Description: 续费订单
+ */
+
+namespace app\shop\controller\order;
+
+use app\common\basics\ShopBase;
+use app\common\server\JsonServer;
+use app\shop\logic\order\OrderRenewLogic;
+use Nette\Utils\Json;
+
+class OrderRenew extends ShopBase
+{
+    public function lists()
+    {
+        if ($this->request->isAjax()) {
+            $get = $this->request->get();
+            $get['shop_id'] = $this->shop_id;
+            return JsonServer::success('', OrderRenewLogic::lists($get));
+        }
+
+        return view('');
+    }
+
+    public function renewLists()
+    {
+        if ($this->request->isAjax()) {
+            $get = $this->request->get();
+            $get['shop_id'] = $this->shop_id;
+            return JsonServer::success('', OrderRenewLogic::renewLists($get));
+        }
+
+        return view('');
+    }
+
+    public function buy()
+    {
+        $get = $this->request->get();
+        $get['shop_id'] = $this->shop_id;
+        $id = $get['id'] ?? 0;
+        $data = OrderRenewLogic::buy($id);
+
+        return view('', ['detail' => $data]);
+    }
+
+    public function add()
+    {
+        if ($this->request->isPost()) {
+            $post = $this->request->post();
+            $post['shop_id'] = $this->shop_id;
+            $data = OrderRenewLogic::add($post);
+            if (!$data) {
+                return JsonServer::error(OrderRenewLogic::getError());
+            }
+
+            return JsonServer::success('', $data);
+        }
+
+        return JsonServer::error('请求方式错误');
+    }
+
+    public function cancel()
+    {
+        if ($this->request->isPost()) {
+            $post = $this->request->post();
+            $post['shop_id'] = $this->shop_id;
+            $data = OrderRenewLogic::cancel($post);
+            if (!$data) {
+                return JsonServer::error(OrderRenewLogic::getError());
+            }
+
+            return JsonServer::success('操作成功');
+        }
+
+        return JsonServer::error('请求方式错误');
+    }
+
+    public function payPage()
+    {
+        $get = $this->request->get();
+        $get['shop_id'] = $this->shop_id;
+        $data = OrderRenewLogic::payPage($get);
+
+        return view('', ['detail' => $data]);
+    }
+
+    public function payWay()
+    {
+        if ($this->request->isPost()) {
+            $post = $this->request->post();
+            $post['shop_id'] = $this->shop_id;
+            $data = OrderRenewLogic::payWay($post);
+            if (!$data) {
+                return JsonServer::error(OrderRenewLogic::getError());
+            }
+
+            return JsonServer::success('', ['page' => $data]);
+        }
+
+        return JsonServer::error('请求方式错误');
+    }
+}

app/shop/controller/order/Pay.php

@@ -0,0 +1,34 @@
+<?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-17 14:27:51
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-17 18:02:17
+ * @FilePath: \opkpm\app\shop\controller\order\Pay.php
+ * @Description: 支付回调
+ */
+
+namespace app\shop\controller\order;
+
+use app\common\basics\ShopBase;
+use app\common\server\JsonServer;
+use app\shop\logic\order\OrderRenewLogic;
+use think\facade\Log;
+
+class Pay extends ShopBase
+{
+    public $like_not_need_login = ['notifyMnp', 'notifyOa', 'notifyApp', 'aliNotify'];
+
+    public function aliNotify()
+    {
+        $post = $this->request->post();
+        Log::info('aliNotify 支付宝回调：' . json_encode($post));
+        $data = OrderRenewLogic::aliNotify($post);
+        if (!$data) {
+            Log::error('aliNotify 支付宝回调错误：' . OrderRenewLogic::getError());
+            return JsonServer::error(OrderRenewLogic::getError());
+        }
+
+        return 'success';
+    }
+}

app/shop/logic/content/ClosureLogic.php

@@ -17,7 +17,7 @@ class ClosureLogic extends Logic
      * @param $get
      * @return array
      */
-    public static function lists($get,$shop_id)
+    public static function lists($get, $shop_id)
     {
         try {
             $where = [
@@ -26,7 +26,7 @@ class ClosureLogic extends Logic
             ];
 
             if (!empty($get['title']) and $get['title'])
-                $where[] = ['title', 'like', '%'.$get['title'].'%'];
+                $where[] = ['title', 'like', '%' . $get['title'] . '%'];
 
             if (!empty($get['cid']) and is_numeric($get['cid']))
                 $where[] = ['cid', '=', $get['cid']];
@@ -42,7 +42,7 @@ class ClosureLogic extends Logic
             $model = new Closure();
             $lists = $model->field(true)
                 ->where($where)
-                ->with(['category','category2'])
+                ->with(['category', 'category2'])
                 //->order('sort', 'asc')
                 ->order([
                     'yid' => 'asc',
@@ -62,9 +62,9 @@ class ClosureLogic extends Logic
                 $item['is_show']   = $item['is_show'] ? '显示' : '隐藏';
             }
 
-            return ['count'=>$lists['total'], 'lists'=>$lists['data']];
+            return ['count' => $lists['total'], 'lists' => $lists['data']];
         } catch (Exception $e) {
-            return ['error'=>$e->getMessage()];
+            return ['error' => $e->getMessage()];
         }
     }
 
@@ -82,6 +82,7 @@ class ClosureLogic extends Logic
         return $data;
     }
 
+
     /**
      * @Notes: 添加文章
      * @Author: 张无忌
@@ -93,7 +94,7 @@ class ClosureLogic extends Logic
         try {
 
             $model = new Closure();
-            $json = $model->postDataHandle($post);
+            $arr = $model->postDataHandle($post);
 
             Closure::create([
                 'shop_id'       => $post['shop_id'],
@@ -108,9 +109,9 @@ class ClosureLogic extends Logic
                 'sort'      => $post['sort'] ?? 0,
                 'is_notice' => $post['is_notice'],
                 'is_show'   => $post['is_show'],
-                'version' => $post['version'],
-                'form_data' => json_encode($post, JSON_UNESCAPED_UNICODE),
-                'json_data' => json_encode($json, JSON_UNESCAPED_UNICODE)
+                'version' => $post['shop_id'] . '-' . time(),
+                'form_data' => json_encode($arr[1], JSON_UNESCAPED_UNICODE),
+                'json_data' => json_encode($arr[0], JSON_UNESCAPED_UNICODE)
             ]);
 
             return true;
@@ -131,12 +132,12 @@ class ClosureLogic extends Logic
         try {
 
             $model = new Closure();
-            $json = $model->postDataHandle($post);
+            $arr = $model->postDataHandle($post);
 
             Closure::update([
                 'shop_id'       => $post['shop_id'],
                 'cid'       => $post['cid'],
-                'yid'       => $post['yid']?? '',
+                'yid'       => $post['yid'] ?? '',
                 'title'     => $post['title'],
                 'image'     => $post['image'] ?? '',
                 'intro'     => $post['intro'] ?? '',
@@ -147,9 +148,9 @@ class ClosureLogic extends Logic
                 'is_notice' => $post['is_notice'],
                 'is_show'   => $post['is_show'],
                 'version' => $post['version'],
-                'form_data' => json_encode($post, JSON_UNESCAPED_UNICODE),
-                'json_data' => json_encode($json, JSON_UNESCAPED_UNICODE)
-            ], ['id'=>$post['id']]);
+                'form_data' => json_encode($arr[1], JSON_UNESCAPED_UNICODE),
+                'json_data' => json_encode($arr[0], JSON_UNESCAPED_UNICODE)
+            ], ['id' => $post['id']]);
 
             return true;
         } catch (\Exception $e) {
@@ -170,7 +171,7 @@ class ClosureLogic extends Logic
             Closure::update([
                 'del'         => 1,
                 'update_time' => time()
-            ], ['id'=>$id]);
+            ], ['id' => $id]);
 
             return true;
         } catch (\Exception $e) {
@@ -194,7 +195,7 @@ class ClosureLogic extends Logic
             Closure::update([
                 'is_show'     => !$article['is_show'],
                 'update_time' => time()
-            ], ['id'=>$id]);
+            ], ['id' => $id]);
 
             return true;
         } catch (\Exception $e) {
@@ -203,5 +204,3 @@ class ClosureLogic extends Logic
         }
     }
 }
-
-

app/shop/logic/content/EquiCategoryLogic.php

@@ -137,7 +137,8 @@ class EquiCategoryLogic
           'create_time'       => time(),
           'update_time'       => time(),
             'code' => $code,
-            'yid' => 0,
+            'yid' => $post['yid'] ?? 21,
+            'type' => $post['type'] ?? 3,
             'ver' => $post['ver']
     ];
 
@@ -505,4 +506,8 @@ class EquiCategoryLogic
         return $str;
     }
 
+    public static function getShop($shop_id) {
+        $shop = shopModel::where(['id' => $shop_id])->find();
+        return $shop;
+    }
 }

app/shop/logic/order/OrderRenewLogic.php

@@ -0,0 +1,335 @@
+<?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-14 17:38:50
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-17 18:43:05
+ * @FilePath: \opkpm\app\shop\logic\order\OrderRenewLogic.php
+ * @Description: 续费订单逻辑处理
+ */
+
+namespace app\shop\logic\order;
+
+use app\common\model\shop\OrderRenew;
+use app\common\model\shop\ShopGoodsRenew;
+
+use app\common\basics\Logic;
+use app\common\enum\OrderEnum;
+use app\common\model\shop\Shop;
+use app\common\model\shop\ShopHkLog;
+use app\common\server\AliPayServer;
+use app\common\server\YansongdaAliPayServer;
+use app\shop\validate\order\OrderRenewValidate;
+use think\facade\Db;
+use think\facade\Log;
+use Yansongda\Pay\Pay;
+
+class OrderRenewLogic extends Logic
+{
+    public static function lists($get)
+    {
+        $page = $get['page'] ?? 1;
+        $limit = $get['limit'] ?? 10;
+
+        $where[] = ['del', '=', 0];
+        $where[] = ['shop_id', '=', $get['shop_id']];
+
+        $count = OrderRenew::where($where)->count();
+        $lists = OrderRenew::where($where)
+            ->page($page, $limit)
+            ->order('id', 'desc')
+            ->select()->toArray();
+        foreach ($lists as $key => $value) {
+            $lists[$key]['type_str'] = $value['renew_type_id'] == 0 ? '包月' : '按量付费';
+            $lists[$key]['order_status_str'] = OrderEnum::getOrderStatus($value['order_status']);
+            $lists[$key]['pay_status_str'] = OrderEnum::getPayStatus($value['pay_status']);
+            $lists[$key]['pay_way_str'] = $value['pay_way'] == 1 ? '微信' : '支付宝';
+            $lists[$key]['pay_time_str'] = $value['pay_time'] ? date('Y-m-d H:i:s', $value['pay_time']) : '';
+        }
+
+        return ['count' => $count, 'lists' => $lists];
+    }
+
+    public static function renewLists($get)
+    {
+        $page = $get['page'] ?? 1;
+        $limit = $get['limit'] ?? 10;
+
+        $where = [
+            ['del', '=', 0],
+            ['status', '=', 1]
+        ];
+
+        if (!empty($get['name']) && $get['name']) {
+            $where[] = ['name', 'like', '%' . $get['name'] . '%'];
+        }
+        // var_dump($get, $where);        
+
+        $count = ShopGoodsRenew::where($where)->count();
+        $lists = ShopGoodsRenew::where($where)
+            ->page($page, $limit)
+            ->order('id', 'desc')
+            ->select()->toArray();
+        foreach ($lists as $key => $value) {
+            $lists[$key]['type_str'] = $value['type_id'] == 0 ? '包月' : '按量付费';
+            $lists[$key]['status_str'] = $value['status'] == 0 ? '禁用' : '启用';
+        }
+
+        return ['count' => $count, 'lists' => $lists];
+    }
+
+    public static function buy($id)
+    {
+        $where = [
+            ['del', '=', 0],
+            ['status', '=', 1],
+            ['id', '=', $id]
+        ];
+        $info = ShopGoodsRenew::where($where)->find();
+        if (!$info) {
+            static::$error = '数据不存在';
+            return false;
+        }
+
+        return $info->toArray();
+    }
+
+    
+    public static function cancel($post)
+    {
+        try {
+            validate(OrderRenewValidate::class)->scene('cancel')->check($post);
+        } catch (\Exception $e) {
+            static::$error = $e->getMessage();
+            return false;
+        }
+
+        $where = [
+            ['del', '=', 0],
+            ['id', '=', $post['id']],
+            ['shop_id', '=', $post['shop_id']],
+        ];
+
+        $info = OrderRenew::where($where)->find();
+        if (!$info) {
+            self::$error = '数据不存在';
+            return false;
+        }
+
+        if ($info->order_status > 0) {
+            self::$error = '订单状态不可取消';
+            return false;
+        }
+
+        $info->order_status = 4;
+        $info->save();
+
+        return true;
+    }
+
+    public static function add($post)
+    {
+        try {
+            validate(OrderRenewValidate::class)->scene('add')->check($post);
+        } catch (\Exception $e) {
+            static::$error = $e->getMessage();
+            return false;
+        }
+
+        $model = new OrderRenew();
+        $name = $model->getName();
+        $post['order_sn'] = createSn($name, 'order_sn');
+        $post['renew_name'] = $post['name'];
+        $post['renew_image'] = $post['image'];
+        $post['renew_desc'] = $post['desc'];
+        $post['renew_type_id'] = $post['type_id'];
+        $post['renew_price'] = $post['price'];
+        $post['renew_op_count'] = $post['op_count'];
+
+        $post['total_amount'] = $post['renew_price'] * $post['renew_num'];
+        $post['total_num'] = $post['renew_num'];
+        $post['order_amount'] = $post['total_amount'];
+
+        $info = $model->create($post);
+
+        return $info->toArray();
+    }
+
+    public static function payPage($get)
+    {
+        $where = [
+            ['del', '=', 0],
+            ['id', '=', $get['id']],
+            ['shop_id', '=', $get['shop_id']],
+        ];
+
+        $info = OrderRenew::where($where)->find();
+        if (!$info) {
+            static::$error = '数据不存在';
+            return false;
+        }
+
+        return $info->toArray();
+    }
+
+    private static function aliPay($info, $time_expire)
+    {
+        // 支付宝PC端支付
+        $domain = request()->domain();
+
+        $return_url = (string) url('shop/order.OrderRenew/lists', [], false, true);
+        $notify_url = (string) url('shop/order.Pay/aliNotify', [], false, true);
+
+        $ali_data = [
+            'out_trade_no'      => $info['order_sn'],
+            'total_amount'      => $info['order_amount'],
+            'subject'           => '订单:' . $info['order_sn'],
+            // 'return_url'        => $domain . '/shop/order.OrderRenew/lists',
+            'return_url'        => $return_url,
+            'time_expire'   => date('Y-m-d H:i:s', $time_expire),
+        ];
+
+        $aliPayConf = YansongdaAliPayServer::config();
+        $aliPayConf['notify_url'] = $notify_url;
+
+        $aliPay = Pay::alipay($aliPayConf);
+
+        // $ali_data['notify_url'] = $domain . '/shop/order.Pay/aliNotify';
+        $ali_data['notify_url'] = $notify_url;
+        return $aliPay->web($ali_data)->getContent();
+    }
+
+    public static function payWay($post)
+    {
+        try {
+            validate(OrderRenewValidate::class)->scene('pay_way')->check($post);
+        } catch (\Exception $e) {
+            static::$error = $e->getMessage();
+            return false;
+        }
+
+        $where = [
+            ['del', '=', 0],
+            ['id', '=', $post['id']],
+            ['shop_id', '=', $post['shop_id']],
+        ];
+
+        $info = OrderRenew::where($where)->find();
+        if (!$info) {
+            static::$error = '数据不存在';
+            return false;
+        }
+
+        if ($info['order_status'] > 0) {
+            static::$error = '订单不处于可支付状态下';
+            return false;
+        }
+
+        $time_expire = time() + 3600 * 2;
+
+        $info->pay_way = $post['pay_way'];
+        $info->time_expire = $time_expire - 600;
+        $info->save();
+
+        if ($post['pay_way'] == 2) {
+            return self::aliPay($info, $time_expire);
+        }
+
+        self::$error = '暂不支持该支付方式';
+        return false;
+    }
+
+    private static function changeHkCount($info, $time)
+    {
+        // 添加用户套餐时间或者数量
+        // 操作数量
+        $op_count = $info['renew_op_count'] * $info['total_num'];
+        $shop = Shop::find($info['shop_id']);
+        // 包月
+        if ($info['renew_type_id'] == 0) {
+            $old_expire_time = $shop['expire_time'];
+            if ($old_expire_time < $time) {
+                $old_expire_time = $time;
+            }
+
+            $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);
+        } 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->left_count = $op_count + $old_hksy_count;
+            $hk->remark = '[' . $info->renew_name . ']，订单号：' . $info->order_sn;
+            $hk->save();
+
+            $shop->hksy_count += $op_count;
+        }
+
+        $shop->save();
+
+        return true;
+    }
+
+    private static function aliPaySucc($order_sn, $result)
+    {
+        $time = time();
+        Db::startTrans();
+
+        try {
+            $where = [
+                ['del', '=', 0],
+                ['order_sn', '=', $order_sn],
+            ];
+
+            $info = OrderRenew::where($where)->find();
+            if (empty($info)) {
+                static::$error = '数据不存在';
+                return false;
+            }
+
+            $info->order_status = 3;
+            $info->pay_status = 1;
+            $info->pay_time = $time;
+            $info->notify_content = $result->toJson();
+            $info->buyer_id = $result->buyer_open_id;
+            $info->trade_no = $result->trade_no;
+            $info->save();
+
+            self::changeHkCount($info, $time);
+
+            Db::commit();
+        } catch (\Exception $e) {
+            Db::rollback();
+            Log::error('aliPaySucc 支付宝回调错误：' . $e->getMessage());
+            static::$error = $e->getMessage();
+            return false;
+        }
+
+        return true;
+    }
+
+    public static function aliNotify($post)
+    {
+        try {
+            $aliPayConf = YansongdaAliPayServer::config();
+            $aliPay = Pay::alipay($aliPayConf);
+            $result = $aliPay->verify($post);
+        } catch (\Exception $e) {
+            static::$error = $e->getMessage();
+            return false;
+        }
+
+        // 支付成功
+        if ($result->trade_status === 'TRADE_SUCCESS') {
+            self::aliPaySucc($result->out_trade_no, $result);
+        }
+
+        return true;
+    }
+}

app/shop/validate/content/ClosureValidate.php

@@ -13,7 +13,7 @@ class ClosureValidate extends Validate
         'id'    => 'require|number',
         'cid'   => 'require|number',
         'title' => 'require',
-        'version' => 'require|checkVersion',
+        // 'version' => 'require|checkVersion',
         'a2' => 'require|number|checkPost',
         'a3' => 'require|number',
     ];
@@ -34,12 +34,12 @@ class ClosureValidate extends Validate
     protected $scene = [
         'id'   => ['id'],
         'add'  => [
-            'cid', 'title','version',
+            'cid', 'title',
             'a2',
             'a3'
         ],
         'edit' => [
-            'id', 'cid', 'title','version',
+            'id', 'cid', 'title',
             'a2',
             'a3'
         ],

app/shop/validate/order/OrderRenewValidate.php

@@ -0,0 +1,54 @@
+<?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-17 10:36:54
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-17 13:42:47
+ * @FilePath: \opkpm\app\shop\validate\order\OrderRenewValidate.php
+ * @Description: 续费订单验证
+ */
+
+namespace app\shop\validate\order;
+
+use app\common\basics\Validate;
+
+use app\common\model\shop\OrderRenew;
+use app\common\model\shop\ShopGoodsRenew;
+
+class OrderRenewValidate extends Validate
+{
+    protected $rule = [
+        'id' => 'require',
+        'shop_id|用户' => 'require|number|gt:0',
+        'renew_id|套餐' => 'require|number|gt:0|checkTypePay',
+        'renew_num|续费数量' => 'require|number|gt:0',
+        'pay_way|支付方式' => 'require|number|in:1,2',
+    ];
+
+    protected $message = [
+        'id.require' => '缺少ID字段',
+    ];
+
+    protected $scene = [
+        'detail' => ['id', 'shop_id'],
+        'add' => ['shop_id', 'renew_id', 'renew_num'],
+        'cancel' => ['id', 'shop_id'],
+        'pay_way' => ['id', 'shop_id', 'pay_way'],
+    ];
+
+    // 查看同类型订单是否有待支付状态
+    protected function checkTypePay($value, $rule, $data)
+    {
+        $renew = ShopGoodsRenew::where('id', $data['renew_id'])->where('status',1)->where("del", 0)->findOrEmpty();
+        if ($renew->isEmpty()) {
+            return '续费套餐不存在';
+        }
+        
+        $order = OrderRenew::where(['shop_id' => $data['shop_id'], 'renew_id' => $data['renew_id'], 'order_status' => 0])->findOrEmpty();
+        if (!$order->isEmpty()) {
+            return '已存在' . $renew['name'] . '待支付的订单';
+        }
+
+        return true;
+    }
+}

app/shop/view/content/closure/edit/01.html

@@ -27,7 +27,7 @@
     </div>
 </div>
 
-<div class="layui-form-item">
+<div class="layui-form-item" style="display: none;">
     <label for="intro" class="layui-form-label">版本号：</label>
     <div class="layui-input-inline">
         <input type="text" name="version" id="version" autocomplete="off" class="layui-input" value="{$detail.version}" />

app/shop/view/content/closure/edit/02.html

@@ -139,10 +139,10 @@
     </div>
 </div>
 
-<div class="layui-form-item">
+<!-- <div class="layui-form-item">
     <label for="intro" class="layui-form-label">操作总数：</label>
     <div class="layui-input-inline">
         <input type="number" name="a3" id="a3" autocomplete="off" class="layui-input" value="{$extend.a3??'180'}">
         <div class="layui-form-mid layui-word-aux">根据运行时长 1800s/60s(一分钟一篇) = 30 x 6(倍) = 180</div>
     </div>
-</div>
+</div> -->

app/shop/view/content/closure/edit/03.html

@@ -16,7 +16,7 @@
             <div class="layui-card">
                 <div class="layui-card-header">列表数据</div>
                 <div class="layui-card-body">
-                    <div class="layui-form-item">
+                    <div class="layui-form-item" style="display: none;">
                         <label class="layui-form-label">数据分类：</label>
                         <div class="layui-input-inline">
                             <input type="radio" name="b1" value="1" title="是" {if $extend.b1==1}checked{/if} >
@@ -82,8 +82,8 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label"></label>
                         <div class="layui-input-block tips">
-                            匹配词不宜过长,用"-"号连接多个词语,例:
-                            职称-评审-申报
+                            匹配词不宜过长，用"-"号连接多个词语，最多3个词语，例:
+                            职称/职称-评审/职称-评审-申报 
                         </div>
                     </div>
 

app/shop/view/content/closure/setting/01.html

@@ -1,3 +1,11 @@
+<!--
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-13 18:17:49
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-20 15:25:27
+ * @FilePath: \opkpm\app\shop\view\content\closure\setting\01.html
+ * @Description: 
+-->
 <div class="layui-form-item">
     <label for="title" class="layui-form-label"><span style="color:red;">*</span>配置标题：</label>
     <div class="layui-input-inline">
@@ -27,12 +35,12 @@
     </div>
 </div>
 
-<div class="layui-form-item">
+<!-- <div class="layui-form-item">
     <label for="intro" class="layui-form-label">版本号：</label>
     <div class="layui-input-inline">
         <input type="text" name="version" id="version" autocomplete="off" class="layui-input" value="1.0.0" />
     </div>
-</div>
+</div> -->
 
 <div class="layui-form-item">
     <label for="intro" class="layui-form-label">配置简介：</label>

app/shop/view/content/closure/setting/02.html

@@ -139,10 +139,10 @@
     </div>
 </div>
 
-<div class="layui-form-item">
+<!-- <div class="layui-form-item">
     <label for="intro" class="layui-form-label">操作总数：</label>
     <div class="layui-input-inline">
         <input type="number" name="a3" id="a3" autocomplete="off" class="layui-input" value="180">
         <div class="layui-form-mid layui-word-aux">根据运行时长 1800s/60s(一分钟一篇) = 30 x 6(倍) = 180</div>
     </div>
-</div>
+</div> -->

app/shop/view/content/closure/setting/03.html

@@ -13,7 +13,7 @@
             <div class="layui-card">
                 <div class="layui-card-header">列表数据</div>
                 <div class="layui-card-body">
-                    <div class="layui-form-item">
+                    <div class="layui-form-item" style="display: none;">
                         <label class="layui-form-label">数据分类：</label>
                         <div class="layui-input-inline">
                             <input type="radio" name="b1" value="1" title="是" checked>
@@ -59,8 +59,8 @@
                     <div class="layui-form-item">
                         <label class="layui-form-label"></label>
                         <div class="layui-input-block tips">
-                            匹配词不宜过长,用"-"号连接多个词语,例:
-                            职称-评审-申报
+                            匹配词不宜过长，用"-"号连接多个词语，最多3个词语，例:
+                            职称/职称-评审/职称-评审-申报 
                         </div>
                     </div>
 

app/shop/view/content/closure/setting/04.html

@@ -15,11 +15,11 @@
         </span>
 
         <span class="ks">
-        评论数:<input type="text" name="c1_1[]" id="" autocomplete="off" class="layui-input w100" value="">
+        评论数:<input type="text" name="c1_1[]" id="" autocomplete="off" class="layui-input w100" value="5-10">
         观看
-        <input type="number" name="c1_2[]" id="" autocomplete="off" class="layui-input w30" value="">
+        <input type="number" name="c1_2[]" id="" autocomplete="off" class="layui-input w30" value="5">
         秒到
-        <input type="number" name="c1_3[]" id="" autocomplete="off" class="layui-input w30" value="">
+        <input type="number" name="c1_3[]" id="" autocomplete="off" class="layui-input w30" value="10">
         秒
             <font class="ks_del">删除</font>
         </span>

app/shop/view/content/closure/setting/05.html

@@ -13,11 +13,11 @@
         </span>
 
         <span class="ks">
-        评论数:<input type="text" name="d1_1[]" id="" autocomplete="off" class="layui-input w100" value="">
+        评论数:<input type="text" name="d1_1[]" id="" autocomplete="off" class="layui-input w100" value="5-10">
         观看
-        <input type="number" name="d1_2[]" id="" autocomplete="off" class="layui-input w30" value="">
+        <input type="number" name="d1_2[]" id="" autocomplete="off" class="layui-input w30" value="5">
         秒到
-        <input type="number" name="d1_3[]" id="" autocomplete="off" class="layui-input w30" value="">
+        <input type="number" name="d1_3[]" id="" autocomplete="off" class="layui-input w30" value="10">
         秒
             <font class="ks_del">删除</font>
         </span>

app/shop/view/content/equi_category/lists.html

@@ -24,7 +24,7 @@
 
               <b>套餐包含:</b> 电脑{$server_info.pc_num}台,每台电脑可添加手机{$server_info.mobile_num}台,可同时运行手机{$server_info.run_num}台.
               <br/>
-              总电脑数量: {$edui_info[0][0]??"0"}台 &nbsp;&nbsp;&nbsp;&nbsp;<b>服务到期时间:</b>  {$end_time}<br/>
+              总电脑数量: {$edui_info[0][0]??"0"}台 &nbsp;&nbsp;&nbsp;&nbsp;<b>服务到期时间:</b>  {$end_time} &nbsp;&nbsp;&nbsp;&nbsp;<b>评论剩余数量:</b>  {$hksy_count}<br/>
               {volist name="edui_info" id="vo"}
               第{$vo[1]}台电脑,总共{$vo[2]}台手机设备,已启用{$vo[3]}台手机设备,未启用{$vo[4]}台手机设备,可同时运行手机{$server_info.run_num}台. <br/>
               {/volist}
@@ -99,7 +99,7 @@
 
 
         {{#  if(d.pid > 0){ }}
-        <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="bd_1">绑定行业</a>
+        <!-- <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="bd_1">绑定行业</a> -->
         <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="bd_2">绑定配置</a>
 
         {{# }else{ }}

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

@@ -0,0 +1,97 @@
+<!--
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-14 18:14:19
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-14 18:32:11
+ * @FilePath: \opkpm\app\shop\view\order\order_renew\buy.html
+ * @Description: 续费套餐购买
+-->
+{layout name="layout2" /}
+
+<div class="layui-card layui-form" style="box-shadow:none;">
+    <div class="layui-card-body">
+        <div class="layui-form-item">
+            <label for="name" class="layui-form-label"><span style="color:red;">*</span>续费套餐：</label>
+            <div class="layui-input-block">
+                <input type="text" name="name" id="name" value="{$detail.name}" lay-verType="tips" lay-verify="required"
+                    autocomplete="off" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label"><span style="color:red;">*</span>套餐图片：</label>
+            <div class="layui-input-block">
+                <div class="like-upload-image">
+                    {if $detail.image}
+                    <div class="upload-image-div">
+                        <img src="{$detail.image}" alt="img">
+                        <input type="hidden" name="image" value="{$detail.image}">
+                        <div class="del-upload-btn">x</div>
+                    </div>
+                    {/if}
+                </div>
+            </div>
+        </div>
+
+
+        <div class="layui-form-item">
+            <label for="name" class="layui-form-label">描述：</label>
+            <div class="layui-input-block">
+                <input type="text" name="desc" id="desc" autocomplete="off" class="layui-input" value="{$detail.desc}" readonly>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label class="layui-form-label">类型</label>
+            <div class="layui-input-block">
+                <select name="type_id" lay-verify="required" readonly>
+                    <option value="0" {neq name="detail.type_id" value="0"}disabled{/neq}>包月</option>
+                    <option value="1" {neq name="detail.type_id" value="1"}disabled{/neq}>按量付费</option>
+                </select>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="price" class="layui-form-label"><span style="color:red;">*</span>价格：</label>
+            <div class="layui-input-block">
+                <input type="number" name="price" id="price" lay-verType="tips" lay-verify="required" autocomplete="off"
+                    class="layui-input" value="{$detail.price}" readonly>
+            </div>
+        </div>
+
+        <div class="layui-form-item">
+            <label for="op_count" class="layui-form-label"><span style="color:red;">*</span>月份数/操作数：</label>
+            <div class="layui-input-block">
+                <input type="number" name="op_count" id="op_count" lay-verType="tips" lay-verify="required"
+                    autocomplete="off" class="layui-input" value="{$detail.op_count}" readonly>
+            </div>
+        </div>
+
+
+        <div class="layui-form-item">
+            <label for="renew_num" class="layui-form-label"><span style="color:red;">*</span>购买数量：</label>
+            <div class="layui-input-block">
+                <input type="number" name="renew_num" id="renew_num" value="1" autocomplete="off"
+                    class="layui-input">
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-hide">
+            <input type="button" lay-submit lay-filter="addSubmit" id="addSubmit" value="确认">
+        </div>
+    </div>
+</div>
+
+<script>
+    layui.use([], function () {
+
+        like.delUpload();
+        $(document).on("click", ".add-upload-image", function () {
+            like.imageUpload({
+                limit: 1,
+                field: "image",
+                that: $(this)
+            });
+        })
+
+    })
+</script>

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

@@ -0,0 +1,120 @@
+{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 layui-form">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label for="renew_name" class="layui-form-label">续费套餐：</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="renew_name" name="renew_name" autocomplete="off" class="layui-input">
+                    </div>
+                </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>
+            <script type="text/html" id="table-image">
+                {{#  if(d.image){ }}
+                    <img src="{{d.image}}" alt="图标" style="width:28px;height:28px;">
+                {{#  } }}
+            </script>
+            <script type="text/html" id="table-operation">
+                {{#  if(d.order_status == 0){ }}
+                    <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="pay">点击支付</a>
+                    <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="cancel">取消订单</a>
+                {{#  } }}
+            </script>
+        </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: "renew_name", width: 260, align: "center", title: "续费套餐" }
+            , { field: "order_sn", width: 200, align: "center", title: "订单编号" }
+            , { field: "renew_price", width: 100, align: "center", title: "套餐总价" }
+            , { field: "total_num", width: 100, align: "center", title: "套餐数量" }
+            , { field: "order_status_str", width: 100, align: "center", title: "订单状态" }
+            , { field: "pay_status_str", width: 100, align: "center", title: "支付状态" }
+            , { field: "pay_way_str", width: 100, align: "center", title: "支付方式" }
+            , { field: "pay_time_str", width: 200, align: "center", title: "支付时间" }
+            , { title: "操作", width: 150, align: "center", fixed: "right", toolbar: "#table-operation" }
+        ]);
+
+
+        var active = {
+            pay: function (obj) {
+                window.open("{:url('order.OrderRenew/payPage')}?id=" + obj.data.id);
+            },
+            cancel: function (obj) {
+                layer.confirm("确定取消该订单吗：" + obj.data.order_sn, function (index) {
+                    like.ajax({
+                        url: "{:url('order.OrderRenew/cancel')}",
+                        data: { id: obj.data.id },
+                        type: "POST",
+                        success: function (res) {
+                            if (res.code === 1) {
+                                layui.layer.msg(res.msg);
+                                layer.close(index);
+                                obj.del();
+                            }
+                        }
+                    });
+                    layer.close(index);
+                })
+            }
+        };
+
+        like.eventClick(active);
+
+
+        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/pay_page.html

@@ -0,0 +1,136 @@
+<!--
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-14 18:14:19
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-20 16:52:12
+ * @FilePath: \opkpm\app\shop\view\order\order_renew\pay_page.html
+ * @Description: 续费套餐支付方式
+-->
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title>支付</title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <link rel="stylesheet" href="__PUBLIC__/static/lib/layui/css/layui.css?v={$front_version}">
+    <link rel="stylesheet" href="__PUBLIC__/static/admin/css/app.css">
+    <link rel="stylesheet" href="__PUBLIC__/static/admin/css/like.css">
+    <script src="__PUBLIC__/static/lib/layui/layui.js?v={$front_version}"></script>
+    <script src="__PUBLIC__/static/admin/js/app.js"></script>
+</head>
+
+<body>
+
+    <div class="layui-row layui-col-space15" data-filtered="filtered" style="margin-top: 100px;">
+        <div class="layui-col-md3" data-filtered="filtered">
+        </div>
+
+        <div class="layui-col-md6" data-filtered="filtered">
+            <div class="layui-panel" data-filtered="filtered">
+                <div class="layui-card layui-form" style="margin: 20px;" id="payPage">
+                    <div class="layui-card-body">
+                        <div class="layui-form-item">
+                            <label for="order_sn" class="layui-form-label"><span
+                                    style="color:red;">*</span>订单编号：</label>
+                            <div class="layui-input-block">
+                                <input type="hidden" name="id" id="id" value="{$detail.id}" />
+                                <input type="text" name="order_sn" id="order_sn" value="{$detail.order_sn}"
+                                    lay-verType="tips" lay-verify="required" autocomplete="off" class="layui-input"
+                                    readonly>
+                            </div>
+                        </div>
+
+                        <div class="layui-form-item">
+                            <label for="renew_name" class="layui-form-label"><span
+                                    style="color:red;">*</span>商品名称：</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="renew_name" id="renew_name" value="{$detail.renew_name}"
+                                    lay-verType="tips" lay-verify="required" autocomplete="off" class="layui-input"
+                                    readonly>
+                            </div>
+                        </div>
+
+                        <div class="layui-form-item">
+                            <label for="total_num" class="layui-form-label"><span
+                                    style="color:red;">*</span>商品数量：</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="total_num" id="total_num" value="{$detail.total_num}"
+                                    lay-verType="tips" lay-verify="required" autocomplete="off" class="layui-input"
+                                    readonly>
+                            </div>
+                        </div>
+
+                        <div class="layui-form-item">
+                            <label for="order_amount" class="layui-form-label"><span
+                                    style="color:red;">*</span>应付金额：</label>
+                            <div class="layui-input-block">
+                                <input type="text" name="order_amount" id="order_amount" value="{$detail.order_amount}"
+                                    lay-verType="tips" lay-verify="required" autocomplete="off" class="layui-input"
+                                    readonly>
+                            </div>
+                        </div>
+
+                        <div class="layui-form-item">
+                            <label class="layui-form-label">支付方式</label>
+                            <div class="layui-input-block">
+                                <input type="radio" name="pay_way" value="1" title="微信支付" disabled>
+                                <input type="radio" name="pay_way" value="2" title="支付宝支付" checked>
+                            </div>
+                        </div>
+
+                        <div class="layui-form-item">
+                            <div class="layui-input-block">
+                                <button type="button" class="layui-btn" lay-event="pay" id="pay">点击支付</button>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="layui-col-md3" data-filtered="filtered">
+        </div>
+    </div>
+
+
+    <script src="__PUBLIC__/static/admin/js/jquery.min.js"></script>
+    <script src="__PUBLIC__/static/admin/js/function.js"></script>
+    <script>
+        layui.use(["table", "form", "jquery"], function () {
+            var table = layui.table;
+            var form = layui.form;
+            var $ = layui.jquery;
+
+            function payPage(id, pay_way) {
+                // 选择支付方式
+                like.ajax({
+                    url: "{:url('order.OrderRenew/payWay')}",
+                    data: { id: id, pay_way: pay_way },
+                    type: "POST",
+                    success: function (res) {
+                        if (res.code === 1) {
+                            $('#payPage').html(res.data.page);
+                        } else {
+                            layer.msg(res.msg);
+                        }
+                    }
+                })
+            }
+
+
+            $("#pay").on("click", function () {
+                var id = $("#id").val();
+                var pay_way = $("input[name='pay_way']:checked").val();
+                payPage(id, pay_way);
+            });
+
+        })
+    </script>
+
+</body>
+
+</html>

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

@@ -0,0 +1,130 @@
+{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 layui-form">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label for="name" class="layui-form-label">续费套餐：</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="name" name="name" autocomplete="off" class="layui-input">
+                    </div>
+                </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>
+            <script type="text/html" id="table-image">
+                {{#  if(d.image){ }}
+                    <img src="{{d.image}}" alt="图标" style="width:28px;height:28px;">
+                {{#  } }}
+            </script>
+            <script type="text/html" id="table-operation">
+                <a class="layui-btn layui-btn-normal layui-btn-sm" lay-event="buy">购买</a>
+            </script>
+        </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: 60, title: "ID" }
+            , { field: "name", width: 260, align: "center", title: "续费套餐" }
+            , { field: "image", width: 120, align: "center", title: "套餐图片", templet: "#table-image" }
+            , { field: "type_str", width: 100, align: "center", title: "类型" }
+            , { field: "desc", width: 100, align: "center", title: "描述" }
+            , { field: "price", width: 100, align: "center", title: "价格" }
+            , { field: "op_count", width: 160, align: "center", title: "月份数/操作数" }
+            , { field: "status_str", width: 100, align: "center", title: "状态" }
+            , { field: "sort", width: 100, align: "center", title: "排序" }
+            , { title: "操作", width: 150, align: "center", fixed: "right", toolbar: "#table-operation" }
+        ]);
+
+
+        var active = {
+            buy: function (obj) {
+                layer.open({
+                    type: 2
+                    , title: "购买续费套餐"
+                    , content: "{:url('order.OrderRenew/buy')}?id=" + obj.data.id
+                    , area: ["800px", "600px"]
+                    , btn: ["确定", "取消"]
+                    , yes: function (index, layero) {
+                        var iframeWindow = window["layui-layer-iframe" + index];
+                        var submit = layero.find("iframe").contents().find("#addSubmit");
+                        iframeWindow.layui.form.on("submit(addSubmit)", function (data) {
+                            data.field['renew_id'] = obj.data.id;
+                            like.ajax({
+                                url: "{:url('order.OrderRenew/add')}",
+                                data: data.field,
+                                type: "POST",
+                                success: function (res) {
+                                    if (res.code === 1) {
+                                        layer.close(index);
+                                        window.open("{:url('order.OrderRenew/payPage')}?id=" + res.data.id);
+                                    } else {
+                                        layer.msg(res.msg);
+                                    }
+                                }
+                            });
+                        });
+                        submit.trigger("click");
+                    }
+                });
+            },
+        };
+
+
+        
+
+        like.eventClick(active);
+
+
+        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>