是否显示APP内弹框

@@ -56,7 +56,7 @@ public class OrderShareController {
 	 * @param orderno
 	 * @param uid
 	 * @return flag=1可以分享,flag=2表示不存在分享活动， flag=3表示分享活动已结束， flag=4表示分享活动未开始，
-	 *         flag=5表示用户当天已达到分享最大数
+	 *         flag=5表示用户当天已达到分享最大数，flag=6表示不显示APP内弹框
 	 */
 	@RequestMapping(params = "method=app.activity.getInfoOfOrderShare")
 	@ResponseBody

@@ -89,6 +89,13 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 			bo.setFlag(2);
 			return bo;
 		}
+		
+		if (activitydb.getIsShowPic().equals(0)) {
+			// 不显示APP内弹框，即活动作废
+			log.warn("activity is disabled,params is ordercode={},uid={},flag=6",ordercode,uid);
+			bo.setFlag(6);
+			return bo;
+		}
 
 		// activityStatus：1-活动未开始 2-活动中 3-活动已结束 4-活动不存在
 		int nowtime = DateUtils.getCurrentTimeSecond();
@@ -133,6 +140,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 			Long endTime = now.getTimeInMillis() / 1000;
 			historyRequest2.setEndTime(endTime);
 			historyRequest2.setUid(uid);
+			historyRequest2.setActivityId(activitydb.getId());
 			List<UserShareHistory> sharedList = userShareHistoryDAO.selectBySelective(historyRequest2);
 			if (sharedList == null || sharedList.size() < Integer.valueOf(maxshare)) {
 				// 可分享
@@ -233,7 +241,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 			respBO.setReturnCode(Constant.ORDER_SHARE_ACTIVITY_EXPIRE);
 			respBO.setReturnMsg("活动已经过期");
 			log.warn("the acitivity is out of date, mobile: {}, activity: {}", mobile, activityInfo.getId());
-			return respBO;
+			return respBO; 
 		}		
 		
 		//3、检查手机号是否注册过