Merge branch 'feat-sharing-20220216'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/ApiController.java

@@ -1148,11 +1148,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);
 	}
 
 
@@ -1294,11 +1295,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);
 	}
 
 
@@ -2428,6 +2430,7 @@ public class ApiController {
 				}
 				map.put("score", wmTask.getScore());
 				map.put("shareId", wmWkArticleShare.getArctileId());
+				map.put("remark", wmWkArticleShare.getTemp1());
 
 			}
 
@@ -3324,10 +3327,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;
@@ -3422,6 +3426,18 @@ public class ApiController {
 				wmWkArticleShare.setCreateTime(LocalDateTime.now());
 				wmWkArticleShare.setArctileId(id);
 
+				// if ("open".equals(type)){
+				// 	List<WmWkArticleShare> list = wmWkArticleShareService.list(Wrappers.<WmWkArticleShare>lambdaQuery()
+				// 			.eq(WmWkArticleShare::getArctileId, id)
+				// 			.isNull(WmWkArticleShare::getOpenUser));
+				// 	if (CollUtil.isNotEmpty(list)){
+				// 		int index = (int) (Math.random() * list.size());
+				// 		remark = list.get(index).getTemp1();
+				// 	}
+				// }
+
+				wmWkArticleShare.setTemp1(remark);
+
 				WmTask wmTask = new WmTask();
 				log.info("获取积分包ID：{}", tWmScorePackage.getId());
 				// 根据任务类型获取积分值