Merge branch 'dev' into 'mp-server-test'

生成盲票详情小程序码

See merge request quanshu/mp-server!1037

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserShareController.java

@@ -47,6 +47,7 @@ public class UserShareController extends BaseApiController {
 		String boxId = jsonObject.getString("boxId"); // 票组ID
 		String type = jsonObject.getString("type"); // 分享类型，1/2
 		String poster = jsonObject.getString("poster"); // 海报分享标识
+		String goodsId = jsonObject.getString("goodsId"); // 商品
 		String appId = AppSourceEnum.MSDQ.getAppId();
 		Long userId = SecurityUtils.getUserId();
 		if (UserShareVO.SHARE_TYPE_SITE.equals(type) && StringUtils.isBlank(boxId)) {
@@ -54,7 +55,7 @@ public class UserShareController extends BaseApiController {
 			String rst = wxUrlLinkService.generateUnlimitCode("", userId + "&" + type, appId);
 			return new AjaxResult(Type.SUCCESS, "", rst);
 		}
-		String rst = wxUrlLinkService.generateUnlimitCode("packagePrize/goods/index", boxId + "&" + userId + "&" + type, appId);
+		String rst = wxUrlLinkService.generateUnlimitCode("packagePrize/goods/index", boxId + "&" + userId + "&" + type + "&" + goodsId, appId);
 		if ("1".equals(poster)) {
 			rst = wxUrlLinkService.generateUnlimitCode("pages/index/index", boxId + "&" + userId + "&" + type, appId);
 		}