Aslee 3 years ago
parent
commit
add274cc53

+ 0 - 3
src/main/java/com/caimei/service/impl/AuthProductServiceImpl.java

@@ -286,9 +286,6 @@ public class AuthProductServiceImpl implements AuthProductService {
         if (auditStatus == 0 && StringUtils.isEmpty(invalidReason)) {
             return ResponseJson.error("请输入审核不通过的理由");
         }
-        if (auditStatus == 0 && StringUtils.isEmpty(invalidReason)) {
-            return ResponseJson.error("请输入审核不通过的理由");
-        }
         if (auditBy == null) {
             return ResponseJson.error("请输入审核人用户id");
         }

+ 13 - 10
src/main/resources/backup.sql

@@ -63,16 +63,7 @@ CREATE TABLE `cm_brand_auth_file` (
 
 
 # -----------------------------------------------------------------
-ALTER TABLE `cm_brand_auth`
-    DROP COLUMN `statementImage`,
-    DROP COLUMN `statementLink`,
-    DROP COLUMN `statementContent`,
-    DROP COLUMN `statementType`,
-    DROP COLUMN `agentName`,
-    DROP COLUMN `agentFlag`,
-    DROP COLUMN `securityLink`,
-    DROP COLUMN `countryId`,
-    DROP COLUMN `brandId`;
+
 
 UPDATE `cm_brand_auth` set authUserId = 2,status = 1 where id = 1;
 UPDATE `cm_brand_auth` set authUserId = 2,status = 1 where id between 3 and 55;
@@ -83,6 +74,16 @@ UPDATE `cm_brand_auth_product` set brandId = 39 where id = 2;
 UPDATE `cm_brand_auth_product` set brandId = 204 where id between 3 and 62;
 
 # ==================================正品联盟6月优化start===============================================
+ALTER TABLE `cm_brand_auth`
+    DROP COLUMN `statementLink`,
+    DROP COLUMN `statementContent`,
+    DROP COLUMN `statementType`,
+    DROP COLUMN `agentName`,
+    DROP COLUMN `agentFlag`,
+    DROP COLUMN `securityLink`,
+    DROP COLUMN `countryId`,
+    DROP COLUMN `brandId`;
+
 ALTER TABLE `cm_brand_auth`
     ADD COLUMN `auditStatus` INT NULL COMMENT '审核状态:0审核未通过,1审核通过,2待审核' AFTER `status`,
     ADD COLUMN `invalidReason` VARCHAR(255) NULL COMMENT '审核不通过原因' AFTER `auditStatus`,
@@ -97,6 +98,8 @@ ALTER TABLE `cm_brand_auth_product`
     ADD COLUMN `auditTime` DATETIME NULL COMMENT '审核时间' AFTER `auditBy`,
     CHANGE COLUMN `status` `status` INT NULL DEFAULT NULL COMMENT '上架状态:0下线,1上线,2待上线' ;
 
+update `cm_brand_auth` set auditStatus = 1, auditBy = 1, auditTime = '2021-06-01 18:17:32';
+update `cm_brand_auth_product` set auditStatus = 1, auditBy = 1, auditTime = '2021-06-01 18:17:32';
 # ==================================正品联盟6月优化end===============================================