限定排队

@@ -30,6 +30,11 @@ public class DrawlineActivity extends BaseModel {
     private Integer updateTime;
     
     private Integer numberLimit;
+    
+    /**
+     * 适用的平台类型 0：有货线上 1：有货线下店
+     */
+    private Integer platformType;
 
     public Integer getId() {
         return id;
@@ -126,4 +131,14 @@ public class DrawlineActivity extends BaseModel {
     public void setNumberLimit(Integer numberLimit) {
         this.numberLimit = numberLimit;
     }
+
+	public Integer getPlatformType() {
+		return platformType;
+	}
+
+	public void setPlatformType(Integer platformType) {
+		this.platformType = platformType;
+	}
+    
+    
 }
\ No newline at end of file

@@ -13,10 +13,11 @@
 		<result column="create_time" property="createTime" jdbcType="INTEGER" />
 		<result column="update_time" property="updateTime" jdbcType="INTEGER" />
 		<result column="number_limit" property="numberLimit" jdbcType="INTEGER" />
+		<result column="platform_type" property="platformType" jdbcType="INTEGER" />
 	</resultMap>
 	<sql id="Base_Column_List">
 		id, activity_name, begin_time, end_time, top_banner, background_style,
-		activity_desc, status, create_time, update_time, number_limit
+		activity_desc, status, create_time, update_time, number_limit, platform_type
 	</sql>
 	<select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer">
 		select

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.yoho</groupId>
         <artifactId>yoho-starter</artifactId>
-        <version>1.3.7-SNAPSHOT</version>
+        <version>1.3.8-SNAPSHOT</version>
     </parent>
 
 	<groupId>com.yoho.dsf</groupId>

@@ -33,6 +33,8 @@ public class ActivitySettingServiceImpl implements IActivitySettingService {
 	private Logger logger = LoggerFactory.getLogger(ActivitySettingServiceImpl.class);
 
 	private static final String DATE_TIME_FORMAT = "yyyy.MM.dd HH:mm";
+	
+	private static final int PLATFORM_TYPE_OFFLINESHOP = 1;
 
 	@Autowired
 	private IDrawlineActivityDAO drawlineActivityDAO;
@@ -142,6 +144,11 @@ public class ActivitySettingServiceImpl implements IActivitySettingService {
 			rspBO.setIsEnd(1);
 		}
 		
+		rspBO.setPlatformType(activity.getPlatformType());
+		if(rspBO.getIsEnd() == 1 && activity.getPlatformType().equals(PLATFORM_TYPE_OFFLINESHOP)){
+			rspBO.setOfflineShopTip("门店已开奖，详情请看活动说明");
+		}
+		
 		rspBO.setPrizeType(prizeSetting.getPrizeType());
 		rspBO.setTopBanner(ImagesHelper.template(activity.getTopBanner(), "activity", 1));
 		if (StringUtils.isNotEmpty(bgStyle)) {