Home Explore Help
Register Sign In
limeng
/
qmjszx
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

1

Memory_LG 1 month ago
parent
052f657e2d
commit
7d136025f9
9 changed files with 112 additions and 103 deletions
Unified View Show Diff Stats
  1. 8 8
      qmjszx-admin/src/main/java/beilv/web/controller/carinformation/cardAppController.java
  2. 1 1
      qmjszx-admin/src/main/java/beilv/web/controller/vipCard/VipCardController.java
  3. 77 77
      qmjszx-admin/src/main/resources/templates/card/card.html
  4. 20 12
      qmjszx-admin/src/main/resources/templates/system/vipCardLog/vipCardLog.html
  5. 1 1
      qmjszx-admin/src/main/resources/templates/vipCard/add.html
  6. 1 1
      qmjszx-admin/src/main/resources/templates/vipCard/card.html
  7. 1 1
      qmjszx-admin/src/main/resources/templates/vipCard/edit.html
  8. 1 1
      qmjszx-business/src/main/resources/mapper/vipCard/VipCardMapper.xml
  9. 2 1
      qmjszx-business/src/main/resources/mapper/vipCardLog/VipCardLogMapper.xml

+ 8 - 8
qmjszx-admin/src/main/java/beilv/web/controller/carinformation/cardAppController.java
View File 

