Merge branch 'develop' of yituan/opkpm into master

app/admin/controller/shop/Store.php

@@ -44,8 +44,13 @@ class Store extends AdminBase
     public function add()
     {
         if ($this->request->isAjax()) {
-            (new StoreLValidate())->goCheck('add');
             $post = $this->request->post();
+            if (empty($post['expire_time'])) {
+                $post['expire_time'] = time();
+            }
+
+            (new StoreLValidate())->goCheck('add', $post);
+
             $lists = StoreLogic::add($post);
             if ($lists === false) {
                 $error = StoreLogic::getError() ?: '新增失败';

app/admin/logic/shop/StoreLogic.php

@@ -9,6 +9,7 @@ use app\common\enum\ShopEnum;
 use app\common\model\shop\Shop;
 use app\common\model\shop\ShopAdmin;
 use app\common\model\shop\ShopGoods;
+use app\common\model\shop\ShopHkLog;
 use app\common\server\UrlServer;
 use Exception;
 use think\facade\Db;
@@ -40,6 +41,9 @@ class StoreLogic extends Logic
             if (isset($get['is_recommend']) && $get['is_recommend'] != '')
                 $where[] = ['is_recommend', '=', $get['is_recommend']];
 
+            if (isset($get['hksy_type']) && $get['hksy_type'] != '')
+                $where[] = ['hksy_type', '=', $get['hksy_type']];
+
             if (isset($get['is_run']) && $get['is_run'] != '')
                 $where[] = ['is_run', '=', $get['is_run']];
 
@@ -152,6 +156,20 @@ class StoreLogic extends Logic
             // 校验配送方式
             self::checkDeliveryType($post);
 
+            $hksy_type = $post['hksy_type'] ?? 1;
+            $hksy_count = $post['hksy_count'] ?? 0;
+            $op_count = $post['months'] ?? 0;
+
+            if ($hksy_type == 1) {
+                $op_count = 12;
+            } else {
+                $hksy_count = 0;
+            }
+
+            $di = \DateInterval::createFromDateString(strval($op_count) . ' months');
+            $dt = date_create_from_format('Y-m-d H:i:s', date('Y-m-d 00:00:00', time()))->add($di);
+            $expire_time = $dt->getTimestamp();
+
             // 创建商家
             $shop = Shop::create([
                 'cid'               => $post['cid'],
@@ -170,14 +188,17 @@ class StoreLogic extends Logic
                 'is_freeze'         => $post['is_freeze'],
                 'is_product_audit'  => $post['is_product_audit'],
                 'is_recommend'      => $post['is_recommend'] ?? 0,
-                'expire_time'       => !empty($post['expire_time']) ? strtotime($post['expire_time']) : 0,
+                // 'expire_time'       => !empty($post['expire_time']) ? strtotime($post['expire_time']) : 0,
+                'expire_time'       => $expire_time,
                 'province_id'    => $post['province_id'] ?? 0,
                 'city_id'        => $post['city_id'] ?? 0,
                 'district_id'    => $post['district_id'] ?? 0,
                 'address'        => $post['address'] ?? '',
                 'longitude'      => $post['longitude'] ?? '',
                 'latitude'       => $post['latitude'] ?? '',
-                'delivery_type'  => $post['delivery_type'] ?? [1]
+                'delivery_type'  => $post['delivery_type'] ?? [1],
+                'hksy_type'      => $hksy_type,
+                'hksy_count'    => $hksy_count,
             ]);
             // 创建账号
             // 新增商家登录账号
@@ -197,6 +218,29 @@ class StoreLogic extends Logic
                 'del' => 0
             ]);
 
+            // 添加用户套餐时间或者数量日志 ZMH 2025-03-24
+            if ($hksy_type >= 0) {
+                // 添加用户套餐时间或者数量
+                $hk = new ShopHkLog();
+                $hk->shop_id = $shop['id'];
+                $hk->source_id = 0;
+                if ($hksy_type == 1) {
+                    $hk->source_type = 100;
+                    $hk->change_count = $hksy_count;
+                    $hk->left_count = $hksy_count;
+                    $hk->remark = '[初始化]，赠送操作数量：' . $hksy_count;
+                } else {
+                    $hk->source_type = 200;
+                    $hk->change_count = $op_count;
+
+                    $hk->before_date = date('Y-m-d H:i:s', time());
+                    $hk->after_date = date('Y-m-d H:i:s', $dt->getTimestamp());
+                    $hk->remark = '[初始化]，赠送月份数量：' . $op_count;
+                }
+
+                $hk->save();
+            }
+
             Db::commit();
             return true;
         } catch (Exception $e) {

app/admin/view/shop/store/add.html

@@ -1,8 +1,20 @@
 {layout name="layout2" /}
 <style>
-    .layui-form-item .layui-form-label { width: 95px; }
-    .layui-form-item .layui-input-inline { width: 240px; }
-    .layui-form-item .map-container{ width: 600px; height: 400px; margin-left: 100px; margin-top: 20px; }
+    .layui-form-item .layui-form-label {
+        width: 95px;
+    }
+
+    .layui-form-item .layui-input-inline {
+        width: 240px;
+    }
+
+    .layui-form-item .map-container {
+        width: 600px;
+        height: 400px;
+        margin-left: 100px;
+        margin-top: 20px;
+    }
+
     .layui-form-select dl {
         z-index: 1001;
     }
@@ -21,23 +33,25 @@
                 <div class="layui-form-item">
                     <label for="name" class="layui-form-label"><span style="color:red;">*</span>商家名称：</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="name" id="name" lay-verType="tips" lay-verify="name"
-                               switch-tab="0" autocomplete="off" class="layui-input">
+                        <input type="text" name="name" id="name" lay-verType="tips" lay-verify="name" switch-tab="0"
+                            autocomplete="off" class="layui-input">
                     </div>
                 </div>
                 <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>商家类型：</label>
                     <div class="layui-input-inline">
-                        <input type="radio" name="type" value="1" title="官方自营" >
+                        <input type="radio" name="type" value="1" title="官方自营">
                         <input type="radio" name="type" value="2" title="入驻商家" checked>
                     </div>
                 </div>
                 <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label"><span style="color:red;">*</span>配送方式：</label>
                     <div class="layui-input-inline">
-                        <input type="checkbox" name="delivery_type[]" value="1" title="快递发货" lay-skin="primary" checked disabled>
-                        <input type="checkbox" name="delivery_type[]" value="2" title="线下自提" lay-skin="primary" >
-                        <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">实物商品的配送方式【快递发货】默认为必选，虚拟商品默认为虚拟发货，不受配送方式限制</div>
+                        <input type="checkbox" name="delivery_type[]" value="1" title="快递发货" lay-skin="primary" checked
+                            disabled>
+                        <input type="checkbox" name="delivery_type[]" value="2" title="线下自提" lay-skin="primary">
+                        <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">
+                            实物商品的配送方式【快递发货】默认为必选，虚拟商品默认为虚拟发货，不受配送方式限制</div>
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -46,7 +60,7 @@
                         <select name="cid" id="cid" lay-verType="tips" lay-verify="cid" switch-tab="0">
                             <option value=""></option>
                             {volist name="category" id="vo"}
-                                <option value="{$vo.id}">{$vo.name}</option>
+                            <option value="{$vo.id}">{$vo.name}</option>
                             {/volist}
                         </select>
                     </div>
@@ -55,14 +69,14 @@
                     <label for="nickname" class="layui-form-label"><span style="color:red;">*</span>联系人：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="nickname" id="nickname" lay-verType="tips" lay-verify="nickname"
-                               switch-tab="0" autocomplete="off" class="layui-input" value="wuwu">
+                            switch-tab="0" autocomplete="off" class="layui-input" value="wuwu">
                     </div>
                 </div>
                 <div class="layui-form-item" style="display: none;">
                     <label for="mobile" class="layui-form-label"><span style="color:red;">*</span>联系手机：</label>
                     <div class="layui-input-inline">
                         <input type="number" name="mobile" id="mobile" lay-verType="tips" lay-verify="mobile"
-                               switch-tab="0" autocomplete="off" class="layui-input" value="13268119865">
+                            switch-tab="0" autocomplete="off" class="layui-input" value="13268119865">
                     </div>
                 </div>
                 <div class="layui-form-item" style="display: none;">
@@ -76,7 +90,7 @@
                     <input type="hidden" name="logo" value="./uploads/images/20250221/202502211625593cc9c0131.png">
                 </div>
 
-                <div class="layui-form-item"  style="display: none;">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label">商家地址：</label>
                     <div class="layui-input-block">
                         <div class="layui-input-inline" style="width:120px;">
@@ -96,10 +110,10 @@
                         </div>
                     </div>
                 </div>
-                <div class="layui-form-item"  style="display: none;">
+                <div class="layui-form-item" style="display: none;">
                     <label class="layui-form-label">地图定位：</label>
                     <div class="layui-input-block">
-                        <div class="layui-inline" >
+                        <div class="layui-inline">
                             <div class="layui-input-inline" style="width:120px;margin-right:5px;">
                                 <input type="text" name="longitude" autocomplete="off" class="layui-input">
                             </div>
@@ -119,7 +133,7 @@
                         <div id="map-container" style="width: 700px;height: 400px;margin-left: 115px;"></div>
                     </div>
                 </div>
-                <div class="layui-form-item"  style="display: none;">
+                <div class="layui-form-item" style="display: none;">
                     <label for="keywords" class="layui-form-label">商家关键字：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="keywords" id="keywords" autocomplete="off" class="layui-input">
@@ -134,21 +148,48 @@
             </div>
             <!-- 2、经营设置 -->
             <div class="layui-tab-item">
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="expire_time" class="layui-form-label"><span style="color:red;">*</span>到期时间：</label>
                     <div class="layui-input-inline">
-                        <input type="text" name="expire_time" id="expire_time" lay-verType="tips" lay-verify="expire_time"
-                               switch-tab="1" autocomplete="off" class="layui-input">
+                        <input type="text" name="expire_time" id="expire_time" lay-verType="tips"
+                            lay-verify="expire_time" switch-tab="1" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label"><span style="color:red;">*</span>获客类型：</label>
+                    <div class="layui-input-inline">
+                        <input type="radio" name="hksy_type" value="0" title="包月" lay-filter="hksy_type">
+                        <input type="radio" name="hksy_type" value="1" title="按量付费" lay-filter="hksy_type" checked>
                     </div>
                 </div>
+
+                <div class="layui-form-item hksy_type_item">
+                    <label for="hksy_count" class="layui-form-label"><span style="color:red;">*</span>赠送评论数：</label>
+                    <div class="layui-input-inline">
+                        <input type="number" name="hksy_count" id="hksy_count" value="1000" lay-verType="tips"
+                            lay-verify="hksy_count" switch-tab="1" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+
+                <div class="layui-form-item hksy_type_item2" style="display: none;">
+                    <label for="months" class="layui-form-label"><span style="color:red;">*</span>赠送月份数：</label>
+                    <div class="layui-input-inline">
+                        <input type="number" name="months" id="months" value="12" lay-verType="tips"
+                            lay-verify="months" switch-tab="1" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
+
                 <div class="layui-form-item" style="display: none;">
-                    <label for="trade_service_fee" class="layui-form-label"><span style="color:red;">*</span>交易服务费：</label>
+                    <label for="trade_service_fee" class="layui-form-label"><span
+                            style="color:red;">*</span>交易服务费：</label>
                     <div class="layui-input-inline">
                         <input type="number" min="0" max="100" name="trade_service_fee" id="trade_service_fee"
-                               lay-verType="tips" lay-verify="trade_service_fee"
-                               onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')"
-                               switch-tab="1" autocomplete="off" class="layui-input" value="0">
-                        <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">平台每笔交易收取的服务费用。请填写百分比，填0表示不收取服务费</div>
+                            lay-verType="tips" lay-verify="trade_service_fee"
+                            onkeyup="value=value.replace(/^\D*(\d*(?:\.\d{0,2})?).*$/g, '$1')" switch-tab="1"
+                            autocomplete="off" class="layui-input" value="0">
+                        <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">
+                            平台每笔交易收取的服务费用。请填写百分比，填0表示不收取服务费</div>
                     </div>
                     <div class="layui-form-mid layui-word-aux">%</div>
                 </div>
@@ -183,7 +224,7 @@
                     <label for="account" class="layui-form-label"><span style="color:red;">*</span>商家账号：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="account" id="account" lay-verType="tips" lay-verify="account"
-                               switch-tab="2" autocomplete="off" class="layui-input">
+                            switch-tab="2" autocomplete="off" class="layui-input">
                         <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">商家账号和密码用于登录商家后台</div>
                     </div>
                 </div>
@@ -191,7 +232,7 @@
                     <label for="password" class="layui-form-label"><span style="color:red;">*</span>登录密码：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="password" id="password" lay-verType="tips" lay-verify="password"
-                               switch-tab="2" autocomplete="off" class="layui-input">
+                            switch-tab="2" autocomplete="off" class="layui-input">
                         <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">商家账号和密码用于登录商家后台</div>
                     </div>
                 </div>
@@ -199,7 +240,7 @@
                     <label for="okPassword" class="layui-form-label"><span style="color:red;">*</span>确认密码：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="okPassword" id="okPassword" lay-verType="tips" lay-verify="pwd"
-                               switch-tab="2" autocomplete="off" class="layui-input">
+                            switch-tab="2" autocomplete="off" class="layui-input">
                         <div class="layui-form-mid layui-word-aux" style="white-space:nowrap;">商家账号和密码用于登录商家后台</div>
                     </div>
                 </div>
@@ -222,8 +263,8 @@
     }).extend({
         likeArea: "likeArea/likeArea",
         txMap: "likeMap/txMap",
-        customTxMap:'likeMap/customTxMap',
-    }).use(["form", "laydate", "likeArea", "txMap",'customTxMap'], function(){
+        customTxMap: 'likeMap/customTxMap',
+    }).use(["form", "laydate", "likeArea", "txMap", 'customTxMap'], function () {
         var $ = layui.$;
         var form = layui.form;
         var likeArea = layui.likeArea;
@@ -231,7 +272,7 @@
         var txMap = layui.txMap;
         var customTxMap = layui.customTxMap;
 
-        laydate.render({type:"datetime", elem:"#expire_time", trigger:"click",min:0});
+        laydate.render({ type: "datetime", elem: "#expire_time", trigger: "click", min: 0 });
 
 
         like.delUpload();
@@ -243,6 +284,18 @@
             });
         });
 
