Merge branch 'orderShare' of http://git.yoho.cn/yoho30/yohobuy-activity into orderShare

@@ -10,6 +10,7 @@ public class OrderShareBO extends OrderShareActivityBO{
 //	private Integer sharedNum;//已分享次数
 //	private Integer activityStatus;//1-活动未开始 2-活动中 3-活动已结束 4-活动不存在
 
+	private String shareUrl;
 	public int getFlag() {
 		return flag;
 	}
@@ -17,6 +18,14 @@ public class OrderShareBO extends OrderShareActivityBO{
 	public void setFlag(int flag) {
 		this.flag = flag;
 	}
+
+	public String getShareUrl() {
+		return shareUrl;
+	}
+
+	public void setShareUrl(String shareUrl) {
+		this.shareUrl = shareUrl;
+	}
 	
 
 }

@@ -42,7 +42,7 @@ public class OrderShareController {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(params = "methods=app.activity.getActivityInfo")
+	@RequestMapping(params = "method=app.activity.getActivityInfo")
 	@ResponseBody
 	public ApiResponse getActivityInfo() {
 		logger.info("getActivityInfo");

@@ -63,6 +63,9 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 	// 老用户领券限制
 	@Value("${orderShare.recevied.maxNum}")
 	private int orderShareOldUserLimit;
+	
+	@Value("${orderShare.shareUrl}")
+	private String shareUrl;
 
 	@Override
 	public OrderShareActivityBO getActivityInfoById() {
@@ -154,6 +157,7 @@ public class OrderShareActivityServiceImpl implements IOrderShareActivityService
 		}
 		bo = OrderShareActivityConvert.db2boResponse(activitydb);
 		bo.setFlag(1);
+		bo.setShareUrl(shareUrl+"?ordercode="+ordercode+"&uid="+uid);
 		log.info("getShareInfo result is {}",bo);
 		return bo;
 	}

@@ -56,4 +56,5 @@ sendSMS.password=7jVEde87bLffoTnt6tGxmw==
 cocacola.wechat.share.url=http://testservice.yoho.cn/activity/cocacola/html/index1.html
 
 orderShare.maxNum=3
-orderShare.recevied.maxNum=5
\ No newline at end of file
+orderShare.recevied.maxNum=5
+orderShare.shareUrl=coupon/index
\ No newline at end of file