添加好过滤

 package com.yoho.activity.common.vo;
 
-public class UserShareHistoryVO {
+import com.yoho.service.model.activity.BaseBO;
 
+public class UserShareHistoryVO extends BaseBO {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4391918739808038595L;
 	private String ordercode;
 	private int uid;
+	private String client_type;
+	public String getClient_type() {
+		return client_type;
+	}
+	public void setClient_type(String client_type) {
+		this.client_type = client_type;
+	}
 	public String getOrdercode() {
 		return ordercode;
 	}

@@ -15,8 +15,6 @@ import com.yoho.activity.common.bo.OrderShareBO;
 import com.yoho.activity.common.vo.UserShareHistoryVO;
 import com.yoho.activity.service.IOrderShareActivityService;
 import com.yoho.activity.service.IUserShareHistoryService;
-import com.yoho.error.ServiceError;
-import com.yoho.error.exception.ServiceException;
 import com.yoho.service.model.activity.drawline.response.DrawOrderShareCouponRespBO;
 
 /**
@@ -69,7 +67,7 @@ public class OrderShareController {
 			data.setReturnMsg("参数输入有误");
 			return new ApiResponse.ApiResponseBuilder().code(200).data(data).message("参数输入有误").build();
 		}
-		data = orderShareActivityService.getShareInfo(request.getOrdercode(), request.getUid());
+		data = orderShareActivityService.getShareInfo(request.getOrdercode(), request.getUid(), request.getClient_type());
 		return new ApiResponse(data);
 	}
 

@@ -19,7 +19,7 @@ public interface IOrderShareActivityService {
 	 * @param activityId
 	 * @return
 	 */
-	public OrderShareBO getShareInfo(String ordercode,int uid);
+	public OrderShareBO getShareInfo(String ordercode,int uid, String client_type);
 
 	/**
 	 * 发送订单分享优惠码

@@ -114,7 +114,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 	}
 
 	@Override
-	public OrderShareBO getShareInfo(String ordercode, int uid) {
+	public OrderShareBO getShareInfo(String ordercode, int uid, String client_type) {
 
 		log.info("getShareInfo params is ordercode={},uid={}", ordercode, uid);
 		// 1、查询此活动
@@ -130,7 +130,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 		}
 		bo.setH5Title(activitydb.getH5Title());
 		bo.setActivityEndPic(activitydb.getActivityEndPic());
-		if (activitydb.getIsShowPic().equals(0)) {
+		if (!"h5".equals(client_type) && activitydb.getIsShowPic().equals(0)) {
 			// 不显示APP内弹框，即活动作废
 			log.warn("activity is disabled,params is ordercode={},uid={},flag=6",ordercode,uid);
 			bo.setFlag(6);