|
@@ -1145,11 +1145,12 @@ public class ApiController {
|
|
|
@ApiImplicitParam(name = "openUserId", value = "获取打开人openid的授权码", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "type", value = "操作类型", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "packageId", value = "所属积分包id", dataType = "String"),
|
|
|
- @ApiImplicitParam(name = "sharePicUrl", value = "分享url", dataType = "String")
|
|
|
+ @ApiImplicitParam(name = "sharePicUrl", value = "分享url", dataType = "String"),
|
|
|
+ @ApiImplicitParam(name = "remark", value = "备注", dataType = "String")
|
|
|
})
|
|
|
@GetMapping("/shareArticleById")
|
|
|
- public R<?> shareArticleById(String articleId, String shareUserId, String openUserId, String type, String packageId, String sharePicUrl) {
|
|
|
- return shareAndReadTaskMethod(articleId, shareUserId, openUserId, type, packageId, sharePicUrl, "article");
|
|
|
+ public R<?> shareArticleById(String articleId, String shareUserId, String openUserId, String type, String packageId, String sharePicUrl, String remark) {
|
|
|
+ return shareAndReadTaskMethod(articleId, shareUserId, openUserId, type, packageId, sharePicUrl, "article", remark);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -1291,11 +1292,12 @@ public class ApiController {
|
|
|
@ApiImplicitParam(name = "openUserId", value = "获取打开人openid的授权码", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "type", value = "操作类型", dataType = "String"),
|
|
|
@ApiImplicitParam(name = "packageId", value = "所属积分包id", dataType = "String"),
|
|
|
- @ApiImplicitParam(name = "sharePicUrl", value = "分享url", dataType = "String")
|
|
|
+ @ApiImplicitParam(name = "sharePicUrl", value = "分享url", dataType = "String"),
|
|
|
+ @ApiImplicitParam(name = "remark", value = "备注", dataType = "String")
|
|
|
})
|
|
|
@GetMapping("/shareAlbumById")
|
|
|
- public R<?> shareAlbumById(String id, String shareUserId, String openUserId, String type, String packageId, String sharePicUrl) {
|
|
|
- return shareAndReadTaskMethod(id, shareUserId, openUserId, type, packageId, sharePicUrl, "album");
|
|
|
+ public R<?> shareAlbumById(String id, String shareUserId, String openUserId, String type, String packageId, String sharePicUrl, String remark) {
|
|
|
+ return shareAndReadTaskMethod(id, shareUserId, openUserId, type, packageId, sharePicUrl, "album", remark);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -2425,6 +2427,7 @@ public class ApiController {
|
|
|
}
|
|
|
map.put("score", wmTask.getScore());
|
|
|
map.put("shareId", wmWkArticleShare.getArctileId());
|
|
|
+ map.put("remark", wmWkArticleShare.getTemp1());
|
|
|
|
|
|
}
|
|
|
|
|
@@ -3271,10 +3274,11 @@ public class ApiController {
|
|
|
* @param packageId 积分包id
|
|
|
* @param sharePicUrl 分享图片链接
|
|
|
* @param taskCategoryName 任务类别名称
|
|
|
+ * @param remark 备注
|
|
|
* @return 结果
|
|
|
*/
|
|
|
private R<?> shareAndReadTaskMethod(String id, String shareUserId, String openUserId, String type, String packageId,
|
|
|
- String sharePicUrl, String taskCategoryName) {
|
|
|
+ String sharePicUrl, String taskCategoryName, String remark) {
|
|
|
|
|
|
LocalDateTime now = LocalDateTime.now();
|
|
|
int score = 0;
|
|
@@ -3368,6 +3372,7 @@ public class ApiController {
|
|
|
wmWkArticleShare.setShareType("1");
|
|
|
wmWkArticleShare.setCreateTime(LocalDateTime.now());
|
|
|
wmWkArticleShare.setArctileId(id);
|
|
|
+ wmWkArticleShare.setTemp1(remark);
|
|
|
|
|
|
WmTask wmTask = new WmTask();
|
|
|
log.info("获取积分包ID:{}", tWmScorePackage.getId());
|