yonge 4 lat temu
rodzic
commit
1129e2a219

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

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

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

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

+ 3 - 0
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.setEnabled(luckDrawPrize.getEnabled());
 		oriGoods.setName(luckDrawPrize.getName());
 		oriGoods.setName(luckDrawPrize.getName());
 		oriGoods.setStock(luckDrawPrize.getStock());
 		oriGoods.setStock(luckDrawPrize.getStock());
+		oriGoods.setRewardType(luckDrawPrize.getRewardType());
+		oriGoods.setGroupId(luckDrawPrize.getGroupId());
+		oriGoods.setMemo(luckDrawPrize.getMemo());
 		Date date = new Date();
 		Date date = new Date();
 		oriGoods.setModifyOn(date);
 		oriGoods.setModifyOn(date);
 		return luckDrawPrizeService.update(oriGoods) > 0 ? succeed() : failed();
 		return luckDrawPrizeService.update(oriGoods) > 0 ? succeed() : failed();