违规下架

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -350,11 +350,9 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
     public Result irregularOff(SupplierItemRequestDto dto) {
         try {
             SupplierItem oldItem = supplierItemDao.findById(dto.getId());
-            if (oldItem.getIsOnSale()) {
-                return Result.failed("先下架商品");
-            }
             SupplierItem supplierItem = new SupplierItem();
             supplierItem.setId(dto.getId());
+            supplierItem.setIsOnSale(false);
             supplierItem.setIsDeleted(true);
             supplierItem.setStatus(SupplierItemEnum.StatusEnum.IRREGULAR.getCode());
             supplierItemDao.update(supplierItem);

ch-core/src/main/java/com/wwdz/ch/core/consts/DistributionEnum.java

@@ -45,44 +45,6 @@ public class DistributionEnum {
     }
 
 
-
-    /**
-     * 分销订单状态
-     */
-    public enum  RefundOrderStateEnum {
-        PROCESSING(10, "处理中"),
-        SUCCESS(100, "退款成功"),
-        FAILED(101, "退款失败"),
-        ;
-
-        private int code;
-        private String des;
-
-        RefundOrderStateEnum(int code, String des) {
-            this.code = code;
-            this.des = des;
-        }
-
-        public static String getNameByCode(int code) {
-            for (DistributionEnum.RefundOrderStateEnum refundOrderStateEnum : DistributionEnum.RefundOrderStateEnum.values()) {
-                if (code == refundOrderStateEnum.getCode()) {
-                    return refundOrderStateEnum.getDes();
-                }
-            }
-            return null;
-        }
-
-        public int getCode() {
-            return code;
-        }
-
-        public String getDes() {
-            return des;
-        }
-
-    }
-
-
     /**
      * 分销类型
      */

ch-core/src/main/java/com/wwdz/ch/core/consts/RefundOrderEnum.java

+package com.wwdz.ch.core.consts;
+
+public class RefundOrderEnum {
+
+    /**
+     * 分销订单状态
+     */
+    public enum StateEnum {
+        WAIT_REVIEW(1, "待藏家审核"),
+        WAIT_RETURN(3,"待用户寄回"),
+        PROCESSING(10, "处理中"),
+        REFUSE(20, "拒绝退款"),
+        WAIT_SIGNED(1, "待藏家收货"),
+        SUCCESS(100, "退款成功"),
+        FAILED(101, "退款失败"),
+        ;
+
+        private int code;
+        private String des;
+
+        StateEnum(int code, String des) {
+            this.code = code;
+            this.des = des;
+        }
+
+        public static String getNameByCode(int code) {
+            for (RefundOrderEnum.StateEnum stateEnum : RefundOrderEnum.StateEnum.values()) {
+                if (code == stateEnum.getCode()) {
+                    return stateEnum.getDes();
+                }
+            }
+            return null;
+        }
+
+        public int getCode() {
+            return code;
+        }
+
+        public String getDes() {
+            return des;
+        }
+
+    }
+}