@@ -283,14 +283,14 @@ public class cardAppController extends BaseController {
 
 
 
 //
 
 //
 
 //
 
 //
 
-//    /**
 
-//     * 查询卡种信息列表
 
-//     */
 
-//    @PostMapping("/cardInformationlist")
 
-//    @ResponseBody
 
-//    public AjaxResult cardInformationlist(@RequestBody CarInformation carInformation) {
 
-//        return AjaxResult.success(carInformationService.selectCarInformationList(carInformation));
 
-//    }
 
+    /**
 
+     * 查询卡种信息列表
 
+     */
 
+    @PostMapping("/cardInformationlist")
 
+    @ResponseBody
 
+    public AjaxResult cardInformationlist(@RequestBody CarInformation carInformation) {
 
+        return AjaxResult.success(carInformationService.selectCarInformationList(carInformation));
 
+    }
 
 //
 
 //
 
 //    /**
 
 //    /**
 
 //     * 查询购卡记录列表
 
 //     * 查询购卡记录列表

+ 1 - 1
qmjszx-admin/src/main/java/beilv/web/controller/vipCard/VipCardController.java
View File 

@@ -23,7 +23,7 @@ import java.util.List;
 
  * @date 2025-11-12
 
  * @date 2025-11-12
 
  */
 
  */
 
 @Controller
 
 @Controller
 
-@RequestMapping("/vipCard/card")
 
+@RequestMapping("/vipCard")
 
 public class VipCardController extends BaseController {
 
 public class VipCardController extends BaseController {
 
     private String prefix = "vipCard";
 
     private String prefix = "vipCard";

+ 77 - 77
qmjszx-admin/src/main/resources/templates/card/card.html
View File 

@@ -1,71 +1,73 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head>
 
 <head>
 
-    <th:block th:include="include :: header('用户会员卡列表')" />
 
+    <th:block th:include="include :: header('用户会员卡列表')"/>
 
 </head>
 
 </head>
 
 <body class="gray-bg">
 
 <body class="gray-bg">
 
-     <div class="container-div">
 
-        <div class="row">
 
-            <div class="col-sm-12 search-collapse">
 
-                <form id="formId">
 
-                    <div class="select-list">
 
-                        <ul>
 
-                            <li>
 
-                                <label>姓名：</label>
 
-                                <input type="text" name="realName"/>
 
-                            </li>
 
-                            <li>
 
-                                <label>手机号码：</label>
 
-                                <input type="text" name="mobile"/>
 
-                            </li>
 
-                            <li>
 
-                                <label>卡种名称：</label>
 
-                                <input type="text" name="cardName"/>
 
-                            </li>
 
-                            <li>
 
-                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 
-                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 
-                            </li>
 
-                        </ul>
 
-                    </div>
 
-                </form>
 
-            </div>
 
+<div class="container-div">
 
+    <div class="row">
 
+        <div class="col-sm-12 search-collapse">
 
+            <form id="formId">
 
+                <div class="select-list">
 
+                    <ul>
 
+                        <li>
 
+                            <label>姓名：</label>
 
+                            <input type="text" name="realName"/>
 
+                        </li>
 
+                        <li>
 
+                            <label>手机号码：</label>
 
+                            <input type="text" name="mobile"/>
 
+                        </li>
 
+                        <li>
 
+                            <label>卡种名称：</label>
 
+                            <input type="text" name="cardName"/>
 
+                        </li>
 
+                        <li>
 
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
 
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
 
+                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i
 
+                                    class="fa fa-refresh"></i>&nbsp;重置</a>
 
+                        </li>
 
+                    </ul>
 
+                </div>
 
+            </form>
 
+        </div>
 
 
 
-            <div class="btn-group-sm" id="toolbar" role="group">
 
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:card:add">-->
 
-<!--                    <i class="fa fa-plus"></i> 添加-->
 
-<!--                </a>-->
 
-<!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:card:edit">-->
 
-<!--                    <i class="fa fa-edit"></i> 修改-->
 
-<!--                </a>-->
 
-<!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:card:remove">-->
 
-<!--                    <i class="fa fa-remove"></i> 删除-->
 
-<!--                </a>-->
 
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:card:export">
 
-                    <i class="fa fa-download"></i> 导出
 
-                </a>
 
-            </div>
 
-            <div class="col-sm-12 select-table table-striped">
 
-                <table id="bootstrap-table"></table>
 
-            </div>
 
+        <div class="btn-group-sm" id="toolbar" role="group">
 
+            <!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:card:add">-->
 
+            <!--                    <i class="fa fa-plus"></i> 添加-->
 
+            <!--                </a>-->
 
+            <!--                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:card:edit">-->
 
+            <!--                    <i class="fa fa-edit"></i> 修改-->
 
+            <!--                </a>-->
 
+            <!--                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:card:remove">-->
 
+            <!--                    <i class="fa fa-remove"></i> 删除-->
 
+            <!--                </a>-->
 
+            <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:card:export">
 
+                <i class="fa fa-download"></i> 导出
 
+            </a>
 
+        </div>
 
+        <div class="col-sm-12 select-table table-striped">
 
+            <table id="bootstrap-table"></table>
 
         </div>
 
         </div>
 
     </div>
 
     </div>
 
-    <th:block th:include="include :: footer" />
 
-    <script th:inline="javascript">
 
-        var editFlag = [[${@permission.hasPermi('system:card:edit')}]];
 
-        var refundCard = [[${@permission.hasPermi('system:record:add')}]];
 
-        var cardType = [[${@dict.getType('card_status')}]];
 
-        var prefix = ctx + "card";
 
+</div>
 
+<th:block th:include="include :: footer"/>
 
+<script th:inline="javascript">
 
+    var editFlag = [[${@permission.hasPermi('system:card:edit')}]];
 
+    var refundCard = [[${@permission.hasPermi('system:record:add')}]];
 
+    var cardType = [[${@dict.getType('card_status')}]];
 
+    var prefix = ctx + "card";
 
 
 
-        $(function() {
 
-            var options = {
 
-                url: prefix + "/list",
 
-                createUrl: prefix + "/add",
 
-                exportUrl: prefix + "/export",
 
-                modalName: "用户会员卡",
 
-                columns: [{
 
-                    checkbox: true
 
-                },
 
+    $(function () {
 
+        var options = {
 
+            url: prefix + "/list",
 
+            createUrl: prefix + "/add",
 
+            exportUrl: prefix + "/export",
 
+            modalName: "用户会员卡",
 
+            columns: [{
 
+                checkbox: true
 
+            },
 
                 {
 
                 {
 
                     field: 'id',
 
                     field: 'id',
 
                     title: '主键',
 
                     title: '主键',
 
@@ -110,32 +112,30 @@
 
                 {
 
                 {
 
                     title: '操作',
 
                     title: '操作',
 
                     align: 'center',
 
                     align: 'center',
 
-                    formatter: function(value, row, index) {
 
+                    formatter: function (value, row, index) {
 
                         var actions = [];
 
                         var actions = [];
 
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="stream(\'' + row.id + '\')"><i class="fa fa-edit"></i>约球记录</a> ');
 
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="stream(\'' + row.id + '\')"><i class="fa fa-edit"></i>约球记录</a> ');
 
-                        if (row.state==='3'){
 
+                        if (row.state === '3') {
 
                             actions.push('<a class="btn btn-danger btn-xs ' + refundCard + '" href="javascript:void(0)" onclick="refundCard1(\'' + row.id + '\', \'' + row.recordId + '\', \'' + row.remainingNumber + '\')"><i class="fa fa-remove"></i>退卡</a>');
 
                             actions.push('<a class="btn btn-danger btn-xs ' + refundCard + '" href="javascript:void(0)" onclick="refundCard1(\'' + row.id + '\', \'' + row.recordId + '\', \'' + row.remainingNumber + '\')"><i class="fa fa-remove"></i>退卡</a>');
 
                         }
 
                         }
 
                         return actions.join('');
 
                         return actions.join('');
 
                     }
 
                     }
 
                 }]
 
                 }]
 
-            };
 
-            $.table.init(options);
 
-        });
 
+        };
 
+        $.table.init(options);
 
+    });
 
 
 
-        function stream(id) {
 
-            table.set();
 
-            $.modal.open("查看流水", prefix + "/toStream/" + id);
 
-        }
 
+    function stream(id) {
 
+        table.set();
 
+        $.modal.open("查看流水", prefix + "/toStream/" + id);
 
+    }
 
 
 
-        function refundCard1(id,recordId,remainingNumber) {
 
-            console.log(id)
 
-            console.log(recordId)
 
-            $.modal.confirm("确认要退选中的会员卡吗?", function() {
 
-                var data = { "id":id, "recordId": recordId, "remainingNumber":remainingNumber };
 
-                $.operate.submit(prefix + "/refundCard", "post", "json", data);
 
-            });
 
-        }
 
-    </script>
 
+    function refundCard1(id, recordId, remainingNumber) {
 
+        $.modal.confirm("确认要退选中的会员卡吗?", function () {
 
+            var data = {"id": id, "recordId": recordId, "remainingNumber": remainingNumber};
 
+            $.operate.submit(prefix + "/refundCard", "post", "json", data);
 
+        });
 
+    }
 
+</script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 20 - 12
qmjszx-admin/src/main/resources/templates/system/vipCardLog/vipCardLog.html
View File 

@@ -55,6 +55,8 @@
 
     var editFlag = [[${@permission.hasPermi('system:vipCardLog:edit')}]];
 
     var editFlag = [[${@permission.hasPermi('system:vipCardLog:edit')}]];
 
     var removeFlag = [[${@permission.hasPermi('system:vipCardLog:remove')}]];
 
     var removeFlag = [[${@permission.hasPermi('system:vipCardLog:remove')}]];
 
     var paymentStatusDatas = [[${@dict.getType('payment_status')}]];
 
     var paymentStatusDatas = [[${@dict.getType('payment_status')}]];
 
+    var paymentTypeDatas = [[${@dict.getType('payment_type')}]];
 
+    var orderTypeDatas = [[${@dict.getType('order_type')}]];
 
     var prefix = ctx + "system/vipCardLog";
 
     var prefix = ctx + "system/vipCardLog";
 
 
 
     $(function () {
 
     $(function () {
 
@@ -68,11 +70,10 @@
 
             columns: [{
 
             columns: [{
 
                 checkbox: true
 
                 checkbox: true
 
             },
 
             },
 
-                /*{
 
+                {
 
                     field: 'id',
 
                     field: 'id',
 
-                    title: '序号',
 
-                    visible: false
 
-                },*/
 
+                    title: '订单编号'
 
+                },
 
                 {
 
                 {
 
                     field: 'username',
 
                     field: 'username',
 
                     title: '用户姓名'
 
                     title: '用户姓名'
 
@@ -81,10 +82,20 @@
 
                     field: 'mobile',
 
                     field: 'mobile',
 
                     title: '联系电话'
 
                     title: '联系电话'
 
                 },
 
                 },
 
-                /*{
 
+                {
 
                     field: 'orderType',
 
                     field: 'orderType',
 
-                    title: '记录类型(充值, 退卡)'
 
-                },*/
 
+                    title: '支付方式',
 
+                    formatter: function (value, row, index) {
 
+                        return $.table.selectDictLabel(orderTypeDatas, value);
 
+                    }
 
+                },
 
+                {
 
+                    field: 'paymentType',
 
+                    title: '支付方式',
 
+                    formatter: function (value, row, index) {
 
+                        return $.table.selectDictLabel(paymentTypeDatas, value);
 
+                    }
 
+                },
 
                 {
 
                 {
 
                     field: 'paymentTime',
 
                     field: 'paymentTime',
 
                     title: '支付时间'
 
                     title: '支付时间'
 
@@ -100,16 +111,13 @@
 
                         return $.table.selectDictLabel(paymentStatusDatas, value);
 
                         return $.table.selectDictLabel(paymentStatusDatas, value);
 
                     }
 
                     }
 
                 },
 
                 },
 
-                {
 
-                    field: 'orderId',
 
-                    title: '订单编号'
 
-                },
 
+
 
                 /*{
 
                 /*{
 
                     field: 'refundTime',
 
                     field: 'refundTime',
 
                     title: '退款时间'
 
                     title: '退款时间'
 
                 },*/
 
                 },*/
 
                 {
 
                 {
 
-                    field: 'ticketId',
 
+                    field: 'practicalMoney',
 
                     title: '支付金额'
 
                     title: '支付金额'
 
                 }]
 
                 }]
 
                 /*,
 
                 /*,

+ 1 - 1
qmjszx-admin/src/main/resources/templates/vipCard/add.html
View File 

@@ -55,7 +55,7 @@
 
 <th:block th:include="include :: footer"/>
 
 <th:block th:include="include :: footer"/>
 
 <th:block th:include="include :: datetimepicker-js"/>
 
 <th:block th:include="include :: datetimepicker-js"/>
 
 <script th:inline="javascript">
 
 <script th:inline="javascript">
 
-    var prefix = ctx + "vipCard/card"
 
+    var prefix = ctx + "vipCard"
 
     $("#form-card-add").validate({
 
     $("#form-card-add").validate({
 
         focusCleanup: true
 
         focusCleanup: true
 
     });
 
     });

+ 1 - 1
qmjszx-admin/src/main/resources/templates/vipCard/card.html
View File 

@@ -59,7 +59,7 @@
 
     var editFlag = [[${@permission.hasPermi('business:card:edit')}]];
 
     var editFlag = [[${@permission.hasPermi('business:card:edit')}]];
 
     var removeFlag = [[${@permission.hasPermi('business:card:remove')}]];
 
     var removeFlag = [[${@permission.hasPermi('business:card:remove')}]];
 
     var cardStateDatas = [[${@dict.getType('vip_card_state')}]];
 
     var cardStateDatas = [[${@dict.getType('vip_card_state')}]];
 
-    var prefix = ctx + "vipCard/card";
 
+    var prefix = ctx + "vipCard";
 
 
 
     $(function () {
 
     $(function () {
 
         var options = {
 
         var options = {

+ 1 - 1
qmjszx-admin/src/main/resources/templates/vipCard/edit.html
View File 

@@ -35,7 +35,7 @@
 
 </div>
 
 </div>
 
 <th:block th:include="include :: footer"/>
 
 <th:block th:include="include :: footer"/>
 
 <script th:inline="javascript">
 
 <script th:inline="javascript">
 
-    var prefix = ctx + "vipCard/card";
 
+    var prefix = ctx + "vipCard";
 
     $("#form-card-edit").validate({
 
     $("#form-card-edit").validate({
 
         focusCleanup: true
 
         focusCleanup: true
 
     });
 
     });

+ 1 - 1
qmjszx-business/src/main/resources/mapper/vipCard/VipCardMapper.xml
View File 

@@ -94,6 +94,6 @@
 
     </delete>
 
     </delete>
 
 
 
     <select id="selectVipCardByUserId" parameterType="string" resultMap="VipCardResult">
 
     <select id="selectVipCardByUserId" parameterType="string" resultMap="VipCardResult">
 
-        select * from beilv_vip_card where user_id = #{userId}
 
+        select * from beilv_vip_card where user_id = #{userId} and card_state = 'vip_card_state_open'
 
     </select>
 
     </select>
 
 </mapper>
 
 </mapper>

+ 2 - 1
qmjszx-business/src/main/resources/mapper/vipCardLog/VipCardLogMapper.xml
View File 

@@ -28,7 +28,8 @@
 
     </sql>
 
     </sql>
 
 
 
     <select id="selectVipCardLogList" parameterType="VipCardLog" resultMap="VipCardLogResult">
 
     <select id="selectVipCardLogList" parameterType="VipCardLog" resultMap="VipCardLogResult">
 
-        <include refid="selectVipCardLogVo"/>
 
+        select a.id, a.user_id, a.bus_id, a.order_type, a.payment_status, a.create_time, a.payment_type, a.payment_time, a.cancellation_time,
 
+        a.verify_time, a.refund_time, a.practical_money, a.original_price, a.member_price, a.payment_id, b.username, b.mobile from beilv_vip_card_log a
 
         left join sys_member b on a.user_id = b.id
 
         left join sys_member b on a.user_id = b.id
 
         <where>
 
         <where>
 
             <if test="username != null and username != ''">and b.username like concat('%',#{username},'%')</if>
 
             <if test="username != null and username != ''">and b.username like concat('%',#{username},'%')</if>