会员卡管理

qmjszx-admin/src/main/resources/templates/card/card.html

@@ -93,6 +93,10 @@
                     title: '卡种名称'
                 },
                 {
+                    field: 'cardTypeLable',
+                    title: '卡种类型'
+                },
+                {
                     field: 'totalNumber',
                     title: '总次数'
                 },

qmjszx-admin/src/main/resources/templates/card/stream.html

@@ -40,6 +40,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:stream:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:stream:remove')}]];
+        var cardType = [[${@dict.getType('site_type')}]];
         var prefix = ctx + "card";
 
         $(function() {
@@ -63,8 +64,26 @@
                     title: '卡种名称'
                 },
                 {
+                    field: 'cardType',
+                    title: '卡种类型',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(cardType, value);
+                    }
+                },
+                {
+                    field: 'type',
+                    title: '类型',
+                    formatter: function (value, row, index) {
+                        if (value ==='0'){
+                            return '约场';
+                        }else {
+                            return '退场'
+                        }
+                    }
+                },
+                {
                     field: 'createTime',
-                    title: '消费时间'
+                    title: '时间'
                 }]
             };
             $.table.init(options);

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

@@ -63,6 +63,7 @@ public class UserMembershipCard extends BaseEntity {
 
     private String cardType;
 
+    //卡种类型
     private String cardTypeLable;
 
     private String state;

qmjszx-business/src/main/java/beilv/usermembershipcard/service/impl/UserMembershipCardServiceImpl.java

@@ -58,6 +58,7 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
         List<UserMembershipCard> userMembershipCards = userMembershipCardMapper.selectUserMembershipCardList(userMembershipCard);
         for (UserMembershipCard userMembershipCard1 : userMembershipCards) {
             userMembershipCard1.setStateLabel(dictDataService.selectDictLabel("card_status",userMembershipCard1.getState()));
+            userMembershipCard1.setCardTypeLable(dictDataService.selectDictLabel("site_type",userMembershipCard1.getCardType()));
         }
         return userMembershipCards;
     }
@@ -127,11 +128,12 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
     */
     @Override
     public int addStream(MemberStream memberStream) {
-        //扣除会员卡剩余次数
+        //增加/扣除会员卡剩余次数（约场-1；退场+1）
         UserMembershipCard userMembershipCard = new UserMembershipCard();
         userMembershipCard.setId(Long.valueOf(memberStream.getUserCardId()));
         userMembershipCard.setRemainingNumber(Integer.valueOf(memberStream.getType()));
         userMembershipCardMapper.updateRemainingNumber(userMembershipCard);
+        //增加流水
         memberStream.setCreateBy(ShiroUtils.getUserId().toString());
         memberStream.setCreateTime(DateUtils.getNowDate());
         return userMembershipCardMapper.addStream(memberStream);

qmjszx-business/src/main/resources/mapper/card/UserMembershipCardMapper.xml

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="mobile"    column="mobile"    />
         <result property="cardName"    column="cardName"    />
         <result property="state"    column="state"    />
+        <result property="cardType"    column="card_type"    />
     </resultMap>
 
     <sql id="selectUserMembershipCardVo">
@@ -37,7 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             c.card_name cardName,
             c.total_number,
             a.remaining_number,
-            a.state
+            a.state,
+            c.card_type
         FROM
             user_membership_card a
             left join sys_member b on a.user_id = b.id
@@ -123,10 +125,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getStream" parameterType="Long" resultType="java.util.Map">
         SELECT
             a.id,
+            a.type,
             d.username,
             d.real_name realName,
             d.mobile,
             c.card_name cardName,
+            c.card_type cardType,
             DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i:%s') createTime
         FROM
             member_stream a