会员卡管理

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

@@ -65,7 +65,7 @@ public class CardPurchaseRecord extends BaseEntity
     @Excel(name = "支付方式")
     private String paymentWay;
 
-    /** 状态（待使用、已使用、已退款） */
+    /** 状态（1：购卡：退卡） */
 //    @Excel(name = "状态", readConverterExp = "待=使用、已使用、已退款")
     private String type;
 

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

@@ -28,6 +28,9 @@ public class MemberStream extends BaseEntity {
     //类型（0：约场；1：退场）
     private String type;
 
+    //订单id
+    private String orderId;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

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

@@ -124,6 +124,8 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
         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

@@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="userCardId != null">user_card_id,</if>
             <if test="type != null">type,</if>
+            <if test="orderId != null">order_id,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -150,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">#{id},</if>
             <if test="userCardId != null">#{userCardId},</if>
             <if test="type != null">#{type},</if>
+            <if test="orderId != null">#{orderId},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>