fix 修正了用户显示问题

xyzc-start/src/main/java/com/xyzc/start/constant/SchemeConst.java

@@ -1,16 +1,16 @@
 package com.xyzc.start.constant;
 
 /**
- * @description: TODO
- * @author: 墨凡
- * @date: 2024/7/21 21:04
- * @version: 1.0
+ * 套餐常量
+ *
+ * @author 墨凡
+ * date 2024/7/21 21:04
  */
 public interface SchemeConst {
     /**
      * 当前套餐有效
      */
-    Integer SCHEME_STATUS  = 1;
+    Integer ACTIVE_STATUS = 1;
 
     /**
      * 会员卡套餐
@@ -20,5 +20,5 @@ public interface SchemeConst {
     /**
      * 燃料部类型
      */
-    Integer FUEL_TYPE =2;
+    Integer FUEL_TYPE = 2;
 }

xyzc-start/src/main/java/com/xyzc/start/domain/Industry.java

@@ -1,6 +1,7 @@
 package com.xyzc.start.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.common.mybatis.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -23,6 +24,6 @@ public class Industry extends BaseEntity {
     /**
      * 行业名称
      */
-    private String name;
+    private String industryName;
 
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/BaseUserVo.java

@@ -2,6 +2,7 @@ package com.xyzc.start.domain.vo;
 
 import com.xyzc.start.domain.BaseUser;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

xyzc-start/src/main/java/com/xyzc/start/domain/vo/IndustryVo.java

@@ -24,6 +24,7 @@ public class IndustryVo {
     /**
      * 行业名称
      */
+    @AutoMapping(target = "industryName")
     private String name;
 
     /**

xyzc-start/src/main/java/com/xyzc/start/domain/vo/MemberCardVo.java

@@ -1,7 +1,9 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.MemberCard;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.github.linpeilie.annotations.AutoMapping;
 import lombok.Data;
 
 import java.io.Serial;
@@ -14,10 +16,11 @@ import java.util.List;
  * 会员卡视图对象 xy_member_card
  *
  * @author admin
- * @date 2024-06-26
+ * date 2024-06-26
  */
 @Data
 @AutoMapper(target = MemberCard.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class MemberCardVo implements Serializable {
 
     @Serial
@@ -26,7 +29,8 @@ public class MemberCardVo implements Serializable {
     /**
      * 会员卡id
      */
-    private Long id;
+    @AutoMapping(target = "id")
+    private Long memberCardId;
 
     /**
      * 会员方案id
@@ -39,9 +43,19 @@ public class MemberCardVo implements Serializable {
     private Long ossUrl;
 
     /**
+     * 会员卡划线价
+     */
+    private BigDecimal strikethroughPrice;
+
+    /**
+     * 赠送燃料
+     */
+    private Integer giveFuel;
+
+    /**
      * 会员卡名称
      */
-    private String cardName;
+    private String memberCardName;
 
     /**
      * 会员卡别名
@@ -59,6 +73,21 @@ public class MemberCardVo implements Serializable {
     private String description;
 
     /**
+     * 会员卡等级
+     */
+    private Integer cardLevel;
+
+    /**
+     * 会员卡时长
+     */
+    private Integer MemberCardTime;
+
+    /**
+     * 会员卡时间类型，1-天；2-周；3-月；4-季；5-年
+     */
+    private Integer timeUnit;
+
+    /**
      * 每天使用次数
      */
     private Integer everydayUseNumber;

xyzc-start/src/main/java/com/xyzc/start/domain/vo/SchemeVo.java

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.Scheme;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -18,6 +19,7 @@ import java.util.List;
  */
 @Data
 @AutoMapper(target = Scheme.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class SchemeVo implements Serializable {
 
     @Serial
@@ -66,6 +68,7 @@ public class SchemeVo implements Serializable {
     /**
      * 会员卡整体套餐
      */
+//    private List<List<MemberCardVo>> memberCardList;
     private List<MemberCardVo> memberCardList;
 
     /**

xyzc-start/src/main/java/com/xyzc/start/domain/vo/UgcUserVo.java

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.UgcUser;
 import io.github.linpeilie.annotations.AutoMapper;
 import lombok.Data;
@@ -33,8 +34,5 @@ public class UgcUserVo {
      */
     private Integer releaseModelCount;
 
-    /**
-     * 逻辑删除，0-未删除，2-已删除
-     */
-    private Integer delFlag;
+
 }

xyzc-start/src/main/java/com/xyzc/start/domain/vo/WebAppGroupVo.java

@@ -1,5 +1,6 @@
 package com.xyzc.start.domain.vo;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.xyzc.start.domain.WebAppGroup;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.github.linpeilie.annotations.AutoMapping;
@@ -9,6 +10,7 @@ import java.util.List;
 
 @Data
 @AutoMapper(target = WebAppGroup.class)
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class WebAppGroupVo {
     /**
      * 分类id

xyzc-start/src/main/java/com/xyzc/start/mapper/IndustryMapper.java

@@ -1,5 +1,6 @@
 package com.xyzc.start.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
 import com.xyzc.start.domain.Industry;
 import com.xyzc.start.domain.vo.AppPageVo;
@@ -10,27 +11,5 @@ import java.util.List;
 
 public interface IndustryMapper extends BaseMapperPlus<Industry, IndustryVo> {
 
-    /**
-     * 查询行业列表
-     * @param industry
-     * @return
-     */
-    List<IndustryVo> queryList(Industry industry);
 
-
-    /**
-     * 查询所有所属的职业关联的应用
-     *
-     * @param industryId
-     * @return
-     */
-    List<AppPageVo> queryAppPageVo(Long industryId);
-
-
-    /**
-     *
-     * @param careerIds
-     * @return
-     */
-    List<AppPageVo> queryAppPageVoByCarreerIds(List<Long> careerIds);
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/MemberCardMapper.java

@@ -22,10 +22,5 @@ public interface MemberCardMapper extends BaseMapperPlus<MemberCard, MemberCardV
      *
      * @param schemeId 方案id
      */
-    default List<MemberCardVo> queryVoListBySchemeId(Long schemeId) {
-        return this.selectVoList(new LambdaQueryWrapper<MemberCard>()
-                .select(MemberCard::getId, MemberCard::getCardName, MemberCard::getDescription)
-                .eq(MemberCard::getSchemeId, schemeId)
-                .orderByDesc(MemberCard::getCreateTime));
-    }
+    List<MemberCardVo> queryVoListBySchemeId(Long schemeId);
 }

xyzc-start/src/main/java/com/xyzc/start/mapper/SchemeMapper.java

@@ -2,6 +2,7 @@ package com.xyzc.start.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.xyzc.common.mybatis.core.mapper.BaseMapperPlus;
+import com.xyzc.start.constant.SchemeConst;
 import com.xyzc.start.domain.Scheme;
 import com.xyzc.start.domain.vo.FuelPackageVo;
 import com.xyzc.start.domain.vo.MemberCardVo;
@@ -22,12 +23,12 @@ public interface SchemeMapper extends BaseMapperPlus<Scheme, SchemeVo> {
      *
      * @return
      */
-    default List<SchemeVo> getCurrentMember() {
-        return selectVoList(new LambdaQueryWrapper<Scheme>()
+    default SchemeVo getCurrentMember() {
+        return selectVoOne(new LambdaQueryWrapper<Scheme>()
                 //1 生效
-                .eq(Scheme::getSchemeStatus, 1)
+                .eq(Scheme::getSchemeStatus, SchemeConst.ACTIVE_STATUS)
                 //1 会员卡方案
-                .eq(Scheme::getSchemeType, 1)
+                .eq(Scheme::getSchemeType, SchemeConst.MEMEBER_TYPE)
         );
     }
 
@@ -37,9 +38,9 @@ public interface SchemeMapper extends BaseMapperPlus<Scheme, SchemeVo> {
     default List<SchemeVo> getCurrentFuel() {
         return selectVoList(new LambdaQueryWrapper<Scheme>()
                 //1 生效
-                .eq(Scheme::getSchemeStatus, 1)
+                .eq(Scheme::getSchemeStatus, SchemeConst.ACTIVE_STATUS)
                 //2 燃料方案
-                .eq(Scheme::getSchemeType, 2)
+                .eq(Scheme::getSchemeType, SchemeConst.FUEL_TYPE)
         );
     }
 

xyzc-start/src/main/java/com/xyzc/start/service/impl/SchemeServiceImpl.java

@@ -36,26 +36,18 @@ public class SchemeServiceImpl implements ISchemeService {
      */
     @Override
     public SchemeVo getCurrentMember() {
-        List<SchemeVo> schemeVoList = schemeMapper.getCurrentMember();
+        SchemeVo scheme = schemeMapper.getCurrentMember();
 
         // 有且只有一个会员卡套餐生效
-        AssertUtils.isUnique(schemeVoList, ErrorCode.SCHEME_NOT_UNIQUE);
-        SchemeVo schemeVo = schemeVoList.get(0);
         // 根据套餐查询会员卡
-        List<MemberCardVo> memberCardVos = memberCardMapper.queryVoListBySchemeId(schemeVo.getId());
-        // 获取列表中所有的会员卡id
-        List<Long> memberCardIds = memberCardVos.stream().map(MemberCardVo::getId).toList();
+        List<MemberCardVo> memberCardVos = memberCardMapper.queryVoListBySchemeId(scheme.getId());
 
-        // 根据会员卡查询权益
-        List<EquityVo> equityVos = equityMapper.queryVoByMemberCardIds(memberCardIds);
-        // 将拿到的权益根据会员卡id分组
-        Map<Long, List<EquityVo>> equityMap = equityVos.stream().collect(Collectors.groupingBy(EquityVo::getMemberCardId));
-        // 将会员卡通过id和权益的会员卡id绑定
-        memberCardVos.forEach(memberCardVo -> memberCardVo.setEquityList(equityMap.get(memberCardVo.getId())));
+        // 获取列表中所有的会员卡id
+//        List<Long> memberCardIds = memberCardVos.stream().map&(MemberCardVo::getId).toList();
 
         // 将会员卡列表绑定到方案中
-        schemeVo.setMemberCardList(memberCardVos);
-        return schemeVo;
+        scheme.setMemberCardList(memberCardVos);
+        return scheme;
     }
 
     /**

xyzc-start/src/main/java/com/xyzc/start/service/impl/UserInfoServiceImpl.java

@@ -93,7 +93,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
     @Override
     public List<IndustryVo> getIndustryAll() {
 
-        return industryMapper.queryList(null);
+        return industryMapper.selectVoList(null);
     }
 
     /**

xyzc-start/src/main/resources/mapper/WebStart/BaseUserMapper.xml

@@ -48,6 +48,7 @@
     <select id="queryBaseUserVoById" resultType="com.xyzc.start.domain.vo.BaseUserVo">
         select bu.id        as id,
                bu.user_name as user_name,
+               bu.user_id,
                bu.mobile,
                bu.surplus_fuel,
                oss.url      as avatar

xyzc-start/src/main/resources/mapper/WebStart/IndustryMapper.xml

@@ -5,17 +5,6 @@
 <mapper namespace="com.xyzc.start.mapper.IndustryMapper">
 
 
-    <select id="queryList" resultType="com.xyzc.start.domain.vo.IndustryVo">
-        select id,
-               name,
-               sort
-        from xy_industry
-    </select>
-
-    <select id="queryAppPageVo" resultType="com.xyzc.start.domain.vo.AppPageVo">
-
-    </select>
-
 
 
 </mapper>

xyzc-start/src/main/resources/mapper/WebStart/MemberCardMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xyzc.start.mapper.MemberCardMapper">
+
+
+    <select id="queryVoListBySchemeId" resultType="com.xyzc.start.domain.vo.MemberCardVo">
+        select mec.id                   AS member_card_id,
+               oss.url                  AS logo_url,
+               mec.card_name            AS member_card_name,
+               mec.description,
+               mec.card_level           AS card_level,
+               mcp.member_card_time     AS member_card_time,
+               mcp.time_unit            AS time_unit,
+               mcp.give_fuel            AS give_fuel,
+               amcp.strikethrough_price AS strikethrough_price,
+               amcp.agent_price         AS price
+        from xy_member_card mec
+                 left join sys_oss oss on mec.oss_id = oss.oss_id
+                 left join xy_member_card_price mcp on mec.id = mcp.member_card_id
+                 left join xy_agent_member_card_price amcp on mcp.id = amcp.member_card_price_id
+        where mec.scheme_id = #{schemeId}
+
+    </select>
+
+
+
+</mapper>