提交

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/constant/ShopConstants.java

@@ -27,7 +27,7 @@ public interface ShopConstants {
 	/**
 	 * redis订单收货key
 	 */
-	String REDIS_ORDER_OUTTIME_UNCONFIRM = "order:unconfirm:";
+	String REDIS_ORDER_OUTTIME_UNCONFIRM = "order-unconfirm-queue";
 
 	/**
 	 * redis拼团key

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/enums/DeletedEnum.java

@@ -0,0 +1,32 @@
+package co.yixiang.yshop.framework.common.enums;
+
+import co.yixiang.yshop.framework.common.core.IntArrayValuable;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+/**
+ * 逻辑删除枚举
+ *
+ * @author yshop
+ */
+@Getter
+@AllArgsConstructor
+public enum DeletedEnum  {
+
+    NO(false, "默认"),
+    YES(true, "已逻辑删除");
+
+
+    /**
+     * 状态值
+     */
+    private final Boolean status;
+    /**
+     * 状态名
+     */
+    private final String name;
+
+
+}

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/enums/OrderInfoEnum.java

@@ -18,48 +18,51 @@ import java.util.stream.Stream;
 @AllArgsConstructor
 public enum OrderInfoEnum {
 
-	STATUS_NE1(-1,"申请退款"),
-	STATUS_NE2(-2,"退款成功"),
-	STATUS_0(0,"默认"),
-	STATUS_1(1,"待收货"),
-	STATUS_2(2,"已收货"),
-	STATUS_3(3,"已完成"),
+	STATUS_APPLY_REFUND(-1,"申请退款"),
+	STATUS_REFUND_SUCCESS(-2,"退款成功"),
+	STATUS_DEFAULT(0,"默认"),
+	STATUS_WAIT_RECEIVED(1,"待收货"),
+	STATUS_RECEIVED(2,"已收货"),
+	STATUS_FINISHED(3,"已完成"),
 
-	PAY_STATUS_0(0,"未支付"),
-	PAY_STATUS_1(1,"已支付"),
+	PAY_STATUS_UNPAID(0,"未支付"),
+	PAY_STATUS_HAVE_PAID(1,"已支付"),
 
-	REFUND_STATUS_0(0,"正常"),
-	REFUND_STATUS_1(1,"退款中"),
-	REFUND_STATUS_2(2,"已退款"),
+	REFUND_STATUS_NORMAL(0,"正常"),
+	REFUND_STATUS_BEING_REFUNDED(1,"退款中"),
+	REFUND_STATUS_HAVE_REFUNDED(2,"已退款"),
 
-	BARGAIN_STATUS_1(1,"参与中"),
-	BARGAIN_STATUS_2(2,"参与失败"),
-	BARGAIN_STATUS_3(3,"参与成功"),
+	BARGAIN_STATUS_ONGOING(1,"参与中"),
+	BARGAIN_STATUS_FAIL(2,"参与失败"),
+	BARGAIN_STATUS_SUCCESS(3,"参与成功"),
 
-	PINK_STATUS_1(1,"进行中"),
-	PINK_STATUS_2(2,"已完成"),
-	PINK_STATUS_3(3,"未完成"),
+	PINK_STATUS_ONGOING(1,"进行中"),
+	PINK_STATUS_FINISHED(2,"已完成"),
+	PINK_STATUS_UNFINISHED(3,"未完成"),
 
-	PINK_REFUND_STATUS_0(0,"拼团正常"),
-	PINK_REFUND_STATUS_1(1,"拼团已退款"),
+	PINK_REFUND_STATUS_NORMAL(0,"拼团正常"),
+	PINK_REFUND_STATUS_REFUNDED(1,"拼团已退款"),
 
-	CANCEL_STATUS_0(0,"正常"),
-	CANCEL_STATUS_1(1,"已取消"),
+	CANCEL_STATUS_NORMAL(0,"正常"),
+	CANCEL_STATUS_CANCELED(1,"已取消"),
 
-	CONFIRM_STATUS_0(0,"正常"),
-	CONFIRM_STATUS_1(1,"确认"),
+	CONFIRM_STATUS_NORMAL(0,"正常"),
+	CONFIRM_STATUS_CONFIRM(1,"确认"),
 
-	PAY_CHANNEL_0(0,"公众号/H5支付渠道"),
-	PAY_CHANNEL_1(1,"小程序支付渠道"),
+	PAY_CHANNEL_PUBLIC_ACCOUNT_H5(0,"公众号/H5支付渠道"),
+	PAY_CHANNEL_MINI_PROGRAM(1,"小程序支付渠道"),
 
 
-	SHIPPIING_TYPE_1(1,"快递"),
-	SHIPPIING_TYPE_2(2,"门店自提");
+	NO(0,"否"),
+	YES(1,"是"),
+
+	SHIPPING_TYPE_DELIVERY(1,"快递"),
+	SHIPPING_TYPE_STORE_PICKUP(2,"门店自提");
 
 
 
-	private Integer value;
-	private String desc;
+	private final Integer value;
+	private final String desc;
 
 	public static OrderInfoEnum toType(int value) {
 		return Stream.of(OrderInfoEnum.values())

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/enums/ShopCommonEnum.java

@@ -1,73 +1,69 @@
-package co.yixiang.yshop.framework.common.enums;
-
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @author hupeng
- * 商城常用枚举
- */
-@Getter
-@AllArgsConstructor
-public enum ShopCommonEnum {
-
-    STORE_MODE_1(1,"本地存储"),
-    STORE_MODE_2(2,"云存储"),
-
-    ENABLE_1(1,"开启"),
-    ENABLE_2(2,"关闭"),
-
-    EXTRACT_MINUS_1(-1,"提现未通过"),
-    EXTRACT_0(0,"提现审核中"),
-    EXTRACT_1(1,"提现已完成"),
-
-    IS_FINISH_0(0,"未完成"),
-    IS_FINISH_1(1,"已完成"),
-
-    IS_FOREVER_0(0,"不是永久"),
-    IS_FOREVER_1(1,"永久"),
-
-    AGREE_1(1,"同意"),
-    AGREE_2(2,"拒绝"),
-
-    IS_PERMANENT_0(0,"限制"),
-    IS_PERMANENT_1(1,"不限制"),
-
-    IS_STATUS_0(0,"否"),
-    IS_STATUS_1(1,"是"),
-
-
-    IS_PROMOTER_0(0,"默认"),
-    IS_PROMOTER_1(1,"是客服"),
-
-    IS_NEW_0(0,"默认"),
-    IS_NEW_1(1,"新品"),
-
-    IS_SUB_0(0,"不单独分佣"),
-    IS_SUB_1(1,"单独分佣"),
-
-
-    GRADE_0(0,"一级推荐人"),
-    GRADE_1(1,"二级推荐人"),
-
-    REPLY_0(0,"未回复"),
-    REPLY_1(1,"已回复"),
-
-    ADD_1(1,"增加"),
-    ADD_2(2,"减少"),
-
-    DELETE_0(0,"未删除"),
-    DELETE_1(1,"已删除"),
-
-    SHOW_0(0,"不显示"),
-    SHOW_1(1,"显示"),
-
-    DEFAULT_0(0,"不是默认"),
-    DEFAULT_1(1,"默认");
-
-
-
-
-    private Integer value;
-    private String desc;
-}
+package co.yixiang.yshop.framework.common.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author hupeng
+ * 商城常用枚举
+ */
+@Getter
+@AllArgsConstructor
+public enum ShopCommonEnum {
+
+    STORE_MODE_LOCAL(1,"本地存储"),
+    STORE_MODE_CLOUD(2,"云存储"),
+
+    ENABLE(1,"开启"),
+    DISABLE(2,"关闭"),
+
+    EXTRACT_MINUS_NOT_PASS(-1,"提现未通过"),
+    EXTRACT_UNDER_REVIEW(0,"提现审核中"),
+    EXTRACT_FINISHED(1,"提现已完成"),
+
+    UNFINISHED(0,"未完成"),
+    FINISHED(1,"已完成"),
+
+    NOT_FOREVER(0,"不是永久"),
+    FOREVER(1,"永久"),
+
+    AGREE(1,"同意"),
+    REFUSED(2,"拒绝"),
+
+    LIMIT(0,"限制"),
+    UN_LIMIT(1,"不限制"),
+
+    NO(0,"否"),
+    YES(1,"是"),
+
+    DEFAULT(0,"默认"),
+    NEW(1,"新品"),
+
+    IS_SUB_0(0,"不单独分佣"),
+    IS_SUB_1(1,"单独分佣"),
+
+
+    GRADE_ONE(0,"一级推荐人"),
+    GRADE_TWO(1,"二级推荐人"),
+
+    UN_REPLY(0,"未回复"),
+    REPLIED(1,"已回复"),
+
+    ADD_1(1,"增加"),
+    ADD_2(2,"减少"),
+
+    DELETE_0(0,"未删除"),
+    DELETE_1(1,"已删除"),
+
+    NO_SHOW(0,"不显示"),
+    SHOW(1,"显示"),
+
+    NON_DEFAULT(0,"不是默认"),
+    IS_DEFAULT(1,"默认");
+
+
+
+
+    private final Integer value;
+    private final String desc;
+}

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/params/QueryParam.java

@@ -16,16 +16,16 @@ import java.io.Serializable;
 public abstract class QueryParam implements Serializable{
     private static final long serialVersionUID = -3263921252635611410L;
 
-    @Schema(description = "页码,默认为1", required = true)
+    @Schema(description = "页码,默认为1", requiredMode = Schema.RequiredMode.REQUIRED)
 	private Integer page =1;
 
-    @Schema(description = "页大小,默认为10", required = true)
+    @Schema(description = "页大小,默认为10", requiredMode = Schema.RequiredMode.REQUIRED)
 	private Integer limit = 10;
 
-    @Schema(description = "搜索字符串", required = true)
+    @Schema(description = "搜索字符串", requiredMode = Schema.RequiredMode.REQUIRED)
     private String keyword;
 
-//    @Schema(description = "当前第几页", required = true)
+//    @Schema(description = "当前第几页", requiredMode = Schema.RequiredMode.REQUIRED)
 //    public void setCurrent(Integer current) {
 //	    if (current == null || current <= 0){
 //	        this.page = 1;

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/pojo/PageParam.java

@@ -15,12 +15,12 @@ public class PageParam implements Serializable {
     private static final Integer PAGE_NO = 1;
     private static final Integer PAGE_SIZE = 10;
 
-    @Schema(description = "页码，从 1 开始", required = true,example = "1")
+    @Schema(description = "页码，从 1 开始", requiredMode = Schema.RequiredMode.REQUIRED,example = "1")
     @NotNull(message = "页码不能为空")
     @Min(value = 1, message = "页码最小值为 1")
     private Integer pageNo = PAGE_NO;
 
-    @Schema(description = "每页条数，最大值为 100", required = true, example = "10")
+    @Schema(description = "每页条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
     @NotNull(message = "每页条数不能为空")
     @Min(value = 1, message = "每页条数最小值为 1")
     @Max(value = 100, message = "每页条数最大值为 100")

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/pojo/PageResult.java

@@ -11,10 +11,10 @@ import java.util.List;
 @Data
 public final class PageResult<T> implements Serializable {
 
-    @Schema(description = "数据", required = true)
+    @Schema(description = "数据", requiredMode = Schema.RequiredMode.REQUIRED)
     private List<T> list;
 
-    @Schema(description = "总量", required = true)
+    @Schema(description = "总量", requiredMode = Schema.RequiredMode.REQUIRED)
     private Long total;
 
     public PageResult() {

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/util/date/LocalDateTimeUtils.java

@@ -6,7 +6,7 @@ import java.time.Duration;
 import java.time.LocalDateTime;
 
 /**
- * 时间工具类，用于 {@link java.time.LocalDateTime}
+ * 时间工具类，用于 {@link LocalDateTime}
  *
  * @author yshop
  */

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/util/io/IoUtils.java

@@ -7,7 +7,7 @@ import cn.hutool.core.util.StrUtil;
 import java.io.InputStream;
 
 /**
- * IO 工具类，用于 {@link cn.hutool.core.io.IoUtil} 缺失的方法
+ * IO 工具类，用于 {@link IoUtil} 缺失的方法
  *
  * @author yshop
  */

yshop-framework/yshop-common/src/main/java/co/yixiang/yshop/framework/common/util/object/PageUtils.java

@@ -3,7 +3,7 @@ package co.yixiang.yshop.framework.common.util.object;
 import co.yixiang.yshop.framework.common.pojo.PageParam;
 
 /**
- * {@link co.yixiang.yshop.framework.common.pojo.PageParam} 工具类
+ * {@link PageParam} 工具类
  *
  * @author yshop
  */