会员卡管理

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

@@ -54,6 +54,7 @@
     <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() {
@@ -100,12 +101,21 @@
                     title: '剩余次数'
                 },
                 {
+                    field: 'state',
+                    title: '状态',
+                    formatter: function (value, row, index) {
+                        return $.table.selectDictLabel(cardType, value);
+                    }
+                },
+                {
                     title: '操作',
                     align: 'center',
                     formatter: function(value, row, index) {
                         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-danger btn-xs ' + refundCard + '" href="javascript:void(0)" onclick="refundCard1(\'' + row.id + '\')"><i class="fa fa-remove"></i>退卡</a>');
+                        if (row.state==='3'){
+                            actions.push('<a class="btn btn-danger btn-xs ' + refundCard + '" href="javascript:void(0)" onclick="refundCard1(\'' + row.id + '\', \'' + row.recordId + '\')"><i class="fa fa-remove"></i>退卡</a>');
+                        }
                         return actions.join('');
                     }
                 }]
@@ -118,10 +128,12 @@
             $.modal.open("查看流水", prefix + "/toStream/" + id);
         }
 
-        function refundCard1(id) {
+        function refundCard1(id,recordId) {
+            console.log(id)
+            console.log(recordId)
             $.modal.confirm("确认要退选中的会员卡吗?", function() {
-                var data = { "id": id };
-                $.operate.submit("/record/refundCard", "post", "json", data);
+                var data = { "id":id, "recordId": recordId };
+                $.operate.submit(prefix + "/refundCard", "post", "json", data);
             });
         }
     </script>

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

@@ -59,16 +59,12 @@
                     title: '手机号码'
                 },
                 {
-                    field: 'name',
+                    field: 'cardName',
                     title: '卡种名称'
                 },
                 {
                     field: 'createTime',
                     title: '消费时间'
-                },
-                {
-                    field: 'statLabel',
-                    title: '状态'
                 }]
             };
             $.table.init(options);

qmjszx-business/src/main/java/beilv/cardpurchaserecord/service/impl/CardPurchaseRecordServiceImpl.java

@@ -80,7 +80,7 @@ public class CardPurchaseRecordServiceImpl implements ICardPurchaseRecordService
         userMembershipCard.setRemainingNumber(cardPurchaseRecord.getTotalNumber());
         userMembershipCard.setCreateBy(ShiroUtils.getUserId().toString());
         userMembershipCard.setCreateTime(DateUtils.getNowDate());
-//        userMembershipCard.setState("1");
+        userMembershipCard.setState("3");
         userMembershipCard.setVersion("0");
         return userMembershipCardMapper.insertUserMembershipCard(userMembershipCard);
     }

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

@@ -8,6 +8,7 @@ import beilv.common.utils.ShiroUtils;
 import beilv.usermembershipcard.domain.UserMembershipCard;
 import beilv.usermembershipcard.mapper.UserMembershipCardMapper;
 import beilv.usermembershipcard.service.IUserMembershipCardService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -109,17 +110,20 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
      */
     @Override
     public int refundCard(UserMembershipCard userMembershipCard) {
+        CardPurchaseRecord cardPurchaseRecord = cardPurchaseRecordMapper.selectCardPurchaseRecordById(Long.parseLong(userMembershipCard.getRecordId()));
         //新增退卡记录
         CardPurchaseRecord record = new CardPurchaseRecord();
+        BeanUtils.copyProperties(cardPurchaseRecord,record);
+        record.setId(null);
         record.setCreateBy(ShiroUtils.getUserId().toString());
         record.setCreateTime(DateUtils.getNowDate());
         record.setType("2");
         record.setTime(DateUtils.getNowDate());
         record.setVersion("0");
         cardPurchaseRecordMapper.insertCardPurchaseRecord(record);
-
-        //修改会员管理状态
-//        userMembershipCard.setState("3");
+        //修改用户会员卡
+        userMembershipCard.setState("2");
+        userMembershipCard.setRemainingNumber(0);
         return userMembershipCardMapper.updateUserMembershipCard(userMembershipCard);
     }
 }

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

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cardType"    column="card_type"    />
         <result property="totalNumber"    column="total_number"    />
         <result property="memberPrice"    column="member_price"    />
+        <result property="originalPrice"    column="original_price"    />
     </resultMap>
 
     <sql id="selectCardPurchaseRecordVo">
-        select a.id, a.user_id, a.card_id, a.card_name,a.card_type, a.total_number, a.member_price, a.time, a.payment_way, a.type, a.notes, a.version, a.create_by, a.create_time, a.update_by, a.update_time from card_purchase_record a
+        select a.id, a.user_id, a.card_id, a.card_name,a.card_type, a.total_number,a.original_price, a.member_price, a.time, a.payment_way, a.type, a.notes, a.version, a.create_by, a.create_time, a.update_by, a.update_time from card_purchase_record a
     </sql>
 
     <select id="selectCardPurchaseRecordList" parameterType="CardPurchaseRecord" resultMap="CardPurchaseRecordResult">

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

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realName"    column="real_name"    />
         <result property="mobile"    column="mobile"    />
         <result property="cardName"    column="cardName"    />
+        <result property="state"    column="state"    />
     </resultMap>
 
     <sql id="selectUserMembershipCardVo">
-        select id, user_id, record_id, remaining_number, version,state, create_by, create_time, update_by, update_time from user_membership_card
+        select id, user_id, record_id, remaining_number, version, create_by, create_time, update_by, update_time from user_membership_card
     </sql>
 
     <select id="selectUserMembershipCardList" parameterType="UserMembershipCard" resultMap="UserMembershipCardResult">
@@ -35,7 +36,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.record_id,
             c.card_name cardName,
             c.total_number,
-            a.remaining_number
+            a.remaining_number,
+            a.state
         FROM
             user_membership_card a
             left join sys_member b on a.user_id = b.id
@@ -66,12 +68,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recordId != null">record_id,</if>
             <if test="totalNumber != null">total_number,</if>
             <if test="remainingNumber != null">remaining_number,</if>
-            <if test="state != null">state,</if>
             <if test="version != null">version,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
             <if test="updateTime != null">update_time,</if>
+            <if test="state != null">state,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -79,12 +81,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="recordId != null">#{recordId},</if>
             <if test="totalNumber != null">#{totalNumber},</if>
             <if test="remainingNumber != null">#{remainingNumber},</if>
-            <if test="state != null">#{state},</if>
             <if test="version != null">#{version},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="state != null">#{state},</if>
          </trim>
     </insert>
 
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="state != null">state = #{state},</if>
         </trim>
         where id = #{id}
     </update>
@@ -121,14 +124,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             d.username,
             d.real_name realName,
             d.mobile,
-            c.`name`,
-            a.create_time createTime
+            c.card_name cardName,
+            DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%i:%s') createTime
         FROM
             member_stream a
             left join user_membership_card b on a.user_card_id = b.id
-            left join card_information c on b.card_id = c.id
+            left join card_purchase_record c on b.record_id = c.id
             left join sys_member d on b.user_id = d.id
         WHERE a.user_card_id = #{id}
+        order by a.create_time desc
     </select>
 
 </mapper>