增加中文信息, 时间格式处理

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

@@ -4,6 +4,7 @@ import beilv.cardpurchaserecord.domain.CardPurchaseRecord;
 import beilv.cardpurchaserecord.mapper.CardPurchaseRecordMapper;
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
+import beilv.common.utils.DictUtils;
 import beilv.common.utils.ShiroUtils;
 import beilv.common.utils.StringUtils;
 import beilv.system.service.ISysDictDataService;
@@ -11,6 +12,7 @@ import beilv.usermembershipcard.domain.MemberStream;
 import beilv.usermembershipcard.domain.UserMembershipCard;
 import beilv.usermembershipcard.mapper.UserMembershipCardMapper;
 import beilv.usermembershipcard.service.IUserMembershipCardService;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -58,9 +60,12 @@ public class UserMembershipCardServiceImpl implements IUserMembershipCardService
     @Override
     public List<UserMembershipCard> selectUserMembershipCardList(UserMembershipCard userMembershipCard) {
         List<UserMembershipCard> userMembershipCards = userMembershipCardMapper.selectUserMembershipCardList(userMembershipCard);
+        Map<String, String> cardStatus = DictUtils.getDictCacheToMap("card_status");
+        Map<String, String> siteType = DictUtils.getDictCacheToMap("site_type");
+
         for (UserMembershipCard userMembershipCard1 : userMembershipCards) {
-            userMembershipCard1.setStateLabel(dictDataService.selectDictLabel("card_status",userMembershipCard1.getState()));
-            userMembershipCard1.setCardTypeLable(dictDataService.selectDictLabel("site_type",userMembershipCard1.getCardType()));
+            userMembershipCard1.setStateLabel(MapUtils.getString(cardStatus, userMembershipCard1.getState()));
+            userMembershipCard1.setCardTypeLable(MapUtils.getString(siteType, userMembershipCard1.getCardType()));
         }
         return userMembershipCards;
     }

qmjszx-business/src/main/java/beilv/vipCardLog/service/impl/VipCardLogServiceImpl.java

@@ -8,6 +8,7 @@ import beilv.carinformation.service.ICarInformationService;
 import beilv.common.core.domain.AjaxResult;
 import beilv.common.core.text.Convert;
 import beilv.common.utils.DateUtils;
+import beilv.common.utils.DictUtils;
 import beilv.common.utils.StringUtils;
 import beilv.common.utils.uuid.IdUtils;
 import beilv.competition.domain.Competition;
@@ -22,6 +23,7 @@ import beilv.vipCardAmountLog.mapper.VipCardAmountLogMapper;
 import beilv.vipCardLog.domain.VipCardLog;
 import beilv.vipCardLog.mapper.VipCardLogMapper;
 import beilv.vipCardLog.service.IVipCardLogService;
+import org.apache.commons.collections4.MapUtils;
 import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
@@ -391,12 +393,42 @@ public class VipCardLogServiceImpl implements IVipCardLogService {
     @Override
     public List<Map<String, Object>> selectYueQiuList(VipCardLog vipCardLog) {
         vipCardLog.setOrderType("yueqiu");
-        return vipCardLogMapper.selectYueQiuList(vipCardLog);
+        Map<String, String> orderType = DictUtils.getDictCacheToMap("order_type");
+        Map<String, String> paymentStatus = DictUtils.getDictCacheToMap("payment_status");
+        Map<String, String> paymentType = DictUtils.getDictCacheToMap("payment_type");
+
+        List<Map<String, Object>> maps = vipCardLogMapper.selectYueQiuList(vipCardLog);
+
+        maps.forEach(map->{
+            map.put("orderTypeLabel", MapUtils.getString(orderType, MapUtils.getString(map,"orderType")));
+            map.put("paymentStatusLabel", MapUtils.getString(paymentStatus, MapUtils.getString(map,"paymentStatus")));
+            map.put("paymentTypeLabel", MapUtils.getString(paymentType, MapUtils.getString(map,"paymentType")));
+            map.put("createTime", MapUtils.getString(map, "createTime").replace("T", " "));
+            map.put("paymentTime", MapUtils.getString(map, "paymentTime").replace("T", " "));
+        });
+        return maps;
     }
 
     @Override
     public List<Map<String, Object>> selectCanSaiList(VipCardLog vipCardLog) {
-        return vipCardLogMapper.selectCanSaiList(vipCardLog);
+        List<Map<String, Object>> maps = vipCardLogMapper.selectCanSaiList(vipCardLog);
+        Map<String, String> orderType = DictUtils.getDictCacheToMap("order_type");
+        Map<String, String> paymentType = DictUtils.getDictCacheToMap("payment_type");
+        Map<String, String> competitionState = DictUtils.getDictCacheToMap("competition_state");
+        Map<String, String> paymentStatus = DictUtils.getDictCacheToMap("payment_status");
+
+        maps.forEach(map->{
+            map.put("orderTypeLabel", MapUtils.getString(orderType, MapUtils.getString(map,"orderType")));
+            map.put("paymentTypeLabel", MapUtils.getString(paymentType, MapUtils.getString(map,"paymentType")));
+            map.put("competitionStateLabel", MapUtils.getString(competitionState, MapUtils.getString(map,"competitionState")));
+            map.put("paymentStatusLabel", MapUtils.getString(paymentStatus, MapUtils.getString(map,"paymentStatus")));
+            map.put("publishTime", MapUtils.getString(map, "publishTime").replace("T", " "));
+            map.put("applyEndTime", MapUtils.getString(map, "applyEndTime").replace("T", " "));
+            map.put("applyStartTime", MapUtils.getString(map, "applyStartTime").replace("T", " "));
+            map.put("createTime", MapUtils.getString(map, "createTime").replace("T", " "));
+            map.put("paymentTime", MapUtils.getString(map, "paymentTime").replace("T", " "));
+        });
+        return maps;
     }
 
     public void insertAmountLog(VipCardAmountLog vipCardAmountLog){

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

@@ -46,10 +46,13 @@
         a.record_id,
         a.remaining_number,
         a.state,
-        a.card_info_id
+        a.card_info_id,
+        c.total_number,
+        c.type card_type
         FROM
         user_membership_card a
         left join sys_member b on a.user_id = b.id
+        left join card_information c on a.card_info_id = c.id
         <where>
             <if test="userId != null  and userId != ''">and a.user_id = #{userId}</if>
             <if test="recordId != null  and recordId != ''">and a.record_id = #{recordId}</if>

qmjszx-business/src/main/resources/mapper/vipCardLog/VipCardLogMapper.xml

@@ -195,6 +195,7 @@
         a.payment_time paymentTime,
         a.verify_time verifyTime,
         a.practical_money parcticalMoney,
+        a.original_price originalPrice,
         b.competition_title competitionTitle,
         b.competition_type competitionType,
         b.team_max teamMax,