Merge remote-tracking branch 'origin/master'

qmjszx-admin/src/main/java/beilv/web/controller/bootacourse/bootACourseController.java

@@ -37,7 +37,7 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @RestController
-@RequestMapping("/bootACourse")
+@RequestMapping("/app-api/bootACourse")
 public class bootACourseController extends BaseController {
 
     @Autowired
@@ -46,15 +46,10 @@ public class bootACourseController extends BaseController {
     private IBeilvSiteService siteService;
     @Autowired
     private IAdmissionTicketService ticketService;
-
-    @Autowired
-    private ICardPurchaseRecordService recordService;
     @Autowired
     private IUserMembershipCardService cardService;
-
     @Autowired
     private IBootACourseService courseService;
-
     @Autowired
     private IUserMembershipCardService userMembershipCardService;
 
@@ -121,7 +116,7 @@ public class bootACourseController extends BaseController {
     @PostMapping("/getTicketList")
     public AjaxResult getTicketList(@RequestBody AdmissionTicket admissionTicket){
         //设置查询状态: 可以预定的时段
-        admissionTicket.setAdmissionTicketStatus("0");
+//        admissionTicket.setAdmissionTicketStatus("0");
         //查询可用时段
         List<AdmissionTicket> admissionTickets = ticketService.selectBeilvAdmissionTicketList(admissionTicket);
         return AjaxResult.success(admissionTickets);

qmjszx-admin/src/main/java/beilv/web/controller/system/SysDictController.java

@@ -0,0 +1,40 @@
+package beilv.web.controller.system;
+
+import beilv.common.core.domain.AjaxResult;
+import beilv.common.core.domain.entity.SysDictData;
+import beilv.system.service.ISysDictDataService;
+import beilv.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/app-api/dict")
+public class SysDictController {
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+    @Autowired
+    private ISysDictDataService dictDataService;
+
+    @GetMapping("/getType")
+    public AjaxResult getType(String dictType) {
+        return AjaxResult.success(dictTypeService.selectDictDataByType(dictType));
+    }
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典键值
+     * @return 字典标签
+     */
+    @GetMapping("/getLabel")
+    public AjaxResult getLabel(String dictType, String dictValue) {
+        return AjaxResult.success("success",dictDataService.selectDictLabel(dictType, dictValue));
+    }
+}

qmjszx-admin/src/main/resources/templates/system/bill/bill.html

@@ -65,7 +65,7 @@
                     visible: false
                 },
                 {
-                    field: 'realName',
+                    field: 'username',
                     title: '用户名称'
                 },
                 {

qmjszx-admin/src/main/resources/templates/system/bill/billList.html

@@ -39,7 +39,7 @@
                     visible: false
                 },
                 {
-                    field: 'realName',
+                    field: 'username',
                     title: '用户名称'
                 },
                 {

qmjszx-admin/src/main/resources/templates/system/member/member.html

@@ -11,7 +11,7 @@
                 <div class="select-list">
                     <ul>
                         <li>
-                            <label>用户账户：</label>
+                            <label>用户名称：</label>
                             <input type="text" name="username"/>
                         </li>
                         <li>

qmjszx-business/src/main/java/beilv/admissionticket/domain/AdmissionTicket.java

@@ -25,7 +25,7 @@ public class AdmissionTicket {
     /**
      * 场地名称
      */
-    private String siteName;
+    private String siteId;
     /**
      * 场地类型
      */
@@ -58,4 +58,18 @@ public class AdmissionTicket {
      */
     private int sort;
 
+    private String siteName;
+
+    public AdmissionTicket(String id, String venueId, String siteId, String siteType, String session, BigDecimal price, Date ticketDate, String admissionTicketStatus, String venueName, int sort) {
+        this.id = id;
+        this.venueId = venueId;
+        this.siteId = siteId;
+        this.siteType = siteType;
+        this.session = session;
+        this.price = price;
+        this.ticketDate = ticketDate;
+        this.admissionTicketStatus = admissionTicketStatus;
+        this.venueName = venueName;
+        this.sort = sort;
+    }
 }

qmjszx-business/src/main/java/beilv/cardpurchaserecord/domain/CardPurchaseRecord.java

@@ -28,7 +28,7 @@ public class CardPurchaseRecord extends BaseEntity
     @Excel(name = "用户账户")
     private String userName;
 
-    @Excel(name = "姓名")
+//    @Excel(name = "姓名")
     private String realName;
 
     @Excel(name = "手机号码")

qmjszx-business/src/main/java/beilv/userbill/domain/SysUserBill.java

@@ -32,10 +32,15 @@ public class SysUserBill {
     /**
      * 用户uid
      */
-    @Excel(name = "用户uid")
     private Long userId;
 
     /**
+     * 用户名称
+     */
+    @Excel(name = "用户名称")
+    private String username;
+
+    /**
      * 0 = 支出 1 = 获得
      */
     @Excel(name = "0 = 支出 1 = 获得")
@@ -68,7 +73,6 @@ public class SysUserBill {
     /**
      * 0 = 带确定 1 = 有效 -1 = 无效
      */
-    @Excel(name = "0 = 带确定 1 = 有效 -1 = 无效")
     private Integer status;
 
     /** 创建者 */
@@ -93,11 +97,6 @@ public class SysUserBill {
      */
     private Integer delFlag;
 
-    /**
-     * 用户名称
-     */
-    private String realName;
-
     public void setId(Long id) {
         this.id = id;
     }
@@ -210,12 +209,12 @@ public class SysUserBill {
         this.remark = remark;
     }
 
-    public String getRealName() {
-        return realName;
+    public String getUsername() {
+        return username;
     }
 
-    public void setRealName(String realName) {
-        this.realName = realName;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
     @Override
@@ -235,7 +234,7 @@ public class SysUserBill {
                 .append("updateBy", getUpdateBy())
                 .append("updateTime", getUpdateTime())
                 .append("delFlag", getDelFlag())
-                .append("realName", getRealName())
+                .append("username", getUsername())
                 .toString();
     }
 }

qmjszx-business/src/main/java/beilv/userbill/service/impl/SysUserBillServiceImpl.java

@@ -14,7 +14,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -102,11 +101,11 @@ public class SysUserBillServiceImpl implements ISysUserBillService {
     /**
      * 增加收入流水
      *
-     * @param userId   userId
-     * @param title    账单标题
-     * @param number   明细数字
-     * @param balance  剩余
-     * @param remark   备注
+     * @param userId  userId
+     * @param title   账单标题
+     * @param number  明细数字
+     * @param balance 剩余
+     * @param remark  备注
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -151,6 +150,9 @@ public class SysUserBillServiceImpl implements ISysUserBillService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date date = new Date();
         SysMember sysMember = sysMemberMapper.selectSysMemberById(dto.getId());
+        if (sysMember.getIntegral().compareTo(dto.getIntegral()) < 0) {
+            throw new RuntimeException("积分不足");
+        }
         BigDecimal surplusIntegral = sysMember.getIntegral().subtract(dto.getIntegral());
         expend(dto.getId(), "会员兑换", dto.getIntegral(), surplusIntegral, sdf.format(date) + "消耗" + dto.getIntegral() + "积分," + "兑换" + dto.getGiftName() + "成功");
         sysMember.setIntegral(surplusIntegral);

qmjszx-business/src/main/java/beilv/usermembershipcard/domain/UserMembershipCard.java

@@ -34,7 +34,7 @@ public class UserMembershipCard extends BaseEntity {
     @Excel(name = "用户账户")
     private String userName;
 
-    @Excel(name = "姓名")
+//    @Excel(name = "姓名")
     private String realName;
 
     @Excel(name = "手机号码")

qmjszx-business/src/main/resources/mapper/admissionticket/AdmissionTicketMapper.xml

@@ -7,6 +7,7 @@
     <resultMap type="admissionTicket" id="AdmissionTicketResult">
         <result property="id" column="id"/>
         <result property="venueId" column="venue_id"/>
+        <result property="siteId" column="site_id"/>
         <result property="siteName" column="site_name"/>
         <result property="siteType" column="site_type"/>
         <result property="session" column="session"/>
@@ -19,25 +20,25 @@
 
     <insert id="insertAdmissionTicketToList" parameterType="list">
         insert into beilv_admission_ticket
-        (id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status, sort)
+        (id, venue_id, site_id, site_type, session, price, ticket_date, admission_ticket_status, sort)
         values
         <foreach collection="list" item="ticket" separator=",">
             (
             #{ticket.id},
             #{ticket.venueId},
-            #{ticket.siteName},
+            #{ticket.siteId},
             #{ticket.siteType},
             #{ticket.session},
             #{ticket.price},
             #{ticket.ticketDate},
-            #{ticket.admissionTicketStatus}
+            #{ticket.admissionTicketStatus},
             #{ticket.sort}
             )
         </foreach>
     </insert>
 
     <sql id="selectBeilvAdmissionTicketVo">
-        select id, venue_id, site_name, site_type, session, price, ticket_date, admission_ticket_status, sort
+        select id, venue_id, site_id, site_type, session, price, ticket_date, admission_ticket_status, sort
         from beilv_admission_ticket
     </sql>
 
@@ -45,9 +46,10 @@
         SELECT
         ts.id,
         ts.venue_id,
+        ts.site_id,
         bs.name as site_name,
         ts.site_type,
-        ts.SESSION,
+        ts.session,
         ts.price,
         ts.ticket_date,
         bv.venue_name,
@@ -55,9 +57,9 @@
         ts.sort
         from beilv_admission_ticket ts
         left join beilv_venue bv on ts.venue_id = bv.id
-        left join beilv_site bs on ts.site_name = bs.id
+        left join beilv_site bs on ts.site_id = bs.id
         <where>
-            <if test="siteName != null and siteName != ''">and bs.id = #{siteName}</if>
+            <if test="siteName != null and siteName != ''">and bs.name LIKE CONCAT('%', #{siteName}, '%')  </if>
             <if test="siteType != null and siteType != ''">and ts.site_type = #{siteType}</if>
             <if test="ticketDate != null ">and ts.ticket_date = #{ticketDate}</if>
             <if test="admissionTicketStatus != null  and admissionTicketStatus != ''">
@@ -71,14 +73,14 @@
                 </choose>
             </if>
         </where>
-        order by site_name, sort
+        order by site_id, sort
     </select>
 
     <select id="selectBeilvAdmissionTicketById" parameterType="String" resultMap="AdmissionTicketResult">
         SELECT
             ts.id,
             ts.venue_id,
-            ts.site_name,
+            ts.site_id,
             ts.site_type,
             ts.SESSION,
             ts.price,
@@ -95,7 +97,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="id != null">id,</if>
             <if test="venueId != null">venue_id,</if>
-            <if test="siteName != null">site_name,</if>
+            <if test="siteId != null">site_id,</if>
             <if test="siteType != null">site_type,</if>
             <if test="session != null">session,</if>
             <if test="price != null">price,</if>
@@ -105,7 +107,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="venueId != null">#{venueId},</if>
-            <if test="siteName != null">#{siteName},</if>
+            <if test="siteId != null">#{siteId},</if>
             <if test="siteType != null">#{siteType},</if>
             <if test="session != null">#{session},</if>
             <if test="price != null">#{price},</if>
@@ -118,7 +120,7 @@
         update beilv_admission_ticket
         <trim prefix="SET" suffixOverrides=",">
             <if test="venueId != null">venue_id = #{venueId},</if>
-            <if test="siteName != null">site_name = #{siteName},</if>
+            <if test="siteId != null">site_id = #{siteId},</if>
             <if test="siteType != null">site_type = #{siteType},</if>
             <if test="session != null">session = #{session},</if>
             <if test="price != null">price = #{price},</if>

qmjszx-business/src/main/resources/mapper/userbill/SysUserBillMapper.xml

@@ -19,7 +19,7 @@
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
         <result property="delFlag" column="del_flag"/>
-        <result property="realName" column="real_name"/>
+        <result property="username" column="username"/>
     </resultMap>
 
     <sql id="selectSysUserBillVo">
@@ -37,7 +37,7 @@
                sub.update_by,
                sub.update_time,
                sub.del_flag,
-               sm.real_name
+               sm.username
         from sys_user_bill sub
                  left join sys_member sm on sub.user_id = sm.id
     </sql>
@@ -137,7 +137,7 @@
         sub.update_by,
         sub.update_time,
         sub.del_flag,
-        sm.real_name
+        sm.username
         from sys_user_bill sub
         left join sys_member sm on sub.user_id = sm.id
         <where>