Merge branch 'feat-something-210907' into master

hnqz-common/hnqz-common-bom/pom.xml

@@ -13,14 +13,14 @@
 	<groupId>com.qunzhixinxi</groupId>
 	<artifactId>hnqz-common-bom</artifactId>
 	<packaging>pom</packaging>
-	<version>${hnqz.version}</version>
+	<version>3.9.0</version>
 	<description>hnqz 公共版本控制</description>
 
 	<properties>
 		<hnqz.version>3.9.0</hnqz.version>
 		<mybatis-plus.version>3.3.2</mybatis-plus.version>
 		<dynamic-ds.version>3.0.0</dynamic-ds.version>
-		<druid.version>1.1.21</druid.version>
+		<druid.version>1.1.22</druid.version>
 		<mysql.connector.version>8.0.20</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
 		<mp.weixin.version>3.7.0</mp.weixin.version>
@@ -98,11 +98,11 @@
 				<artifactId>hnqz-common-feign</artifactId>
 				<version>${hnqz.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.qunzhixinxi</groupId>
-				<artifactId>hnqz-common-sequence</artifactId>
-				<version>${hnqz.version}</version>
-			</dependency>
+			<!--<dependency>-->
+			<!--	<groupId>com.qunzhixinxi</groupId>-->
+			<!--	<artifactId>hnqz-common-sequence</artifactId>-->
+			<!--	<version>${hnqz.version}</version>-->
+			<!--</dependency>-->
 			<dependency>
 				<groupId>com.qunzhixinxi</groupId>
 				<artifactId>hnqz-common-swagger</artifactId>
@@ -113,11 +113,11 @@
 				<artifactId>hnqz-common-taxhelper</artifactId>
 				<version>${hnqz.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.qunzhixinxi</groupId>
-				<artifactId>hnqz-common-transaction</artifactId>
-				<version>${hnqz.version}</version>
-			</dependency>
+			<!--<dependency>-->
+			<!--	<groupId>com.qunzhixinxi</groupId>-->
+			<!--	<artifactId>hnqz-common-transaction</artifactId>-->
+			<!--	<version>${hnqz.version}</version>-->
+			<!--</dependency>-->
 			<dependency>
 				<groupId>com.qunzhixinxi</groupId>
 				<artifactId>hnqz-upms-api</artifactId>

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

@@ -2984,8 +2984,7 @@ public class ApiController {
 
 		LocalDateTime now = LocalDateTime.now();
 		int score = 0;
-		boolean autoRejectFlag = false;
-		String msg = null;
+		String msg = "";
 		WmWkAlbum wmWkAlbum = null;
 		WmWkArticle wmWkArticle = null;
 		WmScorePackageStatus scorePackageStatus = null;
@@ -3018,7 +3017,6 @@ public class ApiController {
 		// 获取分享人
 		SysUser sysUser = sysUserService.getById(shareUserId);
 
-		int displayScore = 0;
 		if (null != sysUser) {
 			UserVO userVO = sysUserService.selectUserVoById(sysUser.getUserId());
 			if (null != userVO) {
@@ -3208,14 +3206,14 @@ public class ApiController {
 					if (sum >= limit) {
 						log.warn("完成任务积分值已经超过上限，设置为0");
 						wmTask.setScore(0);
+						msg = String.format("转发类任务所得积分不得大于积分包值的%d%s",
+								new BigDecimal(value).multiply(new BigDecimal("100"))
+										.setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "%");
 					}
-					msg = String.format("转发类任务所得积分不得大于积分包值的%d%s",
-							new BigDecimal(value).multiply(new BigDecimal("100"))
-									.setScale(0, BigDecimal.ROUND_HALF_UP).intValue(), "%");
 				}
 
 				// 校验结果为0积分的自动审核不通过
-				autoRejectFlag = (displayScore = wmTask.getScore() )== 0;
+				boolean autoRejectFlag = wmTask.getScore() == 0;
 
 				wmTask.setTaskStatus(autoRejectFlag ? "4" : "2"); //任务状态
 				wmTask.setSubmitStatus(autoRejectFlag ? "1" : "0");
@@ -3282,11 +3280,6 @@ public class ApiController {
 			}
 		}
 
-		// // 正常的提示
-		// if (StringUtils.isEmpty(msg)){
-		// 	msg = displayScore == 0 ? "成功" : String.format("转发成功，获得%d积分。", displayScore);
-		// }
-
 		if ("album".equalsIgnoreCase(taskCategoryName)) {
 			if ("share".equalsIgnoreCase(type)) {
 				wmWkAlbum.setForwardNum(wmWkAlbum.getForwardNum() + 1);