1.优化

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ApiMemberController.java

@@ -506,8 +506,8 @@ public class ApiMemberController {
             if (params.containsKey("userId") && StringUtils.isNotBlank(params.get("userId").toString())) {
                 long userId = Long.parseLong(params.get("userId").toString());
                 MallMemberUser mallMemberUser = memberUserService.selectMallMemberUserById(userId);
-                if (mallMemberUser != null && mallMemberUser.getIndexUserId() != 0 && mallMemberUser.getIndexUserId() != null) {
-                    MallMemberUser topUser = memberUserService.selectMallMemberUserById(mallMemberUser.getIndexUserId());
+                if (mallMemberUser != null && (mallMemberUser.getIntroUser() != null && mallMemberUser.getIntroUser() != 0) || (mallMemberUser.getIndexUserId() != null && mallMemberUser.getIndexUserId() > 0)) {
+                    MallMemberUser topUser = memberUserService.selectMallMemberUserById(mallMemberUser.getIntroUser() != null ? mallMemberUser.getIntroUser() : mallMemberUser.getIndexUserId());
                     if (topUser != null && topUser.getIndexPrice().compareTo(new BigDecimal(0)) > 0) {
                         userPrice = String.valueOf(topUser.getIndexPrice());
                     }

ruoyi-system/src/main/java/com/ruoyi/mall/domain/Vo/SchoolMajorAcceptRecordVO.java

@@ -13,6 +13,9 @@ public class SchoolMajorAcceptRecordVO implements Serializable {
     /** 专业录取数据id */
     private Long schoolAcceptId;
 
+    /** 专业代码 */
+    private String majorCode;
+
     /** 专业名称 */
     private String majorName;
 
@@ -49,54 +52,6 @@ public class SchoolMajorAcceptRecordVO implements Serializable {
     /** 录取率 */
     private String acceptRate;
 
-    public String getAcceptRate() {
-        return acceptRate;
-    }
-
-    public void setAcceptRate(String acceptRate) {
-        this.acceptRate = acceptRate;
-    }
-
-    public Long getLinkId() {
-        return linkId;
-    }
-
-    public void setLinkId(Long linkId) {
-        this.linkId = linkId;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public BigDecimal getReference() {
-        return reference;
-    }
-
-    public void setReference(BigDecimal reference) {
-        this.reference = reference;
-    }
-
-    public Integer getIsReference() {
-        return isReference;
-    }
-
-    public void setIsReference(Integer isReference) {
-        this.isReference = isReference;
-    }
-
-    public String getMajorGroup() {
-        return majorGroup;
-    }
-
-    public void setMajorGroup(String majorGroup) {
-        this.majorGroup = majorGroup;
-    }
-
     public Long getSchoolAcceptId() {
         return schoolAcceptId;
     }
@@ -105,6 +60,14 @@ public class SchoolMajorAcceptRecordVO implements Serializable {
         this.schoolAcceptId = schoolAcceptId;
     }
 
+    public String getMajorCode() {
+        return majorCode;
+    }
+
+    public void setMajorCode(String majorCode) {
+        this.majorCode = majorCode;
+    }
+
     public String getMajorName() {
         return majorName;
     }
@@ -153,16 +116,71 @@ public class SchoolMajorAcceptRecordVO implements Serializable {
         this.acceptRuleStr = acceptRuleStr;
     }
 
+    public String getMajorGroup() {
+        return majorGroup;
+    }
+
+    public void setMajorGroup(String majorGroup) {
+        this.majorGroup = majorGroup;
+    }
+
+    public BigDecimal getReference() {
+        return reference;
+    }
+
+    public void setReference(BigDecimal reference) {
+        this.reference = reference;
+    }
+
+    public Integer getIsReference() {
+        return isReference;
+    }
+
+    public void setIsReference(Integer isReference) {
+        this.isReference = isReference;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Long getLinkId() {
+        return linkId;
+    }
+
+    public void setLinkId(Long linkId) {
+        this.linkId = linkId;
+    }
+
+    public String getAcceptRate() {
+        return acceptRate;
+    }
+
+    public void setAcceptRate(String acceptRate) {
+        this.acceptRate = acceptRate;
+    }
+
     @Override
     public String toString() {
         return "SchoolMajorAcceptRecordVO{" +
                 "schoolAcceptId=" + schoolAcceptId +
+                ", majorCode='" + majorCode + '\'' +
                 ", majorName='" + majorName + '\'' +
                 ", acceptNum=" + acceptNum +
                 ", acceptLowest=" + acceptLowest +
                 ", acceptYear='" + acceptYear + '\'' +
                 ", acceptRuleId=" + acceptRuleId +
                 ", acceptRuleStr='" + acceptRuleStr + '\'' +
+                ", majorGroup='" + majorGroup + '\'' +
+                ", reference=" + reference +
+                ", isReference=" + isReference +
+                ", schoolId=" + schoolId +
+                ", linkId=" + linkId +
+                ", acceptRate='" + acceptRate + '\'' +
                 '}';
     }
 }

ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptMapper.xml

@@ -43,6 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 ms.school_name schoolName,
                 mar.rule_str ruleStr,
                 mb.batch_name batchName,
+                ml.major_code majorCode,
                 ml.major_name majorName,
                 msa.subject_type subjectType,
                 msa.reference reference,
@@ -265,8 +266,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where del_flag = '0' and is_reference = 1
     </select>
 
-    <select id="selectSchoolMajorRecordList" resultType="SchoolMajorAcceptRecordVO">
+    <select id="selectSchoolMajorRecordList" resultType="com.ruoyi.mall.domain.Vo.SchoolMajorAcceptRecordVO">
         select msa.school_accept_id  schoolAcceptId,
+               mlms.major_code majorCode,
                mlms.major_name majorName,
                msa.accept_num acceptNum,
                msa.accept_lowest acceptLowest,

ruoyi-system/src/main/resources/mapper/mall/MallSchoolAcceptRecordMapper.xml

@@ -284,7 +284,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and del_flag = '0'
         and subject_type = #{subjectType}
         and accept_lowest is not null
-        and accept_year not in ('2024')
         order by accept_year desc, accept_lowest asc limit 1000) temp
         group by temp.acceptYear
         order by temp.acceptYear desc

ruoyi-ui/src/views/mall/mallMemberUser/index.vue

@@ -364,7 +364,7 @@
 
     <!--小程序图数据-->
     <el-dialog title="小程序图" :visible.sync="openMemberBanner" width="1000px" append-to-body>
-      <mall-member-banner :member-user-id="memberUserId" :key="memberUserId" />
+      <mall-member-banner :memberUserId="memberUserId" :key="memberUserId" />
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="diaCancel">确 定</el-button>
       </div>
@@ -424,6 +424,7 @@ export default {
       title: "",
       // 是否显示弹出层
       open: false,
+      memberUserId: undefined,
       // 查询参数
       queryParams: {
         pageNum: 1,