Browse Source

Merge branch 'sit' of http://8.152.195.41:3000/alien/alien_cloud into sit

dujian 1 tháng trước cách đây
mục cha
commit
7d2b8eba25

+ 1 - 1
alien-entity/src/main/resources/mapper/storePlatform/StoreOperationalActivitySignupMapper.xml

@@ -39,7 +39,7 @@
         FROM store_operational_activity_signup
         WHERE activity_id = #{activityId}
           AND delete_flag = 0
-          AND status IN (0, 2)
+--           AND status IN (0, 2)
     </select>
 
     <select id="countApprovedByActivityId" resultType="java.lang.Integer">

+ 5 - 4
alien-store/src/main/java/shop/alien/store/service/impl/StoreStaffAuditAsyncService.java

@@ -141,11 +141,11 @@ public class StoreStaffAuditAsyncService {
                 // 收集所有失败原因
                 List<String> failureReasons = new ArrayList<>();
                 if (textImageAuditResult != null && !textImageAuditResult.isPassed()) {
-                    if (StringUtils.isNotEmpty(textImageAuditResult.getFailureReason())) {
-                        failureReasons.add("图文审核:" + textImageAuditResult.getFailureReason());
-                    } else {
+//                    if (StringUtils.isNotEmpty(textImageAuditResult.getFailureReason())) {
+//                        failureReasons.add("图文审核:" + textImageAuditResult.getFailureReason());
+//                    } else {
                         failureReasons.add("图文审核未通过");
-                    }
+//                    }
                 }
                 if (videoAuditResult != null && !videoAuditResult.isPassed()) {
                     // 业务要求:视频审核失败统一记录"视频内容违规"
@@ -153,6 +153,7 @@ public class StoreStaffAuditAsyncService {
                 }
 
                 String reason = failureReasons.isEmpty() ? "审核未通过" : String.join("; ", failureReasons);
+//                String reason = "审核未通过";
                 updateWrapper.set(StoreStaffConfig::getStatus, "2")
                              .set(StoreStaffConfig::getAuditTime, new Date())
                              .set(StoreStaffConfig::getRejectionReason, reason);