Merge branch 'doubleEleven2020'

mec-biz/src/main/resources/config/mybatis/LuckDrawLogMapper.xml

@@ -12,8 +12,8 @@
 	</resultMap>
 	
 	<resultMap id="BaseResultMapExt" type="com.ym.mec.biz.dal.entity.LuckDrawLog" extends="BaseResultMap">
-		<result column="nickname_" property="user.nickname" jdbcType="VARCHAR" />
-		<result column="mobile_no_" property="user.mobileNo" jdbcType="VARCHAR" />
+		<result column="username_" property="user.username" jdbcType="VARCHAR" />
+		<result column="phone_" property="user.phone" jdbcType="VARCHAR" />
 	</resultMap>
 
 	<sql id="Base_Column_List">
@@ -98,7 +98,7 @@
 
 	<select id="queryPage" parameterType="map" resultMap="BaseResultMapExt">
 		select
-		<include refid="Base_Column_List" />,nickname_,mobile_no_
+		<include refid="Base_Column_List" />,u.username_,u.phone_
 		from (luck_draw_log l left join luck_draw_prize d on
 		l.prize_id_ = d.id_) left join sys_user u on u.id_=l.user_id_
 		<include refid="queryCondition" />

mec-biz/src/main/resources/config/mybatis/LuckDrawPrizeMapper.xml

@@ -29,6 +29,9 @@
 			<if test="rewardType != null">
 				and reward_type_ like '%' #{rewardType} '%'
 			</if>
+			<if test="groupId != null">
+				and group_id_ = #{groupId}
+			</if>
 		</where>
 	</sql>
 

mec-task/src/main/resources/logback-spring.xml

@@ -27,11 +27,11 @@
 		</encoder>
 	</appender>
 
-	<logger name="com.ym.mec" level="INFO" />
+	<logger name="com.ym.mec" level="debug" />
 
 	<!--开发环境:打印控制台 -->
 	<springProfile name="dev">
-		<root level="INFO">
+		<root level="info">
 			<appender-ref ref="stdout" />
 			<appender-ref ref="file" />
 		</root>

mec-web/src/main/java/com/ym/mec/web/controller/LuckDrawController.java

@@ -103,6 +103,9 @@ public class LuckDrawController extends BaseController {
 		oriGoods.setEnabled(luckDrawPrize.getEnabled());
 		oriGoods.setName(luckDrawPrize.getName());
 		oriGoods.setStock(luckDrawPrize.getStock());
+		oriGoods.setRewardType(luckDrawPrize.getRewardType());
+		oriGoods.setGroupId(luckDrawPrize.getGroupId());
+		oriGoods.setMemo(luckDrawPrize.getMemo());
 		Date date = new Date();
 		oriGoods.setModifyOn(date);
 		return luckDrawPrizeService.update(oriGoods) > 0 ? succeed() : failed();