+        form.on('radio(hksy_type)', function (data) {
+            // console.log(data.elem); //得到radio原始DOM对象
+            // console.log(data.value); //被点击的radio的value值
+            if (data.value == 1) {
+                $(".hksy_type_item").show();
+                $(".hksy_type_item2").hide();
+            } else {
+                $(".hksy_type_item").hide();
+                $(".hksy_type_item2").show();
+            }
+        });
+
 
         form.verify({
             name: function (value, item) {
@@ -277,12 +330,12 @@
                     }*/
                 }
             },
-            expire_time: function (value, item) {
-                if (!value) {
-                    switchTab($(item).attr("switch-tab"));
-                    return "请选择到期时间";
-                }
-            },
+            // expire_time: function (value, item) {
+            //     if (!value) {
+            //         switchTab($(item).attr("switch-tab"));
+            //         return "请选择到期时间";
+            //     }
+            // },
             trade_service_fee: function (value, item) {
                 if (!value && parseInt(value) !== 0) {
                     switchTab($(item).attr("switch-tab"));
@@ -336,15 +389,15 @@
             var city = $("#city");
             var district = $("#district");
             var address = $("input[name='address']").val();
-            if(!province.val()){
+            if (!province.val()) {
                 layer.msg("请选择省份");
                 return;
             }
-            if(!city.val()){
+            if (!city.val()) {
                 layer.msg("请选择市");
                 return;
             }
-            if(!district.val()){
+            if (!district.val()) {
                 layer.msg("请选择镇/区");
                 return;
             }

app/admin/view/shop/store/edit.html

@@ -143,7 +143,7 @@
             </div>
             <!-- 2、经营设置 -->
             <div class="layui-tab-item">
-                <div class="layui-form-item">
+                <div class="layui-form-item" style="display: none;">
                     <label for="expire_time" class="layui-form-label"><span style="color:red;">*</span>到期时间：</label>
                     <div class="layui-input-inline">
                         <input type="text" name="expire_time" id="expire_time" value="{$detail.expire_time}"

app/admin/view/shop/store/lists.html

@@ -82,6 +82,16 @@
                         </select>
                     </div>
                 </div>
+                <div class="layui-inline">
+                    <label for="hksy_type" class="layui-form-label">商家套餐：</label>
+                    <div class="layui-input-inline">
+                        <select name="hksy_type" id="hksy_type">
+                            <option value="">全部</option>
+                            <option value="0">包月</option>
+                            <option value="1">按量付费</option>
+                        </select>
+                    </div>
+                </div>
                 <div class="layui-inline">
                     <label for="is_freeze" class="layui-form-label">到期状态：</label>
                     <div class="layui-input-inline">
@@ -135,6 +145,16 @@
                 <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="set">设置</a>
                 <a class="layui-btn layui-btn-danger layui-btn-sm" lay-event="account">账号管理</a>
             </script>
+
+            <script type="text/html" id="table-store">
+                <p>账号：{{ d.account }}</p>
+                {{# if(d.hksy_type == 0){ }}
+                    <p>类型：<font style="color: red;">包月</font></p>
+                {{# } }}
+                {{# if(d.hksy_type == 1){ }}
+                    <p>类型：<font style="color: blue;">按量付费</font></p>
+                {{# } }}
+            </script>
         </div>
 
     </div>
@@ -164,14 +184,14 @@
             {type: 'checkbox'}
             ,{field:"id", width:60, title:"ID"}
             ,{field:"storeInfo", width:250, title:"商家信息", templet:"#table-storeInfo"}
-            ,{field:"account", width:100, align:"center",title:"商家账号"}
+            ,{field:"account", width:100, align:"center",title:"商家账号", templet:"#table-store"}
             ,{field:"category", width:100, align:"center", title:"主营类目"}
             ,{field:"is_run", width:90, align:"center", title:"营业状态"}
             ,{field:"is_freeze", width:90, align:"center", title:"商家状态"}
             //,{field:"is_recommend", width:90, align:"center", title:"推荐商家"}
+            ,{field:"expire_desc", width:160, align:"center", title:"到期状态"}
             ,{field:"hksy_count", width:90, align:"center", title:"评论次数"}
             ,{field:"create_time", width:160, align:"center", title:"开通日期"}
-            ,{field:"expire_desc", width:160, align:"center", title:"到期状态"}
             ,{field:"expire_time", width:160, align:"center", title:"到期时间"}
             ,{title:"操作", width:250, align:"center", fixed:"right", toolbar:"#table-operation"}
         ]);

app/api/logic/ShopContentLogic.php

@@ -96,15 +96,18 @@ class ShopContentLogic extends Logic
             //dump($expire_time);
             //echo $expire_time;die;
 
+            /***
+             * 原先这是 先判断是否到期 未到期 不扣次数  已到期 判断剩余数量
+             *
             if($expire_time < time()){
                 //判断到期时间
                 $data = [
                    'status' => 107,
                    'msg' => "商户服务当前套餐到期,到期时间".date('Y-m-d H:i:s',$expire_time)."!"
                 ];
-                //判断剩余数量  hksy_count  当商家已到期
+                //当商家已到期
                 if((int)$shop['hksy_count'] < 10){
-                    //判断到期时间
+                    //判断剩余数量  hksy_count
                     $data = [
                         'status' => 113,
                         'msg' => "商户服务可评论次数不足,剩余".$shop['hksy_count']."条,请充值后再使用 或 开通商户包年包月服务!"
@@ -117,6 +120,34 @@ class ShopContentLogic extends Logic
                 $is_gi = 0;
             }
             //未到期 不需要扣次数 继续执行即可
+             * */
+
+            //判断类型
+            if((int)$shop['hksy_type'] === 0){
+                //包月
+                if($expire_time < time()){
+                    //判断到期时间
+                    $data = [
+                        'status' => 107,
+                        'msg' => "商户服务当前套餐到期,到期时间".date('Y-m-d H:i:s',$expire_time)."!"
+                    ];
+                    return $data;
+                }
+                //包月 未过期  = 前端会按包月模式 运行
+                $is_gi = 0;
+            }else{
+                //按量
+                if((int)$shop['hksy_count'] < 5){
+                    //判断剩余数量  hksy_count
+                    $data = [
+                        'status' => 113,
+                        'msg' => "商户服务可评论次数不足,剩余".$shop['hksy_count']."条,请充值次数后再使用!"
+                    ];
+                    return $data;
+                }
+                //按量 统一按过期处理 = 前端会按按量模式 运行
+                $is_gi = 1;
+            }
         }
 
         if(empty($item))
@@ -881,6 +912,7 @@ class ShopContentLogic extends Logic
             return false;
         }
 
+        /*
         // 判断是否过期
         $expire_time = $shop->expire_time;
         //echo $expire_time;die;
@@ -888,6 +920,13 @@ class ShopContentLogic extends Logic
         if (time() < $expire_time) {
             //未过期 不进行扣除
            return true;
+        }*/
+
+        //判断类型
+        if((int)$shop->hksy_type === 0){
+            self::$errCode = 10;
+            self::$error = "商家类型是包月,不允许使用次数!";
+            return false;
         }
 
         if ($shop->hksy_count < $count) {

app/shop/controller/content/EquiCategory.php

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

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-22 18:10:24
+ * @LastEditTime: 2025-03-24 20:54:33
  * @FilePath: \opkpm\app\shop\controller\order\OrderRenew.php
  * @Description: 续费订单
  */
@@ -38,6 +38,7 @@ class OrderRenew extends ShopBase
         if ($this->request->isAjax()) {
             $get = $this->request->get();
             $get['shop_id'] = $this->shop_id;
+            $get['type_id'] = $this->shop['hksy_type'];
             return JsonServer::success('', OrderRenewLogic::renewLists($get));
         }
 

app/shop/logic/LoginLogic.php

@@ -1,4 +1,12 @@
 <?php
+/*
+ * @Author: xiaohai zmhwork@qq.com
+ * @Date: 2025-03-13 18:17:49
+ * @LastEditors: xiaohai zmhwork@qq.com
+ * @LastEditTime: 2025-03-24 21:19:27
+ * @FilePath: \opkpm\app\shop\logic\LoginLogic.php
+ * @Description: 
+ */
 // +----------------------------------------------------------------------
 // | likeshop开源商城系统
 // +----------------------------------------------------------------------
@@ -45,7 +53,7 @@ class LoginLogic extends Logic
         $adminModel = new ShopAdmin();
         $admin_info = $adminModel->alias('a')
             ->join('shop s', 's.id = a.shop_id')
-            ->field(['a.id', 'a.account', 'a.name', 'role_id', 'shop_id', 's.name' => 'shop_name'])
+            ->field(['a.id', 'a.account', 'a.name', 'role_id', 'shop_id', 's.name' => 'shop_name', 's.hksy_type'])
             ->where(['a.account' => $post['account'], 'a.del' => 0])
             ->findOrEmpty()->toArray();
 

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-23 21:29:28
+ * @LastEditTime: 2025-03-24 21:14:25
  * @FilePath: \opkpm\app\shop\logic\order\OrderRenewLogic.php
  * @Description: 续费订单逻辑处理
  */
@@ -57,7 +57,7 @@ class OrderRenewLogic extends Logic
 
         $where = [
             ['del', '=', 0],
-            //['status', '=', 1]
+            ['type_id', '=', $get['type_id']]
         ];
 
         if (!empty($get['name']) && $get['name']) {

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

@@ -12,16 +12,6 @@
   }
 </style>
 
-<!-- 操作提示 -->
-<div class="layui-fluid">
-  <div class="layui-card" style="margin-top: 15px;">
-    <div class="layui-card-body">
-      <div class="layui-collapse like-layui-collapse" lay-accordion="" style="border:1px dashed #c4c4c4">
-        <div class="layui-colla-item">
-          <h2 class="layui-colla-title like-layui-colla-title" style="background-color: #fff">商户套餐:</h2>
-          <div class="layui-colla-content layui-show">
-            <p>
-
 {php}
 $date1 = time();
 $date2 = strtotime($end_time);
@@ -29,18 +19,42 @@ $date2 = strtotime($end_time);
 $days = abs($date2 - $date1) / (60 * 60 * 24);
 $days = intval($days); //取整
 if($date1 > $date2){
-    $days_desc = "已过期".$days."天";
+$days_desc = "已过期".$days."天";
 }else if($days == 0){
-    $days_desc = "今天已到期";
+$days_desc = "今天已到期";
 }else{
-    $days_desc = "剩余".$days."天";
+$days_desc = "剩余".$days."天";
 }
 //echo "相差天数：".intval($days); // 输出相差天数，使用intval确保得到整数结果
 {/php}
 
-                <b>套餐包含：</b> 电脑 <b style="color:#000;">{$server_info.pc_num}</b> 台，每台电脑可添加手机 <b style="color:#000;">{$server_info.mobile_num}</b> 台，可同时运行手机 <b style="color:#000;">{$server_info.run_num}</b> 台。
-              <br/>
-              总电脑数量：<b style="color:#000;">{$edui_info[0][0]??"0"}</b> 台 &nbsp;&nbsp;&nbsp;&nbsp;<b style="color:red;">服务到期时间:</b>  <span style="color:red;">{$end_time} （{$days_desc}）</span> &nbsp;&nbsp;&nbsp;&nbsp;<b style="color:red;">评论次数剩余数量:</b>  <span style="color:red;">{$hksy_count}</span> <br/>
+<!-- 操作提示 -->
+<div class="layui-fluid">
+  <div class="layui-card" style="margin-top: 15px;">
+    <div class="layui-card-body">
+      <div class="layui-collapse like-layui-collapse" lay-accordion="" style="border:1px dashed #c4c4c4">
+        <div class="layui-colla-item">
+          <h2 class="layui-colla-title like-layui-colla-title" style="background-color: #fff">
+              商户套餐：
+              {eq name="hksy_type" value="1"}
+              <b style="color:red;">评论次数剩余数量：</b>  <span style="color:red;">{$hksy_count}</span>
+              {/eq}
+
+              {eq name="hksy_type" value="0"}
+              <b style="color:red;">服务到期时间：</b>  <span style="color:red;">{$end_time} （{$days_desc}）</span>
+              {/eq}
+          </h2>
+          <div class="layui-colla-content layui-show">
+            <p>
+
+                <b>商户类型：</b>{eq name="hksy_type" value="1"}按量付费{/eq} {eq name="hksy_type" value="0"}包月{/eq}
+                <b style="margin-left:20px;">套餐包含：</b> 电脑 <b style="color:#000;">{$server_info.pc_num}</b> 台，每台电脑可添加手机 <b style="color:#000;">{$server_info.mobile_num}</b> 台，可同时运行手机 <b style="color:#000;">{$server_info.run_num}</b> 台。
+              <hr/>
+
+              <b>总电脑数量：</b><b style="color:#000;">{$edui_info[0][0]??"0"}</b> 台 &nbsp;&nbsp;&nbsp;&nbsp;
+
+              <br>
+
               {volist name="edui_info" id="vo"}
                 第 <b style="color:#000;">{$vo[1]}</b> 台电脑，总共 <b style="color:#000;">{$vo[2]}</b> 台手机设备，已启用 <b style="color:#000;">{$vo[3]}</b> 台手机设备，未启用 <b style="color:#000;">{$vo[4]}</b> 台手机设备，可同时运行手机 <b style="color:#000;">{$server_info.run_num}</b> 台。 <br/>
               {/volist}