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

buyer-api/src/main/java/cn/lili/BuyerApiApplication.java

@@ -6,7 +6,6 @@ import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.task.TaskExecutor;
-import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 
@@ -17,7 +16,6 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
  * @since 2020/11/16 10:03 下午
  */
 @SpringBootApplication
-@EnableJpaAuditing
 @EnableCaching
 @EnableAsync
 public class BuyerApiApplication {

buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java

@@ -63,7 +63,7 @@ public class ConnectBuyerWebController {
     @ApiOperation(value = "信任登录统一回调地址", hidden = true)
     @GetMapping("/callback/{type}")
     public void callBack(@PathVariable String type, AuthCallback callback, HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws IOException {
-        connectUtil.callback(type, callback,httpServletRequest, httpServletResponse);
+        connectUtil.callback(type, callback, httpServletRequest, httpServletResponse);
     }
 
     @ApiOperation(value = "信任登录响应结果获取")
@@ -90,11 +90,11 @@ public class ConnectBuyerWebController {
             @ApiImplicitParam(name = "uniAccessToken", value = "联合登陆返回的accessToken", required = true, paramType = "query")
     })
     @GetMapping("/app/login")
-    public ResultMessage<Token> unionIDLogin(ConnectAuthUser authUser, @RequestHeader("uuid") String uuid) {
+    public ResultMessage<Token> unionLogin(ConnectAuthUser authUser, @RequestHeader("uuid") String uuid) {
         try {
             return ResultUtil.data(connectService.appLoginCallback(authUser, uuid));
         } catch (Exception e) {
-            log.error("unionID登录错误",e);
+            log.error("unionID登录错误", e);
         }
         return null;
     }

buyer-api/src/main/resources/application.yml

@@ -34,11 +34,6 @@ spring:
       max-request-size: 20MB
   cache:
     type: redis
-  #JPA
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   #jackson json解析
   jackson:
     time-zone: GMT+8

buyer-api/src/test/resources/application.yml

@@ -40,10 +40,6 @@ spring:
   #amqp
   #  rabbitmq:
   #    host: 192.168.0.116
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 192.168.0.116

common-api/src/main/resources/application.yml

@@ -39,11 +39,6 @@ spring:
   #      replica-set-name: mongoreplset
   cache:
     type: redis
-
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 127.0.0.1

config/application.yml

@@ -37,10 +37,6 @@ spring:
   #      replica-set-name: mongoreplset
   cache:
     type: redis
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 192.168.0.116

consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java

@@ -217,7 +217,7 @@ public class PromotionEverydayExecute implements EveryDayExecute {
     private void addSeckill() {
         Setting setting = settingService.get(SettingEnum.SECKILL_SETTING.name());
         SeckillSetting seckillSetting = new Gson().fromJson(setting.getSettingValue(), SeckillSetting.class);
-        Seckill seckill = new Seckill(30, seckillSetting.getHours(), seckillSetting.getSeckillRule());
+        Seckill seckill = new Seckill(SeckillService.PRE_CREATION, seckillSetting.getHours(), seckillSetting.getSeckillRule());
         seckillService.saveSeckill(seckill);
     }
 

consumer/src/main/java/cn/lili/timetask/handler/impl/storerating/StoreRatingExecute.java

@@ -1,4 +1,4 @@
-package cn.lili.timetask.handler.impl.storeRating;
+package cn.lili.timetask.handler.impl.storerating;
 
 import cn.lili.common.enums.SwitchEnum;
 import cn.lili.modules.member.entity.dos.MemberEvaluation;

consumer/src/main/resources/application.yml

@@ -42,11 +42,6 @@ spring:
   #      replica-set-name: mongoreplset
   cache:
     type: redis
-
-  jpa:
-    # 自动生成表结构
-    generate-ddl: true
-    open-in-view: false
   # Redis
   redis:
     host: 127.0.0.1

framework/pom.xml

@@ -63,11 +63,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
-        <!-- JPA -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
 <!--        &lt;!&ndash; Websocket &ndash;&gt;-->
 <!--        <dependency>-->
 <!--            <groupId>org.springframework.boot</groupId>-->
@@ -102,26 +97,6 @@
             <artifactId>knife4j-spring-boot-starter</artifactId>
             <version>${knife4j.version}</version>
         </dependency>
-        <!--        <dependency>-->
-        <!--            <groupId>io.springfox</groupId>-->
-        <!--            <artifactId>springfox-swagger-ui</artifactId>-->
-        <!--            <version>${swagger-version}</version>-->
-        <!--            <exclusions>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>guava</artifactId>-->
-        <!--                    <groupId>com.google.guava</groupId>-->
-        <!--                </exclusion>-->
-        <!--                <exclusion>-->
-        <!--                    <artifactId>javassist</artifactId>-->
-        <!--                    <groupId>org.javassist</groupId>-->
-        <!--                </exclusion>-->
-        <!--            </exclusions>-->
-        <!--        </dependency>-->
-        <!--        <dependency>-->
-        <!--            <groupId>io.springfox</groupId>-->
-        <!--            <artifactId>springfox-swagger2</artifactId>-->
-        <!--            <version>${swagger-version}</version>-->
-        <!--        </dependency>-->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
             <artifactId>swagger-bootstrap-ui</artifactId>
@@ -156,22 +131,6 @@
             <artifactId>beetl</artifactId>
             <version>${beetl-version}</version>
         </dependency>
-        <!-- Minio -->
-        <dependency>
-            <groupId>io.minio</groupId>
-            <artifactId>minio</artifactId>
-            <version>${minio-version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jsr305</artifactId>
-                    <groupId>com.google.code.findbugs</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>guava</artifactId>
-                    <groupId>com.google.guava</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <!-- 阿里云核心包-->
         <dependency>
             <groupId>com.aliyun</groupId>
@@ -229,13 +188,6 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
-            <!--            <scope>test</scope>-->
-            <!--            <exclusions>-->
-            <!--                <exclusion>-->
-            <!--                    <groupId>org.junit.vintage</groupId>-->
-            <!--                    <artifactId>junit-vintage-engine</artifactId>-->
-            <!--                </exclusion>-->
-            <!--            </exclusions>-->
         </dependency>
 
         <!-- 解决版本提示问题 -->

framework/src/main/java/cn/lili/common/security/token/SecretKeyUtil.java

@@ -1,8 +1,8 @@
 package cn.lili.common.security.token;
 
-import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
 import io.jsonwebtoken.io.Decoders;
 import io.jsonwebtoken.security.Keys;
+import org.apache.commons.codec.binary.Base64;
 
 import javax.crypto.SecretKey;
 

framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java

@@ -18,7 +18,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.elasticsearch.config.AbstractElasticsearchConfiguration;
 
-import javax.annotation.Nonnull;
 import javax.annotation.PreDestroy;
 import java.io.IOException;
 import java.util.List;
@@ -40,7 +39,6 @@ public class ElasticsearchConfig extends AbstractElasticsearchConfiguration {
 
     @Override
     @Bean
-    @Nonnull
     public RestHighLevelClient elasticsearchClient() {
         RestClientBuilder restBuilder = RestClient
                 .builder(this.getHttpHosts());

framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java

@@ -1,6 +1,7 @@
 package cn.lili.modules.connect.config;
 
 import cn.lili.modules.connect.entity.dto.AuthCallback;
+import cn.lili.modules.connect.request.BaseAuthRequest;
 import com.xkcoding.http.config.HttpConfig;
 import lombok.*;
 
@@ -85,7 +86,7 @@ public class AuthConfig {
 
     /**
      * 忽略校验 {@code state} 参数，默认不开启。当 {@code ignoreCheckState} 为 {@code true} 时，
-     * {@link cn.lili.modules.connect.request.AuthDefaultRequest#login(AuthCallback)}} 将不会校验 {@code state} 的合法性。
+     * {@link BaseAuthRequest#login(AuthCallback)}} 将不会校验 {@code state} 的合法性。
      * <p>
      * 使用场景：当且仅当使用自实现 {@code state} 校验逻辑时开启
      * <p>

framework/src/main/java/cn/lili/modules/connect/entity/Connect.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.connect.entity;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -13,33 +13,19 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
 import java.util.Date;
 
 /**
  * @author Chopper
  */
 @Data
-@Entity
-@Table(name = "li_connect")
 @TableName("li_connect")
 @ApiModel(value = "联合登陆")
 @NoArgsConstructor
-public class Connect implements Serializable {
+public class Connect extends BaseIdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
 
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
@@ -48,7 +34,7 @@ public class Connect implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

framework/src/main/java/cn/lili/modules/connect/entity/ConnectConfig.java

@@ -1,49 +0,0 @@
-package cn.lili.modules.connect.entity;
-
-import cn.lili.mybatis.BaseEntity;
-import cn.lili.modules.connect.entity.enums.ConnectConfigEnum;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author Chopper
- */
-@Data
-@Entity
-@Table(name = "li_connect_config")
-@TableName("li_connect_config")
-@ApiModel(value = "联合登陆配置")
-@NoArgsConstructor
-public class ConnectConfig extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * @see cn.lili.modules.connect.entity.enums.ConnectConfigEnum
-     */
-    @ApiModelProperty(value = "配置key")
-    private String configKey;
-
-
-    @ApiModelProperty(value = "配置")
-    private String configValue;
-
-    public ConnectConfig(String configKey) {
-        this.configKey = configKey;
-        ConnectConfigEnum configEnum = ConnectConfigEnum.valueOf(configKey);
-        String[] formItems = configEnum.getForm().split(",");
-        Map<String, String> config = new HashMap<>(formItems.length);
-        for (int i = 0; i < formItems.length; i++) {
-            config.put(formItems[i], "");
-        }
-        this.configValue = config.toString();
-    }
-}

framework/src/main/java/cn/lili/modules/connect/mapper/ConnectConfigMapper.java

@@ -1,13 +0,0 @@
-package cn.lili.modules.connect.mapper;
-
-import cn.lili.modules.connect.entity.ConnectConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * 联合登陆配置数据处理层
- *
- * @author Chopper
- */
-public interface ConnectConfigMapper extends BaseMapper<ConnectConfig> {
-
-}

framework/src/main/java/cn/lili/modules/connect/request/AuthRequest.java

@@ -20,7 +20,7 @@ public interface AuthRequest {
      * 返回授权url，可自行跳转页面
      * <p>
      * 不建议使用该方式获取授权地址，不带{@code state}的授权地址，容易受到csrf攻击。
-     * 建议使用{@link AuthDefaultRequest#authorize(String)}方法生成授权地址，在回调方法中对{@code state}进行校验
+     * 建议使用{@link BaseAuthRequest#authorize(String)}方法生成授权地址，在回调方法中对{@code state}进行校验
      *
      * @return 返回授权地址
      */

framework/src/main/java/cn/lili/modules/connect/request/BaseAuthAlipayRequest.java

@@ -29,12 +29,12 @@ import com.alipay.api.response.AlipayUserInfoShareResponse;
  * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
  * @since 1.0.1
  */
-public class AuthAlipayRequest extends AuthDefaultRequest {
+public class BaseAuthAlipayRequest extends BaseAuthRequest {
 
     private final AlipayClient alipayClient;
 
 
-    public AuthAlipayRequest(AuthConfig config, Cache cache) {
+    public BaseAuthAlipayRequest(AuthConfig config, Cache cache) {
         super(config, ConnectAuthEnum.ALIPAY, cache);
         this.alipayClient = new DefaultAlipayClient(ConnectAuthEnum.ALIPAY.accessToken(), config.getClientId(), config.getClientSecret(), "json", "UTF-8", config
                 .getAlipayPublicKey(), "RSA2");

framework/src/main/java/cn/lili/modules/connect/request/BaseAuthQQRequest.java

@@ -26,9 +26,9 @@ import java.util.Map;
  * @author yangkai.shen (https://xkcoding.com)
  * @since 1.1.0
  */
-public class AuthQQRequest extends AuthDefaultRequest {
+public class BaseAuthQQRequest extends BaseAuthRequest {
 
-    public AuthQQRequest(AuthConfig config, Cache cache) {
+    public BaseAuthQQRequest(AuthConfig config, Cache cache) {
         super(config, ConnectAuthEnum.QQ, cache);
     }
 
@@ -75,7 +75,7 @@ public class AuthQQRequest extends AuthDefaultRequest {
      * 获取QQ用户的OpenId，支持自定义是否启用查询unionid的功能，如果启用查询unionid的功能，
      * 那就需要开发者先通过邮件申请unionid功能，参考链接 {@see http://wiki.connect.qq.com/unionid%E4%BB%8B%E7%BB%8D}
      *
-     * @param authToken 通过{@link AuthQQRequest#getAccessToken(AuthCallback)}获取到的{@code authToken}
+     * @param authToken 通过{@link BaseAuthQQRequest#getAccessToken(AuthCallback)}获取到的{@code authToken}
      * @return openId
      */
     private String getOpenId(AuthToken authToken) {

framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java

@@ -27,13 +27,15 @@ import java.util.List;
  * @since 1.0.0
  */
 @Slf4j
-public abstract class AuthDefaultRequest implements AuthRequest {
+public abstract class BaseAuthRequest implements AuthRequest {
+
+
     protected AuthConfig config;
     protected ConnectAuth source;
     protected Cache cache;
 
 
-    public AuthDefaultRequest(AuthConfig config, ConnectAuth connectAuth, Cache cache) {
+    public BaseAuthRequest(AuthConfig config, ConnectAuth connectAuth, Cache cache) {
         this.config = config;
         this.source = connectAuth;
         this.cache = cache;
@@ -81,7 +83,7 @@ public abstract class AuthDefaultRequest implements AuthRequest {
     }
 
     /**
-     * 处理{@link AuthDefaultRequest#login(AuthCallback)} 发生异常的情况，统一响应参数
+     * 处理{@link BaseAuthRequest#login(AuthCallback)} 发生异常的情况，统一响应参数
      *
      * @param e 具体的异常
      * @return AuthResponse

framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java

@@ -20,9 +20,9 @@ import com.alibaba.fastjson.JSONObject;
  * @author yangkai.shen (https://xkcoding.com)
  * @since 1.1.0
  */
-public class AuthWeChatPCRequest extends AuthDefaultRequest {
+public class BaseAuthWeChatPCRequest extends BaseAuthRequest {
 
-    public AuthWeChatPCRequest(AuthConfig config, Cache cache) {
+    public BaseAuthWeChatPCRequest(AuthConfig config, Cache cache) {
         super(config, ConnectAuthEnum.WECHAT_PC, cache);
     }
 

framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java

@@ -21,8 +21,8 @@ import com.alibaba.fastjson.JSONObject;
  * @author yangkai.shen (https://xkcoding.com)
  * @since 1.1.0
  */
-public class AuthWeChatRequest extends AuthDefaultRequest {
+public class BaseAuthWeChatRequest extends BaseAuthRequest {
-    public AuthWeChatRequest(AuthConfig config, Cache cache) {
+    public BaseAuthWeChatRequest(AuthConfig config, Cache cache) {
         super(config, ConnectAuthEnum.WECHAT, cache);
     }
 

framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeiboRequest.java

@@ -25,9 +25,9 @@ import com.xkcoding.http.support.HttpHeader;
  * @author yadong.zhang (yadong.zhang0415(a)gmail.com)
  * @since 1.0.0
  */
-public class AuthWeiboRequest extends AuthDefaultRequest {
+public class BaseAuthWeiboRequest extends BaseAuthRequest {
 
-    public AuthWeiboRequest(AuthConfig config, Cache cache) {
+    public BaseAuthWeiboRequest(AuthConfig config, Cache cache) {
         super(config, ConnectAuthEnum.WEIBO, cache);
     }
 

framework/src/main/java/cn/lili/modules/connect/service/ConnectConfigService.java

@@ -1,38 +0,0 @@
-package cn.lili.modules.connect.service;
-
-import cn.lili.modules.connect.entity.ConnectConfig;
-import cn.lili.modules.connect.entity.vo.ConnectConfigForm;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.List;
-
-/**
- * 联合登陆配置接口
- *
- * @author Chopper
- */
-public interface ConnectConfigService extends IService<ConnectConfig> {
-
-    /**
-     * 获取所有配置项目
-     *
-     * @return
-     */
-    List<ConnectConfigForm> listForms();
-
-    /**
-     * 获取配置详情
-     *
-     * @param key 配置关键字
-     * @return 配置参数
-     */
-    ConnectConfig getConfig(String key);
-
-    /**
-     * 保存配置
-     *
-     * @param connectConfig 联合登录配置
-     * @return 联合登录配置
-     */
-    ConnectConfig saveConfig(ConnectConfig connectConfig);
-}

framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectConfigServiceImpl.java

@@ -1,56 +0,0 @@
-package cn.lili.modules.connect.serviceimpl;
-
-import cn.lili.modules.connect.entity.ConnectConfig;
-import cn.lili.modules.connect.entity.enums.ConnectConfigEnum;
-import cn.lili.modules.connect.entity.vo.ConnectConfigForm;
-import cn.lili.modules.connect.mapper.ConnectConfigMapper;
-import cn.lili.modules.connect.service.ConnectConfigService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 联合登陆配置接口实现
- *
- * @author Chopper
- */
-@Service
-@Transactional(rollbackFor = Exception.class)
-public class ConnectConfigServiceImpl extends ServiceImpl<ConnectConfigMapper, ConnectConfig> implements ConnectConfigService {
-
-    @Override
-    public List<ConnectConfigForm> listForms() {
-
-        List<ConnectConfigForm> formList = new ArrayList<>();
-        for (int i = 0; i < ConnectConfigEnum.values().length; i++) {
-            ConnectConfigEnum enums = ConnectConfigEnum.values()[i];
-            ConnectConfigForm form = new ConnectConfigForm();
-            form.setKey(enums.name());
-            form.setName(enums.getName());
-            form.setForm(enums.getForm());
-            formList.add(form);
-        }
-
-        return formList;
-    }
-
-    @Override
-    public ConnectConfig getConfig(String configKey) {
-        QueryWrapper queryWrapper = new QueryWrapper();
-        queryWrapper.eq("config_key", configKey);
-        ConnectConfig connectConfig = this.getOne(queryWrapper);
-        if (connectConfig == null) {
-            return new ConnectConfig(configKey);
-        }
-        return connectConfig;
-    }
-
-    @Override
-    public ConnectConfig saveConfig(ConnectConfig connectConfig) {
-        return null;
-    }
-}

framework/src/main/java/cn/lili/modules/connect/serviceimpl/ConnectServiceImpl.java

@@ -339,7 +339,7 @@ public class ConnectServiceImpl extends ServiceImpl<ConnectMapper, Connect> impl
                 return JSONUtil.parseObj(result);
             }
         } catch (Exception e) {
-            log.error("解密，获取微信信息错误",e);
+            log.error("解密，获取微信信息错误", e);
         }
         throw new ServiceException(ResultCode.USER_CONNECT_ERROR);
     }

framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java

@@ -17,10 +17,10 @@ import cn.lili.modules.connect.entity.dto.AuthCallback;
 import cn.lili.modules.connect.entity.dto.AuthResponse;
 import cn.lili.modules.connect.entity.dto.ConnectAuthUser;
 import cn.lili.modules.connect.exception.AuthException;
-import cn.lili.modules.connect.request.AuthQQRequest;
+import cn.lili.modules.connect.request.BaseAuthQQRequest;
 import cn.lili.modules.connect.request.AuthRequest;
-import cn.lili.modules.connect.request.AuthWeChatPCRequest;
+import cn.lili.modules.connect.request.BaseAuthWeChatPCRequest;
-import cn.lili.modules.connect.request.AuthWeChatRequest;
+import cn.lili.modules.connect.request.BaseAuthWeChatRequest;
 import cn.lili.modules.connect.service.ConnectService;
 import cn.lili.modules.system.entity.dos.Setting;
 import cn.lili.modules.system.entity.dto.connect.QQConnectSetting;
@@ -152,7 +152,7 @@ public class ConnectUtil {
 
                 for (WechatConnectSettingItem wechatConnectSettingItem : wechatConnectSetting.getWechatConnectSettingItems()) {
                     if (wechatConnectSettingItem.getClientType().equals(ClientTypeEnum.H5.name())) {
-                        authRequest = new AuthWeChatRequest(AuthConfig.builder()
+                        authRequest = new BaseAuthWeChatRequest(AuthConfig.builder()
                                 .clientId(wechatConnectSettingItem.getAppId())
                                 .clientSecret(wechatConnectSettingItem.getAppSecret())
                                 .redirectUri(getRedirectUri(authInterface))
@@ -167,7 +167,7 @@ public class ConnectUtil {
                 WechatConnectSetting wechatConnectSetting = JSONUtil.toBean(setting.getSettingValue(), WechatConnectSetting.class);
                 for (WechatConnectSettingItem wechatConnectSettingItem : wechatConnectSetting.getWechatConnectSettingItems()) {
                     if (wechatConnectSettingItem.getClientType().equals(ClientTypeEnum.PC.name())) {
-                        authRequest = new AuthWeChatPCRequest(AuthConfig.builder()
+                        authRequest = new BaseAuthWeChatPCRequest(AuthConfig.builder()
                                 .clientId(wechatConnectSettingItem.getAppId())
                                 .clientSecret(wechatConnectSettingItem.getAppSecret())
                                 .redirectUri(getRedirectUri(authInterface))
@@ -184,7 +184,7 @@ public class ConnectUtil {
                 QQConnectSetting qqConnectSetting = JSONUtil.toBean(setting.getSettingValue(), QQConnectSetting.class);
                 for (QQConnectSettingItem qqConnectSettingItem : qqConnectSetting.getQqConnectSettingItemList()) {
                     if (qqConnectSettingItem.getClientType().equals(ClientTypeEnum.PC.name())) {
-                        authRequest = new AuthQQRequest(AuthConfig.builder()
+                        authRequest = new BaseAuthQQRequest(AuthConfig.builder()
                                 .clientId(qqConnectSettingItem.getAppId())
                                 .clientSecret(qqConnectSettingItem.getAppKey())
                                 .redirectUri(getRedirectUri(authInterface))

framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java

@@ -10,8 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
 
@@ -22,10 +20,8 @@ import javax.validation.constraints.Size;
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
 @ApiModel(value = "分销员")
 @TableName("li_distribution")
-@Table(name = "li_distribution")
 @NoArgsConstructor
 public class Distribution extends BaseEntity {
 

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java

@@ -12,8 +12,6 @@ import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -23,8 +21,6 @@ import java.util.Date;
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
-@Table(name = "li_distribution_cash")
 @TableName("li_distribution_cash")
 @ApiModel(value = "分销佣金")
 @NoArgsConstructor
@@ -48,7 +44,7 @@ public class DistributionCash extends BaseEntity {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "支付时间")
     private Date payTime;
 

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java

@@ -3,9 +3,9 @@ package cn.lili.modules.distribution.entity.dos;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.lili.modules.goods.entity.dos.GoodsSku;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -17,10 +17,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -33,22 +29,13 @@ import java.util.Map;
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
 @ApiModel(value = "分销商品")
-@Table(name = "li_distribution_goods")
 @TableName("li_distribution_goods")
 @NoArgsConstructor
-public class DistributionGoods {
+public class DistributionGoods extends BaseIdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建者", hidden = true)
@@ -56,7 +43,7 @@ public class DistributionGoods {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -73,7 +60,6 @@ public class DistributionGoods {
     private String skuId;
 
     @ApiModelProperty(value = "规格信息json", hidden = true)
-    @Column(columnDefinition = "TEXT")
     @JsonIgnore
     private String specs;
 

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java

@@ -2,6 +2,7 @@ package cn.lili.modules.distribution.entity.dos;
 
 import cn.lili.modules.distribution.entity.enums.DistributionOrderStatusEnum;
 import cn.lili.modules.order.order.entity.dos.StoreFlow;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -14,10 +15,6 @@ import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -27,19 +24,15 @@ import java.util.Date;
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
 @ApiModel(value = "分销订单")
 @TableName("li_distribution_order")
-@Table(name = "li_distribution_order")
 @NoArgsConstructor
-public class DistributionOrder {
+public class DistributionOrder extends BaseIdEntity {
 
     private static final long serialVersionUID = 501799944909496507L;
 
-    @Id
     @TableId
     @TableField
-    @Column(columnDefinition = "bigint(20)")
     @ApiModelProperty(value = "唯一标识", hidden = true)
     private String id;
 
@@ -84,7 +77,6 @@ public class DistributionOrder {
     @ApiModelProperty(value = "货品ID")
     private String skuId;
     @ApiModelProperty(value = "规格")
-    @Column(columnDefinition = "TEXT")
     private String specs;
     @ApiModelProperty(value = "图片")
     private String image;

framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java

@@ -1,17 +1,12 @@
 package cn.lili.modules.distribution.entity.dos;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import cn.lili.mybatis.BaseIdEntity;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 
 /**
  * 分销员已选择分销商品
@@ -20,21 +15,12 @@ import javax.persistence.Table;
  * @since 2020-03-14 23:04:56
  */
 @Data
-@Entity
 @ApiModel(value = "分销商已选择分销商品")
-@Table(name = "li_distribution_selected_goods")
 @TableName("li_distribution_selected_goods")
 @NoArgsConstructor
-public class DistributionSelectedGoods {
+public class DistributionSelectedGoods extends BaseIdEntity {
 
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @ApiModelProperty(value = "分销员ID")
     private String distributionId;
 

framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
 import java.util.Date;
 
 /**
@@ -23,7 +22,6 @@ public class DistributionGoodsVO {
     @ApiModelProperty(value = "商品名称")
     private String goodsName;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "规格")
     private String specs;
 
@@ -52,7 +50,7 @@ public class DistributionGoodsVO {
     private Double commission;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "添加时间")
     private Date createTime;
 

framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java

@@ -30,7 +30,7 @@ public class DistributionOrderSearchParams extends PageVO {
     @ApiModelProperty(value = "订单sn")
     private String orderSn;
 
-    @ApiModelProperty(value = "分销员ID",hidden = true)
+    @ApiModelProperty(value = "分销员ID", hidden = true)
     private String distributionId;
 
     @ApiModelProperty(value = "分销订单状态")
@@ -40,12 +40,12 @@ public class DistributionOrderSearchParams extends PageVO {
     private String storeId;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private Date startTime;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private Date endTime;
 

framework/src/main/java/cn/lili/modules/file/entity/File.java

@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 文件系统
@@ -18,8 +16,6 @@ import javax.persistence.Table;
  * @since 2020/11/26 15:35
  */
 @Data
-@Entity
-@Table(name = "li_file")
 @TableName("li_file")
 @ApiModel(value = "文件")
 public class File extends BaseEntity {

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 
 /**
@@ -17,8 +15,6 @@ import javax.validation.constraints.NotEmpty;
  * @since 2020-02-18 15:18:56
  */
 @Data
-@Entity
-@Table(name = "li_brand")
 @TableName("li_brand")
 @ApiModel(value = "商品品牌")
 public class Brand extends BaseEntity {

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

@@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
@@ -22,8 +20,6 @@ import java.util.Date;
  * @since 2020-02-18 15:18:56
  */
 @Data
-@Entity
-@Table(name = "li_category")
 @TableName("li_category")
 @ApiModel(value = "商品分类")
 @AllArgsConstructor

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

@@ -1,8 +1,8 @@
 package cn.lili.modules.goods.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -13,11 +13,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
 import java.util.Date;
 
 
@@ -28,22 +23,13 @@ import java.util.Date;
  * @since 2020-03-02 09:34:02
  */
 @Data
-@Entity
-@Table(name = "li_category_brand")
 @TableName("li_category_brand")
-@ApiModel(value = "商品分类品牌")
+@ApiModel(value = "商品分类品牌关联")
 @NoArgsConstructor
-public class CategoryBrand  implements Serializable {
+public class CategoryBrand extends BaseIdEntity {
 
     private static final long serialVersionUID = 3315719881926878L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
 
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
@@ -52,7 +38,7 @@ public class CategoryBrand  implements Serializable {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -70,8 +56,8 @@ public class CategoryBrand  implements Serializable {
     @ApiModelProperty(value = "品牌id")
     private String brandId;
 
-    public CategoryBrand(String categoryId,String brandId){
+    public CategoryBrand(String categoryId, String brandId) {
-        this.categoryId=categoryId;
+        this.categoryId = categoryId;
-        this.brandId=brandId;
+        this.brandId = brandId;
     }
 }

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

@@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -19,8 +17,6 @@ import javax.validation.constraints.NotNull;
  * @since 2020-02-26 10:34:02
  */
 @Data
-@Entity
-@Table(name = "li_category_parameter_group")
 @TableName("li_category_parameter_group")
 @ApiModel(value = "分类绑定参数组")
 public class CategoryParameterGroup extends BaseEntity {

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

@@ -9,9 +9,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 /**
  * 分类参数组关联
  *
@@ -19,8 +16,6 @@ import javax.persistence.Table;
  * @since 2020-02-26 10:34:02
  */
 @Data
-@Entity
-@Table(name = "li_category_specification")
 @TableName("li_category_specification")
 @NoArgsConstructor
 @AllArgsConstructor

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 小程序直播商品
@@ -16,10 +14,8 @@ import javax.persistence.Table;
  *
  */
 @Data
-@Entity
 @ApiModel(value = "Commodity", description = "直播商品")
 @TableName("li_commodity")
-@Table(name = "li_commodity")
 public class Commodity extends BaseEntity {
 
     @ApiModelProperty(value = "图片")

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

@@ -11,9 +11,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.Max;
 
 /**
@@ -23,8 +20,6 @@ import javax.validation.constraints.Max;
  * @since 2020-02-23 9:14:33
  */
 @Data
-@Entity
-@Table(name = "li_draft_goods")
 @TableName("li_draft_goods")
 @ApiModel(value = "草稿商品")
 @AllArgsConstructor
@@ -134,19 +129,15 @@ public class DraftGoods extends BaseEntity {
     @ApiModelProperty(value = "草稿商品保存类型")
     private String saveType;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "分类名称JSON")
     private String categoryNameJson;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "商品参数JSON")
     private String goodsParamsListJson;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "商品图片JSON")
     private String goodsGalleryListJson;
-
+ 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "sku列表JSON")
     private String skuListJson;
 

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

@@ -16,9 +16,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import java.util.Map;
 
@@ -29,8 +26,6 @@ import java.util.Map;
  * @since 2020-02-23 9:14:33
  */
 @Data
-@Entity
-@Table(name = "li_goods")
 @TableName("li_goods")
 @ApiModel(value = "商品")
 public class Goods extends BaseEntity {
@@ -198,7 +193,6 @@ public class Goods extends BaseEntity {
     private String goodsType;
 
     @ApiModelProperty(value = "商品参数json", hidden = true)
-    @Column(columnDefinition = "TEXT")
     @JsonIgnore
     private String params;
 

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

@@ -1,20 +1,14 @@
 package cn.lili.modules.goods.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.data.annotation.CreatedBy;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import java.io.Serializable;
-
 /**
  * 商品相册
  *
@@ -22,18 +16,9 @@ import java.io.Serializable;
  * @since 2020-02-23 9:14:33
  */
 @Data
-@Entity
-@Table(name = "li_goods_gallery")
 @TableName("li_goods_gallery")
 @ApiModel(value = "商品相册")
-public class GoodsGallery implements Serializable {
+public class GoodsGallery extends BaseIdEntity {
-
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
 
     @CreatedBy

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

@@ -10,9 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import java.util.Date;
 
@@ -23,8 +20,6 @@ import java.util.Date;
  * @since 2020-02-23 9:14:33
  */
 @Data
-@Entity
-@Table(name = "li_goods_sku")
 @TableName("li_goods_sku")
 @ApiModel(value = "商品sku对象")
 public class GoodsSku extends BaseEntity {
@@ -35,7 +30,6 @@ public class GoodsSku extends BaseEntity {
     private String goodsId;
 
     @ApiModelProperty(value = "规格信息json", hidden = true)
-    @Column(columnDefinition = "TEXT")
     @JsonIgnore
     private String specs;
 
@@ -80,7 +74,6 @@ public class GoodsSku extends BaseEntity {
     private String marketEnable;
 
     @ApiModelProperty(value = "商品详情")
-    @Column(columnDefinition = "TEXT")
     private String intro;
 
     @Max(value = 99999999, message = "价格不能超过99999999")
@@ -147,7 +140,6 @@ public class GoodsSku extends BaseEntity {
     private Boolean selfOperated;
 
     @ApiModelProperty(value = "商品移动端详情")
-    @Column(columnDefinition = "TEXT")
     private String mobileIntro;
 
     @ApiModelProperty(value = "商品视频")

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 
 /**
@@ -17,8 +15,6 @@ import javax.validation.constraints.NotEmpty;
  * @since: 2020/11/26 16:08
  */
 @Data
-@Entity
-@Table(name = "li_goods_unit")
 @TableName("li_goods_unit")
 @ApiModel(value = "商品计量单位")
 public class GoodsUnit extends BaseEntity {

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

@@ -7,9 +7,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 
 /**
  * 商品关键字
@@ -18,8 +15,6 @@ import javax.persistence.Table;
  * @since 2020/10/15
  */
 @Data
-@Entity
-@Table(name = "li_goods_words")
 @TableName("li_goods_words")
 @ApiModel(value = "商品关键字")
 @NoArgsConstructor

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

@@ -1,14 +1,12 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.mybatis.IdEntity;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
@@ -21,11 +19,9 @@ import javax.validation.constraints.NotNull;
  * @since 2020-02-23 9:14:33
  */
 @Data
-@Entity
-@Table(name = "li_parameters")
 @TableName("li_parameters")
 @ApiModel(value = "商品参数")
-public class Parameters extends IdEntity {
+public class Parameters extends BaseIdEntity {
 
 
 

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

@@ -1,15 +1,12 @@
 package cn.lili.modules.goods.entity.dos;
 
-import cn.lili.mybatis.IdEntity;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 
 /**
@@ -19,11 +16,9 @@ import javax.validation.constraints.NotEmpty;
  * @since 2020-02-18 15:18:56
  */
 @Data
-@Entity
-@Table(name = "li_specification")
 @TableName("li_specification")
 @ApiModel(value = "规格项")
-public class Specification extends IdEntity {
+public class Specification extends BaseIdEntity {
 
     private static final long serialVersionUID = 147792597901239486L;
 
@@ -37,7 +32,8 @@ public class Specification extends IdEntity {
     /**
      * 所属卖家 0属于平台
      * <p>
-     * 店铺自定义规格暂时废弃 2021-06-23 后续推出新配置方式
+     * 店铺自定义规格暂时废弃 2021-06-23
+     * 后续推出新配置方式
      */
     @ApiModelProperty(hidden = true)
     private String storeId;
@@ -46,7 +42,6 @@ public class Specification extends IdEntity {
      * 规格值名字
      */
     @TableField(value = "spec_value")
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "规格值名字, 《,》分割")
     private String specValue;
 

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 小程序直播间
@@ -16,10 +14,8 @@ import javax.persistence.Table;
  * @since: 2021/5/17 9:47 上午
  */
 @Data
-@Entity
 @ApiModel(value = "直播间")
 @TableName("li_studio")
-@Table(name = "li_studio")
 public class Studio extends BaseEntity {
 
     /**

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

@@ -1,17 +1,12 @@
 package cn.lili.modules.goods.entity.dos;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import cn.lili.mybatis.BaseIdEntity;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 
 /**
  * 直播商品
@@ -20,19 +15,10 @@ import javax.persistence.Table;
  * @since: 2021/5/18 5:42 下午
  */
 @Data
-@Entity
 @ApiModel(value = "直播商品")
 @TableName("li_studio_commodity")
-@Table(name = "li_studio_commodity")
 @NoArgsConstructor
-public class StudioCommodity {
+public class StudioCommodity extends BaseIdEntity {
-
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     @ApiModelProperty(value = "房间ID")
     private Integer roomId;

framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java

@@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 浏览历史
@@ -18,8 +16,6 @@ import javax.persistence.Table;
  * @since 2020/11/17 7:22 下午
  */
 @Data
-@Entity
-@Table(name = "li_foot_print")
 @TableName("li_foot_print")
 @ApiModel(value = "浏览历史")
 @NoArgsConstructor

framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.member.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -12,10 +12,6 @@ import lombok.NoArgsConstructor;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -25,23 +21,14 @@ import java.util.Date;
  * @since 2020/11/18 3:31 下午
  */
 @Data
-@Entity
 @NoArgsConstructor
 @ApiModel(value = "会员商品收藏")
 @TableName("li_goods_collection")
-@Table(name = "li_goods_collection")
+public class GoodsCollection extends BaseIdEntity {
-public class GoodsCollection {
-
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java

@@ -10,8 +10,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;
@@ -23,8 +21,6 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member")
 @TableName("li_member")
 @ApiModel(value = "会员")
 @NoArgsConstructor

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java

@@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
@@ -19,8 +17,6 @@ import javax.validation.constraints.NotEmpty;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_address")
 @TableName("li_member_address")
 @ApiModel(value = "会员地址")
 public class MemberAddress extends BaseEntity {

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java

@@ -13,8 +13,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.beans.BeanUtils;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -24,8 +22,6 @@ import javax.validation.constraints.NotNull;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_evaluation")
 @TableName("li_member_evaluation")
 @ApiModel(value = "会员商品评价")
 @NoArgsConstructor
@@ -93,11 +89,11 @@ public class MemberEvaluation extends BaseEntity {
     @ApiModelProperty(value = "评价回复图片")
     private String replyImage;
 
-    @ApiModelProperty(value = "评论是否有图片 1 有 ,0 没有")
+    @ApiModelProperty(value = "评论是否有图片 true 有 ,false 没有")
-    private boolean haveImage;
+    private Boolean haveImage;
 
-    @ApiModelProperty(value = "回复是否有图片 1 有 ,0 没有")
+    @ApiModelProperty(value = "回复是否有图片 true 有 ,false 没有")
-    private boolean haveReplyImage;
+    private Boolean haveReplyImage;
 
     @ApiModelProperty(value = "回复状态")
     private boolean replyStatus;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -17,8 +15,6 @@ import javax.validation.constraints.NotNull;
  * @since 2021/5/14 5:43 下午
  */
 @Data
-@Entity
-@Table(name = "li_member_grade")
 @TableName("li_member_grade")
 @ApiModel(value = "会员等级")
 public class MemberGrade extends BaseEntity {

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 会员站内信
@@ -16,8 +14,6 @@ import javax.persistence.Table;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_notice")
 @TableName("li_member_notice")
 @ApiModel(value = "会员站内信")
 public class MemberNotice extends BaseEntity {

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java

@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -20,55 +17,32 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_notice_log")
 @TableName("li_member_notice_log")
 @ApiModel(value = "会员消息")
 public class MemberNoticeLog extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
-    /**
+
-     * 标题
-     */
-    @Column(name = "title")
     @ApiModelProperty(value = "标题")
     private String title;
-    /**
+
-     * 消息内容
-     */
-    @Column(name = "content")
     @ApiModelProperty(value = "消息内容")
     private String content;
-    /**
+
-     * 会员id
-     */
-    @Column(name = "member_ids")
     @ApiModelProperty(value = "会员id")
     private String memberIds;
-    /**
+
-     * 管理员id
-     */
-    @Column(name = "admin_id")
     @ApiModelProperty(value = "管理员id")
     private String adminId;
-    /**
+
-     * 管理员名称
-     */
-    @Column(name = "admin_name")
     @ApiModelProperty(value = "管理员名称")
     private String adminName;
-    /**
+
-     * 发送时间
-     */
-    @Column(name = "send_time")
     @ApiModelProperty(value = "发送时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
+    @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
     private Date sendTime;
-    /**
+
-     * 发送类型
-     */
-    @Column(name = "send_type")
     @ApiModelProperty(value = "发送类型,0全站，1指定会员")
     private Integer sendType;
 

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java

@@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 会员消息
@@ -17,33 +14,27 @@ import javax.persistence.Table;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_notice_senter")
 @TableName("li_member_notice_senter")
 @ApiModel(value = "会员消息")
 public class MemberNoticeSenter extends BaseEntity {
     /**
      * 标题
      */
-    @Column(name = "title")
     @ApiModelProperty(value = "标题")
     private String title;
     /**
      * 消息内容
      */
-    @Column(name = "content")
     @ApiModelProperty(value = "消息内容")
     private String content;
     /**
      * 会员id
      */
-    @Column(name = "member_ids")
     @ApiModelProperty(value = "会员id")
     private String memberIds;
     /**
      * 发送类型
      */
-    @Column(name = "send_type")
     @ApiModelProperty(value = "发送类型,ALL 全站，SELECT 指定会员")
     private String sendType;
 

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java

@@ -1,9 +1,9 @@
 package cn.lili.modules.member.entity.dos;
 
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -13,10 +13,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -26,21 +22,12 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_points_history")
 @TableName("li_member_points_history")
 @ApiModel(value = "会员积分历史")
-public class MemberPointsHistory {
+public class MemberPointsHistory extends BaseIdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建者", hidden = true)

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java

@@ -1,5 +1,6 @@
 package cn.lili.modules.member.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -11,10 +12,6 @@ import lombok.Data;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -24,18 +21,14 @@ import java.util.Date;
  * @since 2021-03-29 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_receipt")
 @TableName("li_member_receipt")
 @ApiModel(value = "会员发票")
-public class MemberReceipt {
+public class MemberReceipt extends BaseIdEntity {
 
     private static final long serialVersionUID = -8210927482915675995L;
 
-    @Id
     @TableId
     @TableField
-    @Column(columnDefinition = "bigint(20)")
     @ApiModelProperty(value = "唯一标识", hidden = true)
     private String id;
 
@@ -70,7 +63,7 @@ public class MemberReceipt {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.member.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -11,10 +11,6 @@ import lombok.Data;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -24,24 +20,15 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_sign")
 @TableName("li_member_sign")
 @ApiModel(value = "会员签到")
-public class MemberSign {
+public class MemberSign extends BaseIdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 会员预存款
@@ -16,8 +14,6 @@ import javax.persistence.Table;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_wallet")
 @TableName("li_member_wallet")
 @ApiModel(value = "会员预存款")
 public class MemberWallet extends BaseEntity {

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

@@ -10,8 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -21,8 +19,6 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_withdraw_apply")
 @TableName("li_member_withdraw_apply")
 @ApiModel(value = "会员提现申请")
 public class MemberWithdrawApply extends BaseEntity {
@@ -44,13 +40,13 @@ public class MemberWithdrawApply extends BaseEntity {
     @ApiModelProperty(value = "审核备注")
     private String inspectRemark;
 
-    @ApiModelProperty(value="审核时间")
+    @ApiModelProperty(value = "审核时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     private Date inspectTime;
 
-    @ApiModelProperty(value="sn")
+    @ApiModelProperty(value = "sn")
     private String sn;
 
 }

framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java

@@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 会员店铺收藏
@@ -18,8 +16,6 @@ import javax.persistence.Table;
  * @since 2020/11/18 3:32 下午
  */
 @Data
-@Entity
-@Table(name = "li_store_collection")
 @TableName("li_store_collection")
 @ApiModel(value = "会员收藏")
 @NoArgsConstructor

framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java

@@ -7,8 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 会员接受消息对象
@@ -17,8 +15,6 @@ import javax.persistence.Table;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_member_message")
 @TableName("li_member_message")
 @ApiModel(value = "会员消息")
 public class MemberMessage extends BaseEntity {

framework/src/main/java/cn/lili/modules/message/entity/dos/Message.java

@@ -9,9 +9,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * 管理段发送消息对象
@@ -20,8 +17,6 @@ import javax.persistence.Transient;
  */
 
 @Data
-@Entity
-@Table(name = "li_message")
 @TableName("li_message")
 @ApiModel(value = "消息")
 public class Message extends BaseEntity {
@@ -46,12 +41,10 @@ public class Message extends BaseEntity {
     @ApiModelProperty(value = "发送客户端 商家或者会员")
     private String messageClient;
 
-    @Transient
     @TableField(exist = false)
     @ApiModelProperty(value = "发送指定用户id")
     private String[] userIds;
 
-    @Transient
     @TableField(exist = false)
     @ApiModelProperty(value = "发送指定用户名称")
     private String[] userNames;

framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java

@@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 /**
  * 通知类站内信模版对象
  *
@@ -17,8 +14,6 @@ import javax.persistence.Table;
  * @since 2020/12/8 9:46
  */
 @Data
-@Entity
-@Table(name = "li_notice_message")
 @TableName("li_notice_message")
 @ApiModel(value = "通知类消息模板")
 public class NoticeMessage extends BaseEntity {

framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java

@@ -1,23 +1,20 @@
 package cn.lili.modules.message.entity.dos;
 
-import cn.lili.mybatis.IdEntity;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
+ * 短链接/暂时只用于小程序二维码业务
  * @author Chopper
  */
 @Data
-@Entity
-@Table(name = "li_short_link")
 @TableName("li_short_link")
 @ApiModel(value = "短链接/暂时只用于小程序二维码业务")
-public class ShortLink extends IdEntity {
+public class ShortLink extends BaseIdEntity {
 
     private static final long serialVersionUID = 1L;
 

framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java

@@ -1,8 +1,8 @@
 package cn.lili.modules.message.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -11,9 +11,6 @@ import lombok.Data;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 
@@ -24,17 +21,9 @@ import java.util.Date;
  * @since 2021/1/30 4:13 下午
  */
 @Data
-@Entity
-@Table(name = "li_sms_reach")
 @TableName("li_sms_reach")
 @ApiModel(value = "短信任务")
-public class SmsReach {
+public class SmsReach extends BaseIdEntity {
-
-    @Id
-    @TableId
-    @TableField
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     @ApiModelProperty(value = "签名名称", required = true)
     private String signName;
@@ -56,7 +45,7 @@ public class SmsReach {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java

@@ -7,11 +7,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 
 /**
  * 短信签名
@@ -20,19 +15,10 @@ import javax.persistence.Table;
  * @since 2021/1/30 4:13 下午
  */
 @Data
-@Entity
-@Table(name = "li_sms_sign")
 @TableName("li_sms_sign")
 @ApiModel(value = "短信签名")
 public class SmsSign {
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @ApiModelProperty(value = "签名名称", required = true)
     private String signName;
 

framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java

@@ -1,17 +1,11 @@
 package cn.lili.modules.message.entity.dos;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import cn.lili.mybatis.BaseIdEntity;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 
 /**
  * 短信模板
@@ -20,18 +14,9 @@ import javax.persistence.Table;
  * @since 2021/1/30 4:13 下午
  */
 @Data
-@Entity
-@Table(name = "li_sms_template")
 @TableName("li_sms_template")
 @ApiModel(value = "短信模板")
-public class SmsTemplate {
+public class SmsTemplate extends BaseIdEntity {
-
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     @ApiModelProperty(value = "模板名称", required = true)
     private String templateName;

framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java

@@ -1,9 +1,9 @@
 package cn.lili.modules.message.entity.dos;
 
 import cn.lili.modules.message.entity.enums.MessageStatusEnum;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -13,30 +13,21 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.*;
 import java.util.Date;
 
 /**
  * 店铺接收消息对象
+ *
  * @author Chopper
  * @since 2021/1/30 4:13 下午
  */
 @Data
-@Entity
-@Table(name = "li_store_message")
 @TableName("li_store_message")
 @ApiModel(value = "店铺消息")
-public class StoreMessage {
+public class StoreMessage extends BaseIdEntity {
 
     private static final long serialVersionUID = 1L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建者", hidden = true)
@@ -44,7 +35,7 @@ public class StoreMessage {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -65,12 +56,10 @@ public class StoreMessage {
     private String status = MessageStatusEnum.UN_READY.name();
 
 
-    @Transient
     @TableField(exist = false)
     @ApiModelProperty(value = "消息标题")
     private String title;
 
-    @Transient
     @TableField(exist = false)
     @ApiModelProperty(value = "消息内容")
     private String content;

framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMPMessage.java

@@ -6,15 +6,11 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
-
 /**
+ * 微信小程序消息订阅
  * @author Chopper
  */
 @Data
-@Entity
-@Table(name = "li_wechat_mp_message")
 @TableName("li_wechat_mp_message")
 @ApiModel(value = "微信小程序消息订阅")
 public class WechatMPMessage extends BaseEntity {

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 微信消息
@@ -17,8 +15,6 @@ import javax.persistence.Table;
  * @since 2020/12/10 17:02
  */
 @Data
-@Entity
-@Table(name = "li_wechat_message")
 @TableName("li_wechat_message")
 @ApiModel(value = "微信消息")
 public class WechatMessage extends BaseEntity {

framework/src/main/java/cn/lili/modules/order/cart/entity/enums/RenderStepEnums.java

@@ -5,6 +5,9 @@ package cn.lili.modules.order.cart.entity.enums;
  */
 public enum RenderStepEnums {
 
+    /**
+     * 购物车渲染枚举
+     */
     CHECK_DATA("校验商品"),
     CHECKED_FILTER("选择商品过滤"),
     COUPON("优惠券价格渲染"),
@@ -18,6 +21,10 @@ public enum RenderStepEnums {
 
     private String distribution;
 
+    public String getDistribution() {
+        return distribution;
+    }
+
     RenderStepEnums(String distribution) {
         this.distribution = distribution;
     }

framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java

@@ -245,13 +245,17 @@ public class CouponRender implements CartRenderStep {
                     if (item.getGoodsSku().getId().equals(skuId)) {
 
                         PriceDetailDTO priceDetailDTO = item.getPriceDetailDTO();
+
+                        // 打折金额=商品金额*折扣/10
+                        Double discountCouponPrice = CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(),
+                                CurrencyUtil.div(coupon.getDiscount(), 10, 3));
+
                         //平台券则写入店铺承担优惠券比例
                         if (coupon.getIsPlatform()) {
-                            priceDetailDTO.setSiteCouponPrice(CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(), coupon.getDiscount()));
+                            priceDetailDTO.setSiteCouponPrice(discountCouponPrice);
                             priceDetailDTO.setSiteCouponPoint(coupon.getStoreCommission());
                         }
-                        priceDetailDTO.setCouponPrice(CurrencyUtil.add(priceDetailDTO.getCouponPrice(),
+                        priceDetailDTO.setCouponPrice(CurrencyUtil.add(priceDetailDTO.getCouponPrice(), discountCouponPrice));
-                                CurrencyUtil.mul(priceDetailDTO.getGoodsPrice(), coupon.getDiscount())));
 
                     }
                 }

framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java

@@ -144,7 +144,7 @@ public class FullDiscountRender implements CartRenderStep {
      * @return 参与满优惠的商品id
      */
     public Map<String, Double> initFullDiscountGoods(FullDiscountVO fullDiscount, List<CartSkuVO> cartSkuVOS) {
-        Map<String, Double> skuPriceDetail = new HashMap<>();
+        Map<String, Double> skuPriceDetail = new HashMap<>(16);
 
         //全品类参与
         if (fullDiscount.getNumber() == -1) {

framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java

@@ -9,6 +9,7 @@ import cn.lili.modules.order.cart.entity.vo.CartSkuVO;
 import cn.lili.modules.order.cart.entity.vo.CartVO;
 import cn.lili.modules.order.cart.render.CartRenderStep;
 import cn.lili.modules.order.order.entity.dto.PriceDetailDTO;
+import cn.lili.modules.promotion.entity.dos.PromotionGoods;
 import cn.lili.modules.promotion.entity.enums.KanJiaStatusEnum;
 import cn.lili.modules.promotion.entity.vos.PromotionSkuVO;
 import cn.lili.modules.promotion.entity.vos.kanjia.KanjiaActivitySearchParams;
@@ -122,9 +123,22 @@ public class SkuPromotionRender implements CartRenderStep {
             case CART:
             case BUY_NOW:
             case VIRTUAL:
+                //循环购物车
                 for (CartVO cartVO : tradeDTO.getCartList()) {
+                    //循环sku
                     for (CartSkuVO cartSkuVO : cartVO.getSkuList()) {
+                        //更新商品促销
                         promotionGoodsService.updatePromotion(cartSkuVO);
+                        //赋予商品促销信息
+                        for (PromotionGoods promotionGoods : cartSkuVO.getPromotions()) {
+
+                            PromotionSkuVO promotionSkuVO = new PromotionSkuVO(promotionGoods.getPromotionType(), promotionGoods.getPromotionId());
+                            cartSkuVO.setPurchasePrice(promotionGoods.getPrice());
+                            cartSkuVO.setSubTotal(CurrencyUtil.mul(promotionGoods.getPrice(), cartSkuVO.getNum()));
+                            cartSkuVO.getPriceDetailDTO().setGoodsPrice(cartSkuVO.getSubTotal());
+
+                            cartSkuVO.getPriceDetailDTO().getJoinPromotion().add(promotionSkuVO);
+                        }
                     }
                 }
                 return;

framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java

@@ -571,7 +571,7 @@ public class CartServiceImpl implements CartService {
         List<CartSkuVO> cartSkuVOS = checkCoupon(memberCoupon, tradeDTO);
 
         //定义使用优惠券的信息商品信息
-        Map<String, Double> skuPrice = new HashMap<>();
+        Map<String, Double> skuPrice = new HashMap<>(1);
 
 
         //购物车价格

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

@@ -8,9 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -20,8 +17,6 @@ import java.util.Date;
  * @since 2020/11/17 7:30 下午
  */
 @Data
-@Entity
-@Table(name = "li_after_sale")
 @TableName("li_after_sale")
 @ApiModel(value = "售后")
 public class AfterSale extends BaseEntity {
@@ -68,7 +63,6 @@ public class AfterSale extends BaseEntity {
     private String goodsName;
 
     @ApiModelProperty(value = "规格json")
-    @Column(columnDefinition = "TEXT")
     private String specs;
     @ApiModelProperty(value = "实际金额")
     private Double flowPrice;

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

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -17,8 +15,6 @@ import javax.validation.constraints.NotNull;
  * @since: 2021/7/9 1:39 上午
  */
 @Data
-@Entity
-@Table(name = "li_after_sale_reason")
 @TableName("li_after_sale_reason")
 @ApiModel(value = "售后原因")
 public class AfterSaleReason extends BaseEntity {

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

@@ -22,9 +22,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 import java.util.Optional;
 
@@ -35,8 +32,6 @@ import java.util.Optional;
  * @since 2020/11/17 7:30 下午
  */
 @Data
-@Entity
-@Table(name = "li_order")
 @TableName("li_order")
 @ApiModel(value = "订单")
 @NoArgsConstructor
@@ -86,7 +81,7 @@ public class Order extends BaseEntity {
     private String paymentMethod;
 
     @ApiModelProperty(value = "支付时间")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     private Date paymentTime;
 
@@ -185,7 +180,6 @@ public class Order extends BaseEntity {
     @ApiModelProperty(value = "订单促销类型")
     private String orderPromotionType;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "价格详情")
     private String priceDetail;
 

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

@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -19,8 +17,6 @@ import java.util.Date;
  * @since 2020/12/4
  **/
 @Data
-@Entity
-@Table(name = "li_order_complaint")
 @TableName("li_order_complaint")
 @ApiModel(value = "订单交易投诉")
 public class OrderComplaint extends BaseEntity {

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

@@ -8,8 +8,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 交易投诉通信
@@ -18,8 +16,6 @@ import javax.persistence.Table;
  * @since 2020/12/5
  **/
 @Data
-@Entity
-@Table(name = "li_order_complaint_communication")
 @TableName("li_order_complaint_communication")
 @ApiModel(value = "订单交易投诉通信")
 @AllArgsConstructor

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

@@ -20,9 +20,6 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import java.util.stream.Collectors;
 
 /**
@@ -32,8 +29,6 @@ import java.util.stream.Collectors;
  * @since 2020/11/17 7:30 下午
  */
 @Data
-@Entity
-@Table(name = "li_order_item")
 @TableName("li_order_item")
 @ApiModel(value = "子订单")
 @NoArgsConstructor
@@ -79,7 +74,6 @@ public class OrderItem extends BaseEntity {
     private String snapshotId;
 
     @ApiModelProperty(value = "规格json")
-    @Column(columnDefinition = "TEXT")
     private String specs;
 
     @ApiModelProperty(value = "促销类型")
@@ -106,7 +100,6 @@ public class OrderItem extends BaseEntity {
     @ApiModelProperty(value = "售后状态")
     private String afterSaleStatus;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "价格详情")
     private String priceDetail;
 

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

@@ -6,9 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 发票
@@ -17,8 +14,6 @@ import javax.persistence.Table;
  * @since 2020/11/28 11:38
  */
 @Data
-@Entity
-@Table(name = "li_receipt")
 @TableName("li_receipt")
 @ApiModel(value = "发票")
 public class Receipt extends BaseEntity {
@@ -55,7 +50,6 @@ public class Receipt extends BaseEntity {
     @ApiModelProperty(value = "发票状态 0未开 1已开")
     private Integer receiptStatus;
 
-    @Column(columnDefinition = "TEXT")
     @ApiModelProperty(value = "发票详情")
     private String receiptDetail;
 

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

@@ -1,9 +1,9 @@
 package cn.lili.modules.order.order.entity.dos;
 
 import cn.lili.modules.order.order.entity.enums.FlowTypeEnum;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -12,10 +12,6 @@ import lombok.Data;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -25,18 +21,9 @@ import java.util.Date;
  * @since 2020/11/17 7:31 下午
  */
 @Data
-@Entity
-@Table(name = "li_store_flow")
 @TableName("li_store_flow")
 @ApiModel(value = "商家订单流水")
-public class StoreFlow {
+public class StoreFlow extends BaseIdEntity {
-
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     private static final long serialVersionUID = -5998757398902747939L;
 
@@ -81,7 +68,6 @@ public class StoreFlow {
     private String categoryId;
 
     @ApiModelProperty(value = "规格json")
-    @Column(columnDefinition = "TEXT")
     private String specs;
 
 

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

@@ -10,8 +10,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 
 /**
  * 交易
@@ -20,8 +18,6 @@ import javax.persistence.Table;
  * @since 2020/11/17 7:34 下午
  */
 @Data
-@Entity
-@Table(name = "li_trade")
 @TableName("li_trade")
 @ApiModel(value = "交易")
 @NoArgsConstructor

framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java

@@ -77,17 +77,17 @@ public class OrderSearchParams extends PageVO {
     private String paymentMethod;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "支付时间")
     private Date paymentTime;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "下单开始时间")
     private Date startDate;
 
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "下单结束时间")
     private Date endDate;
 

framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java

@@ -3,7 +3,6 @@ package cn.lili.modules.order.order.entity.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Column;
 
 /**
  * 发票子内容
@@ -21,7 +20,6 @@ public class ReceiptDTO {
     private String goodsName;
 
     @ApiModelProperty(value = "规格")
-    @Column(columnDefinition = "TEXT")
     private String specs;
 
     @ApiModelProperty(value = "数量")

framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java

@@ -56,11 +56,11 @@ public class AfterSaleSearchParams extends PageVO {
     @ApiModelProperty(value = "售后单状态", allowableValues = "APPLY,PASS,REFUSE,BUYER_RETURN,SELLER_RE_DELIVERY,BUYER_CONFIRM,SELLER_CONFIRM,COMPLETE")
     private String serviceStatus;
 
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
     private Date startDate;
 
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
     private Date endDate;
 

framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java

@@ -9,7 +9,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.persistence.Entity;
 import java.util.Date;
 
 /**
@@ -19,7 +18,7 @@ import java.util.Date;
  * @since 2020/11/17 7:30 下午
  */
 @Data
-@Entity
+
 @ApiModel(value = "订单")
 public class PaymentLog extends BaseEntity {
 
@@ -78,8 +77,4 @@ public class PaymentLog extends BaseEntity {
     @ApiModelProperty(value = "订单类型")
     private String orderType;
 
-
-    public PaymentLog() {
-
-    }
 }

framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java

@@ -3,19 +3,17 @@ package cn.lili.modules.order.order.serviceimpl;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONUtil;
-import cn.lili.modules.system.utils.OperationalJudgment;
-import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.common.enums.ResultCode;
 import cn.lili.common.exception.ServiceException;
-import cn.lili.mybatis.util.PageUtil;
+import cn.lili.common.properties.RocketmqCustomProperties;
-import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
-import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import cn.lili.common.security.AuthUser;
 import cn.lili.common.security.context.UserContext;
 import cn.lili.common.security.enums.UserEnums;
-import cn.lili.common.utils.*;
+import cn.lili.common.utils.BeanUtil;
+import cn.lili.common.utils.CurrencyUtil;
+import cn.lili.common.utils.SnowFlake;
+import cn.lili.common.utils.StringUtils;
 import cn.lili.common.vo.PageVO;
-import cn.lili.common.properties.RocketmqCustomProperties;
 import cn.lili.modules.order.order.aop.AfterSaleLogPoint;
 import cn.lili.modules.order.order.entity.dos.AfterSale;
 import cn.lili.modules.order.order.entity.dos.Order;
@@ -40,11 +38,15 @@ import cn.lili.modules.payment.kit.enums.PaymentMethodEnum;
 import cn.lili.modules.statistics.model.dto.StatisticsQueryParam;
 import cn.lili.modules.statistics.util.StatisticsDateUtil;
 import cn.lili.modules.store.entity.dto.StoreAfterSaleAddressDTO;
-import cn.lili.modules.store.entity.enums.StoreStatusEnum;
 import cn.lili.modules.store.service.StoreDetailService;
+import cn.lili.modules.system.aspect.annotation.SystemLogPoint;
 import cn.lili.modules.system.entity.dos.Logistics;
 import cn.lili.modules.system.entity.vo.Traces;
 import cn.lili.modules.system.service.LogisticsService;
+import cn.lili.modules.system.utils.OperationalJudgment;
+import cn.lili.mybatis.util.PageUtil;
+import cn.lili.rocketmq.RocketmqSendCallbackBuilder;
+import cn.lili.rocketmq.tags.AfterSaleTagsEnum;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -359,7 +361,7 @@ public class AfterSaleServiceImpl extends ServiceImpl<AfterSaleMapper, AfterSale
     @Override
     public Integer applyNum(String serviceType) {
         LambdaQueryWrapper<AfterSale> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(AfterSale::getServiceStatus, StoreStatusEnum.APPLYING.name());
+        queryWrapper.eq(AfterSale::getServiceStatus, AfterSaleStatusEnum.APPLY.name());
         queryWrapper.eq(StringUtils.isNotEmpty(serviceType), AfterSale::getServiceType, serviceType);
         queryWrapper.eq(StringUtils.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name()),
                 AfterSale::getStoreId, UserContext.getCurrentUser().getStoreId());

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

@@ -1,9 +1,9 @@
 package cn.lili.modules.order.trade.entity.dos;
 
 import cn.lili.common.security.enums.UserEnums;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -14,10 +14,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -27,19 +23,10 @@ import java.util.Date;
  * @since 2020-03-25 2:30 下午
  */
 @Data
-@Entity
-@Table(name = "li_after_sale_log")
 @TableName("li_after_sale_log")
 @ApiModel(value = "售后日志")
 @NoArgsConstructor
-public class AfterSaleLog {
+public class AfterSaleLog extends BaseIdEntity {
-
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
@@ -48,7 +35,7 @@ public class AfterSaleLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

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

@@ -2,9 +2,9 @@ package cn.lili.modules.order.trade.entity.dos;
 
 import cn.lili.common.security.enums.UserEnums;
 import cn.lili.common.utils.StringUtils;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -15,10 +15,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -28,21 +24,13 @@ import java.util.Date;
  * @since 2020-03-25 2:30 下午
  */
 @Data
-@Entity
-@Table(name = "li_order_log")
 @TableName("li_order_log")
 @ApiModel(value = "订单日志")
 @NoArgsConstructor
-public class OrderLog {
+public class OrderLog extends BaseIdEntity {
 
     private static final long serialVersionUID = -1599270944927160096L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
 
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
@@ -51,7 +39,7 @@ public class OrderLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

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

@@ -1,9 +1,9 @@
 package cn.lili.modules.order.trade.entity.dos;
 
 import cn.lili.modules.order.order.entity.enums.PayStatusEnum;
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -15,10 +15,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
@@ -29,23 +25,14 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_recharge")
 @TableName("li_recharge")
 @ApiModel(value = "预存款充值记录")
 @AllArgsConstructor
 @NoArgsConstructor
-public class Recharge {
+public class Recharge extends BaseIdEntity {
 
     private static final long serialVersionUID = -1529240544327161096L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     @CreatedBy
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建者", hidden = true)
@@ -53,7 +40,7 @@ public class Recharge {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;
@@ -86,7 +73,7 @@ public class Recharge {
 
     @ApiModelProperty(value = "支付时间")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date payTime;
 
 

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

@@ -1,8 +1,8 @@
 package cn.lili.modules.order.trade.entity.dos;
 
+import cn.lili.mybatis.BaseIdEntity;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -13,10 +13,6 @@ import org.springframework.data.annotation.CreatedBy;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
 import java.util.Date;
 
 /**
@@ -26,22 +22,13 @@ import java.util.Date;
  * @since 2020-02-25 14:10:16
  */
 @Data
-@Entity
-@Table(name = "li_wallet_log")
 @TableName("li_wallet_log")
 @ApiModel(value = "钱包变动日志")
 @NoArgsConstructor
-public class WalletLog {
+public class WalletLog extends BaseIdEntity {
 
     private static final long serialVersionUID = -1599270544927161096L;
 
-    @Id
-    @TableId
-    @TableField
-    @Column(columnDefinition = "bigint(20)")
-    @ApiModelProperty(value = "唯一标识", hidden = true)
-    private String id;
-
     /**
      * 会员id
      */
@@ -81,7 +68,7 @@ public class WalletLog {
 
     @CreatedDate
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT)
     @ApiModelProperty(value = "创建时间", hidden = true)
     private Date createTime;

framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java

@@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.hibernate.validator.constraints.Length;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
@@ -20,8 +18,6 @@ import javax.validation.constraints.NotNull;
  * @since 2020/12/10 17:42
  */
 @Data
-@Entity
-@Table(name = "li_article")
 @TableName("li_article")
 @ApiModel(value = "文章")
 public class Article extends BaseEntity {