Merge remote-tracking branch 'origin/master'

pom.xml

@@ -9,9 +9,9 @@
         <relativePath/>
     </parent>
     <groupId>com.dk.iboss</groupId>
-    <artifactId>iboss-dependency-common</artifactId>
+    <artifactId>dkic-dependency-common</artifactId>
     <version>3.0.0</version>
-    <name>iboss-dependency-common</name>
+    <name>dkic-dependency-common</name>
     <description>dk iboss common jar</description>
 
     <properties>

src/main/java/com/dk/common/infrastructure/constant/Constant.java

@@ -1460,4 +1460,30 @@ public class Constant {
         }
     }
 
+    public enum returnStatus {
+        OUT_REJECT_STATUS_PENDING_REVIEW("退货状态-待审"),
+        // 拒绝
+        OUT_REJECT_STATUS_REFUSE("退货状态-拒绝"),
+        // 冲正
+        OUT_REJECT_STATUS_RIGHTING("退货状态-冲正"),
+        // 通过
+        OUT_REJECT_STATUS_ADOPT("退货状态-通过");
+
+        private String name;
+
+        // get set 方法
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        // 构造方法
+        returnStatus(String name) {
+            this.name = name;
+        }
+    }
+
 }

src/main/java/com/dk/common/service/BaseService.java

@@ -141,7 +141,7 @@ public abstract class BaseService<T> extends ServiceImpl<com.baomidou.mybatisplu
                     }
                 })
                 .collect(Collectors.toList());
-        return super.update(new UpdateWrapper<T>().set(String.valueOf(PojoConfig.VALUES.get("validKey")), PojoConfig.VALUES.get("unValid")).in(getPrimaryKey(), uuidList).eq(String.valueOf(PojoConfig.VALUES.get("validKey")), PojoConfig.VALUES.get("isValid"))) ?
+        return super.update(new UpdateWrapper<T>().set(String.valueOf(PojoConfig.VALUES.get("validKey")), PojoConfig.VALUES.get("isValid")).in(getPrimaryKey(), uuidList).eq(String.valueOf(PojoConfig.VALUES.get("validKey")), PojoConfig.VALUES.get("unValid"))) ?
                 ResponseResultUtil.success() : ResponseResultUtil.error(ResponseCodeEnum.ENABLE_FAIL);
 //        return ResponseResultUtil.success(SqlHelper.retBool(getRepository().disableBatch(ids)));
     }