分享奖品隐藏

1、修复接口部分数据异常

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/io/request/ActivityTeacherVO.java

@@ -117,7 +117,7 @@ public class ActivityTeacherVO {
     @ApiModel(value = "分享活动老师响应", description = "分享活动老师信息")
     public static class ResponseInfo implements Serializable {
 
-        @ApiModelProperty(value = "老师编号")
+        @ApiModelProperty(value = "数据编号")
         private Long id;
         @ApiModelProperty("昵称")
         private String username;
@@ -129,5 +129,7 @@ public class ActivityTeacherVO {
         private String subjectId;
         @ApiModelProperty("声部")
         private String subjectName;
+        @ApiModelProperty(value = "老师编号")
+        private Long teacherId;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/ActivityPlanDto.java

@@ -129,7 +129,7 @@ public class ActivityPlanDto extends ActivityPlan{
 		}
 
 		public Integer getStatus() {
-			return Optional.ofNullable(status).orElse(EStatus.DISABLE.getValue());
+			return Optional.ofNullable(status).orElse(EStatus.DELETE.getValue());
 		}
 
 		public Double getDiscountPrice() {

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityEvaluationMapper.xml

@@ -145,7 +145,8 @@
         <result column="teacher_id" jdbcType="BIGINT" property="teacherId" />
     </resultMap>
     <sql id="ActivityTeacherPageInfo_Column_List">
-        t1.id_ AS teacher_id, t1.real_name_, t1.username_, t1.phone_, t2.subject_id_, <if test="record.activityId != null"> t3.id_ AS id</if>
+        t1.id_ AS teacher_id, t1.real_name_, t1.username_, t1.phone_, t2.subject_id_
+        <if test="record.activityId != null">, t3.id_</if>
     </sql>
     <sql id="ActivityTeacherPageInfo_Condition_List">
         <if test="record.id != null">

cooleshow-user/user-biz/src/main/resources/config/mybatis/ActivityRewardMapper.xml

@@ -65,9 +65,17 @@
             <if test="param.rewardName != null and param.rewardName != ''">
                 and t.reward_name_ like concat('%',#{param.rewardName},'%')
             </if>
-            <if test="param.status != null">
+            <choose>
+                <when test="param.status != null">
+                    and t.status_ = #{param.status}
+                </when>
+                <otherwise>
+                    and t.status_ > -1
+                </otherwise>
+            </choose>
+            <!--<if test="param.status != null">
                 and t.status_ = #{param.status}
-            </if>
+            </if>-->
             <if test="param.rewardClient != null and param.rewardClient != ''">
                 and INTE_ARRAY(t.reward_client_,#{param.rewardClient})
             </if>