Merge remote-tracking branch 'origin/master'

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

@@ -44,6 +44,7 @@ public class CardPurchaseRecord extends BaseEntity
 
     private String cardType;
 
+    @Excel(name = "卡种类型")
     private String cardTypeLabel;
 
     private Integer totalNumber;

qmjszx-business/src/main/java/beilv/carinformation/domain/CarInformation.java

@@ -65,13 +65,13 @@ public class CarInformation extends BaseEntity {
      * 有效期
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
+//    @Excel(name = "有效期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date expirationDate;
 
     /**
      * 使用规则
      */
-    @Excel(name = "使用规则")
+//    @Excel(name = "使用规则")
     private String notes;
 
     /**

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

@@ -52,6 +52,18 @@ public class UserMembershipCard extends BaseEntity
 
     private String state;
 
+    @Excel(name = "状态")
+    private String stateLabel;
+
+    public String getStateLabel() {
+
+        return stateLabel;
+    }
+
+    public void setStateLabel(String stateLabel) {
+        this.stateLabel = stateLabel;
+    }
+
     public String getState() {
         return state;
     }

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

@@ -5,6 +5,7 @@ import beilv.cardpurchaserecord.mapper.CardPurchaseRecordMapper;
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
 import beilv.common.utils.ShiroUtils;
+import beilv.system.service.ISysDictDataService;
 import beilv.usermembershipcard.domain.MemberStream;
 import beilv.usermembershipcard.domain.UserMembershipCard;
 import beilv.usermembershipcard.mapper.UserMembershipCardMapper;
@@ -32,6 +33,9 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
     @Autowired
     private CardPurchaseRecordMapper cardPurchaseRecordMapper;
 
+    @Autowired
+    private ISysDictDataService dictDataService;
+
     /**
      * 查询用户会员卡
      *
@@ -51,7 +55,11 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
      */
     @Override
     public List<UserMembershipCard> selectUserMembershipCardList(UserMembershipCard userMembershipCard) {
-        return userMembershipCardMapper.selectUserMembershipCardList(userMembershipCard);
+        List<UserMembershipCard> userMembershipCards = userMembershipCardMapper.selectUserMembershipCardList(userMembershipCard);
+        for (UserMembershipCard userMembershipCard1 : userMembershipCards) {
+            userMembershipCard1.setStateLabel(dictDataService.selectDictLabel("card_status",userMembershipCard1.getState()));
+        }
+        return userMembershipCards;
     }
 
     /**

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

@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null">user_id = #{userId},</if>
             <if test="recordId != null">record_id = #{recordId},</if>
             <if test="totalNumber != null">total_number = #{totalNumber},</if>
-            <if test="remainingNumber != null">remaining_number = #{remainingNumber}</if>
+            <if test="remainingNumber != null">remaining_number = #{remainingNumber},</if>
             <if test="version != null">version = #{version},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>