Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg

framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
 import cn.lili.modules.goods.entity.dto.GoodsOperationDTO;
+import cn.lili.modules.goods.entity.enums.GoodsAuthEnum;
 import cn.lili.modules.goods.entity.enums.GoodsStatusEnum;
 import cn.lili.modules.goods.entity.enums.GoodsTypeEnum;
 import cn.lili.mybatis.BaseEntity;
@@ -107,6 +108,9 @@ public class Goods extends BaseEntity {
     @ApiModelProperty(value = "运费模板id")
     private String templateId;
 
+    /**
+     * @see GoodsAuthEnum
+     */
     @ApiModelProperty(value = "审核状态")
     private String authFlag;
 

framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
+import cn.lili.modules.goods.entity.enums.GoodsWordsTypeEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -41,7 +42,7 @@ public class GoodsWords extends BaseEntity {
     private String abbreviate;
 
     /**
-     * 类型
+     * @see  GoodsWordsTypeEnum
      */
     @ApiModelProperty(value = "类型")
     private String type;

framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.goods.entity.dos;
 
+import cn.lili.modules.goods.entity.enums.StudioStatusEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -88,6 +89,9 @@ public class Studio extends BaseEntity {
     @ApiModelProperty(value = "推荐直播间")
     private boolean recommend;
 
+    /**
+     * @see StudioStatusEnum
+     */
     @ApiModelProperty(value = "直播间状态")
     private String  status;
 }

framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java

@@ -37,7 +37,7 @@ public enum NoticeMessageParameterEnum {
      */
     CANCEL_REASON("cancel_reason", "取消原因"),
     /**
-     * 取消原因
+     * 金额
      */
     PRICE("price", "金额");
 

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java

@@ -12,6 +12,7 @@ import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
 import cn.lili.modules.order.order.entity.enums.*;
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -78,6 +79,9 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "第三方付款流水号")
     private String receivableNo;
 
+    /**
+     * @see  PaymentMethodEnum
+     */
     @ApiModelProperty(value = "支付方式")
     private String paymentMethod;
 

framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java

@@ -1,6 +1,7 @@
 package cn.lili.modules.order.order.entity.dos;
 
 import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -113,6 +114,9 @@ public class StoreFlow extends BaseIdEntity {
     @ApiModelProperty(value = "第三方交易流水号")
     private String transactionId;
 
+    /**
+     * @see  PaymentMethodEnum
+     */
     @ApiModelProperty(value = "支付方式名称")
     private String paymentName;
 

framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java

@@ -35,6 +35,9 @@ public class Trade extends BaseEntity {
     @ApiModelProperty(value = "买家用户名")
     private String memberName;
 
+    /**
+     * @see PayStatusEnum
+     */
     @ApiModelProperty(value = "支付方式")
     private String paymentMethod;
 

framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.payment.entity;
 
+import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
 import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -48,6 +49,9 @@ public class RefundLog extends BaseIdEntity {
     @ApiModelProperty(value = "是否已退款")
     private Boolean isRefund;
 
+    /**
+     * @see  PaymentMethodEnum
+     */
     @ApiModelProperty(value = "退款方式")
     private String paymentName;
 

framework/src/main/java/cn/lili/modules/wallet/entity/dos/MemberWithdrawApply.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.wallet.entity.dos;
 
+import cn.lili.modules.wallet.entity.enums.WithdrawStatusEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -28,6 +29,9 @@ public class MemberWithdrawApply extends BaseEntity {
     @ApiModelProperty(value = "申请提现金额")
     private Double applyMoney;
 
+    /**
+     * @see WithdrawStatusEnum
+     */
     @ApiModelProperty(value = "提现状态")
     private String applyStatus;
 

framework/src/main/java/cn/lili/modules/wechat/entity/dos/WechatMessage.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.wechat.entity.dos;
 
+import cn.lili.modules.order.order.entity.enums.OrderStatusEnum;
 import cn.lili.mybatis.BaseEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -34,6 +35,9 @@ public class WechatMessage extends BaseEntity {
     @ApiModelProperty(value = "是否开启")
     private Boolean enable = true;
 
+    /**
+     * @see OrderStatusEnum
+     */
     @ApiModelProperty("订单状态")
     private String orderStatus;