用户，老师奖品分组

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/ActivityReward.java

@@ -87,6 +87,10 @@ public class ActivityReward implements Serializable {
     @TableField(value = "discount_price_")
     private BigDecimal discountPrice;
 
+    @ApiModelProperty("奖品分组 ")
+    @TableField(exist = false)
+    private String group;
+
     public BigDecimal getDiscountPrice() {
         return discountPrice;
     }
@@ -215,4 +219,11 @@ public class ActivityReward implements Serializable {
         this.updateBy = updateBy;
     }
 
+    public String getGroup() {
+        return group;
+    }
+
+    public void setGroup(String group) {
+        this.group = group;
+    }
 }

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

@@ -94,8 +94,29 @@
         <include refid="selectSql"/>
     </select>
 
-    <select id="getActivityReward" resultMap="BaseResultMap">
-        select ar.*
+
+    <resultMap id="ActivityRewardResultMap" type="com.yonge.cooleshow.biz.dal.entity.ActivityReward">
+        <result column="id_" property="id" />
+        <result column="activity_id_" property="activityId" />
+        <result column="reward_client_" property="rewardClient" />
+        <result column="reward_name_" property="rewardName" />
+        <result column="reward_type_" property="rewardType" />
+        <result column="reward_describe_" property="rewardDescribe" />
+        <result column="img_url_" property="imgUrl" />
+        <result column="stock_" property="stock" />
+        <result column="num_" property="num" />
+        <result column="unit_" property="unit" />
+        <result column="status_" property="status" />
+        <result column="create_time_" property="createTime" />
+        <result column="create_by_" property="createBy" />
+        <result column="update_time_" property="updateTime" />
+        <result column="update_by_" property="updateBy" />
+        <result column="discount_price_" property="discountPrice" />
+
+        <result column="group_" property="group" />
+    </resultMap>
+    <select id="getActivityReward" resultMap="ActivityRewardResultMap">
+        select ar.*, apr.group_
         from activity_plan_reward apr
         left join activity_reward ar on apr.reward_id_ = ar.id_
         where apr.activity_id_ = #{activityPlanId}