diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java index 8e3264b3..30ef2cf8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerWebController.java +++ b/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 unionIDLogin(ConnectAuthUser authUser, @RequestHeader("uuid") String uuid) { + public ResultMessage 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; } diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/storerating/StoreRatingExecute.java similarity index 97% rename from consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java rename to consumer/src/main/java/cn/lili/timetask/handler/impl/storerating/StoreRatingExecute.java index d648c6a1..90ba815e 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/storeRating/StoreRatingExecute.java +++ b/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; diff --git a/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java b/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java index 15a7be77..b75b1e5a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/config/AuthConfig.java +++ b/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} 的合法性。 *

* 使用场景：当且仅当使用自实现 {@code state} 校验逻辑时开启 *

diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java index b1046569..acd052ab 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/Connect.java @@ -1,9 +1,8 @@ package cn.lili.modules.connect.entity; -import cn.lili.mybatis.IdEntity; +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,7 +13,6 @@ import org.springframework.data.annotation.CreatedBy; import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; -import java.io.Serializable; import java.util.Date; /** @@ -24,7 +22,7 @@ import java.util.Date; @TableName("li_connect") @ApiModel(value = "联合登陆") @NoArgsConstructor -public class Connect extends IdEntity { +public class Connect extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/AuthRequest.java index fddd7329..74390987 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthRequest.java +++ b/framework/src/main/java/cn/lili/modules/connect/request/AuthRequest.java @@ -20,7 +20,7 @@ public interface AuthRequest { * 返回授权url，可自行跳转页面 *

* 不建议使用该方式获取授权地址，不带{@code state}的授权地址，容易受到csrf攻击。 - * 建议使用{@link AuthDefaultRequest#authorize(String)}方法生成授权地址，在回调方法中对{@code state}进行校验 + * 建议使用{@link BaseAuthRequest#authorize(String)}方法生成授权地址，在回调方法中对{@code state}进行校验 * * @return 返回授权地址 */ diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthAlipayRequest.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java rename to framework/src/main/java/cn/lili/modules/connect/request/BaseAuthAlipayRequest.java index 10da2098..911811ad 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthAlipayRequest.java +++ b/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"); diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthQQRequest.java similarity index 95% rename from framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java rename to framework/src/main/java/cn/lili/modules/connect/request/BaseAuthQQRequest.java index 69bb075f..3578f157 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthQQRequest.java +++ b/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) { diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java rename to framework/src/main/java/cn/lili/modules/connect/request/BaseAuthRequest.java index 8ecd0e1b..9e1274dc 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthDefaultRequest.java +++ b/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 diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java rename to framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatPCRequest.java index 8a8b564d..5d0bfd0c 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatPCRequest.java +++ b/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); } diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java rename to framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeChatRequest.java index e9086636..eb146d7c 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeChatRequest.java +++ b/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 AuthWeChatRequest(AuthConfig config, Cache cache) { +public class BaseAuthWeChatRequest extends BaseAuthRequest { + public BaseAuthWeChatRequest(AuthConfig config, Cache cache) { super(config, ConnectAuthEnum.WECHAT, cache); } diff --git a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java b/framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeiboRequest.java similarity index 97% rename from framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java rename to framework/src/main/java/cn/lili/modules/connect/request/BaseAuthWeiboRequest.java index fa00225b..69c26351 100644 --- a/framework/src/main/java/cn/lili/modules/connect/request/AuthWeiboRequest.java +++ b/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); } diff --git a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java b/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java index 9b9516b0..6a627b4b 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/ConnectUtil.java +++ b/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.AuthWeChatRequest; +import cn.lili.modules.connect.request.BaseAuthWeChatPCRequest; +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)) diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java index 50c96f7e..ed8f2990 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionGoods.java @@ -3,7 +3,7 @@ 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.IdEntity; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -32,7 +32,7 @@ import java.util.Map; @ApiModel(value = "分销商品") @TableName("li_distribution_goods") @NoArgsConstructor -public class DistributionGoods extends IdEntity { +public class DistributionGoods extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java index 8d04dfb0..93404507 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionOrder.java @@ -2,7 +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.IdEntity; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -27,7 +27,7 @@ import java.util.Date; @ApiModel(value = "分销订单") @TableName("li_distribution_order") @NoArgsConstructor -public class DistributionOrder extends IdEntity { +public class DistributionOrder extends BaseIdEntity { private static final long serialVersionUID = 501799944909496507L; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java index c60fa996..3cfb0a62 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionSelectedGoods.java @@ -1,8 +1,6 @@ package cn.lili.modules.distribution.entity.dos; -import cn.lili.mybatis.IdEntity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -20,7 +18,7 @@ import lombok.NoArgsConstructor; @ApiModel(value = "分销商已选择分销商品") @TableName("li_distribution_selected_goods") @NoArgsConstructor -public class DistributionSelectedGoods extends IdEntity { +public class DistributionSelectedGoods extends BaseIdEntity { @ApiModelProperty(value = "分销员ID") diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java index d6b74b77..80b4075c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryBrand.java @@ -1,6 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.mybatis.IdEntity; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,7 +26,7 @@ import java.util.Date; @TableName("li_category_brand") @ApiModel(value = "商品分类品牌关联") @NoArgsConstructor -public class CategoryBrand extends IdEntity { +public class CategoryBrand extends BaseIdEntity { private static final long serialVersionUID = 3315719881926878L; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java index 0d010e3d..44d2a0c4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsGallery.java @@ -1,17 +1,14 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.mybatis.IdEntity; +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 java.io.Serializable; - /** * 商品相册 * @@ -21,7 +18,7 @@ import java.io.Serializable; @Data @TableName("li_goods_gallery") @ApiModel(value = "商品相册") -public class GoodsGallery extends IdEntity { +public class GoodsGallery extends BaseIdEntity { @CreatedBy diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java index 4d4d5a7e..1da81ed0 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Parameters.java @@ -1,6 +1,6 @@ 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; @@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull; @Data @TableName("li_parameters") @ApiModel(value = "商品参数") -public class Parameters extends IdEntity { +public class Parameters extends BaseIdEntity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java index 3e98392c..446fc63a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Specification.java @@ -1,6 +1,6 @@ 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; @@ -18,7 +18,7 @@ import javax.validation.constraints.NotEmpty; @Data @TableName("li_specification") @ApiModel(value = "规格项") -public class Specification extends IdEntity { +public class Specification extends BaseIdEntity { private static final long serialVersionUID = 147792597901239486L; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java index 924696ae..bc6aec8a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/StudioCommodity.java @@ -1,8 +1,6 @@ package cn.lili.modules.goods.entity.dos; -import cn.lili.mybatis.IdEntity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -20,7 +18,7 @@ import lombok.NoArgsConstructor; @ApiModel(value = "直播商品") @TableName("li_studio_commodity") @NoArgsConstructor -public class StudioCommodity extends IdEntity { +public class StudioCommodity extends BaseIdEntity { @ApiModelProperty(value = "房间ID") private Integer roomId; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java index 65ec0d31..9a68dbed 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/GoodsCollection.java @@ -1,9 +1,8 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -25,7 +24,7 @@ import java.util.Date; @NoArgsConstructor @ApiModel(value = "会员商品收藏") @TableName("li_goods_collection") -public class GoodsCollection extends IdEntity { +public class GoodsCollection extends BaseIdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java index 0d0bbe12..11254eb2 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberPointsHistory.java @@ -1,10 +1,9 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -25,7 +24,7 @@ import java.util.Date; @Data @TableName("li_member_points_history") @ApiModel(value = "会员积分历史") -public class MemberPointsHistory extends IdEntity { +public class MemberPointsHistory extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java index 84c1833f..0738666b 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberReceipt.java @@ -1,6 +1,6 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.mybatis.IdEntity; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -23,7 +23,7 @@ import java.util.Date; @Data @TableName("li_member_receipt") @ApiModel(value = "会员发票") -public class MemberReceipt extends IdEntity { +public class MemberReceipt extends BaseIdEntity { private static final long serialVersionUID = -8210927482915675995L; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java index d15511ee..adec8b76 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberSign.java @@ -1,9 +1,8 @@ package cn.lili.modules.member.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -23,7 +22,7 @@ import java.util.Date; @Data @TableName("li_member_sign") @ApiModel(value = "会员签到") -public class MemberSign extends IdEntity { +public class MemberSign extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java index ca35ecaa..f179c057 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/ShortLink.java @@ -1,6 +1,6 @@ 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; @@ -14,7 +14,7 @@ import lombok.Data; @Data @TableName("li_short_link") @ApiModel(value = "短链接/暂时只用于小程序二维码业务") -public class ShortLink extends IdEntity { +public class ShortLink extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java index 17054892..a3b94bba 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsReach.java @@ -1,9 +1,8 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -24,7 +23,7 @@ import java.util.Date; @Data @TableName("li_sms_reach") @ApiModel(value = "短信任务") -public class SmsReach extends IdEntity { +public class SmsReach extends BaseIdEntity { @ApiModelProperty(value = "签名名称", required = true) private String signName; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java index 41f9e815..ac6c3bdc 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsTemplate.java @@ -1,8 +1,6 @@ package cn.lili.modules.message.entity.dos; -import cn.lili.mybatis.IdEntity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -18,7 +16,7 @@ import lombok.Data; @Data @TableName("li_sms_template") @ApiModel(value = "短信模板") -public class SmsTemplate extends IdEntity { +public class SmsTemplate extends BaseIdEntity { @ApiModelProperty(value = "模板名称", required = true) private String templateName; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java index 47103f03..75a5af8f 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/StoreMessage.java @@ -1,10 +1,9 @@ package cn.lili.modules.message.entity.dos; import cn.lili.modules.message.entity.enums.MessageStatusEnum; -import cn.lili.mybatis.IdEntity; +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; @@ -25,7 +24,7 @@ import java.util.Date; @Data @TableName("li_store_message") @ApiModel(value = "店铺消息") -public class StoreMessage extends IdEntity { +public class StoreMessage extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/RenderStepEnums.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/RenderStepEnums.java index 43f08cd2..2f429923 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/RenderStepEnums.java +++ b/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; } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java index cbda29e4..2d9e7c43 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/FullDiscountRender.java +++ b/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 initFullDiscountGoods(FullDiscountVO fullDiscount, List cartSkuVOS) { - Map skuPriceDetail = new HashMap<>(); + Map skuPriceDetail = new HashMap<>(16); //全品类参与 if (fullDiscount.getNumber() == -1) { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 022573b3..e40169a7 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -571,7 +571,7 @@ public class CartServiceImpl implements CartService { List cartSkuVOS = checkCoupon(memberCoupon, tradeDTO); //定义使用优惠券的信息商品信息 - Map skuPrice = new HashMap<>(); + Map skuPrice = new HashMap<>(1); //购物车价格 diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java index f9c0f209..20ee09c9 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/StoreFlow.java @@ -1,10 +1,9 @@ package cn.lili.modules.order.order.entity.dos; import cn.lili.modules.order.order.entity.enums.FlowTypeEnum; -import cn.lili.mybatis.IdEntity; +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; @@ -24,7 +23,7 @@ import java.util.Date; @Data @TableName("li_store_flow") @ApiModel(value = "商家订单流水") -public class StoreFlow extends IdEntity { +public class StoreFlow extends BaseIdEntity { private static final long serialVersionUID = -5998757398902747939L; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java index cbb2b342..046391c7 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/AfterSaleLog.java @@ -1,10 +1,9 @@ package cn.lili.modules.order.trade.entity.dos; import cn.lili.common.security.enums.UserEnums; -import cn.lili.mybatis.IdEntity; +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; @@ -27,7 +26,7 @@ import java.util.Date; @TableName("li_after_sale_log") @ApiModel(value = "售后日志") @NoArgsConstructor -public class AfterSaleLog extends IdEntity { +public class AfterSaleLog extends BaseIdEntity { @CreatedBy @TableField(fill = FieldFill.INSERT) diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java index 8878aff3..acf475b2 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/OrderLog.java @@ -2,10 +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.IdEntity; +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; @@ -28,7 +27,7 @@ import java.util.Date; @TableName("li_order_log") @ApiModel(value = "订单日志") @NoArgsConstructor -public class OrderLog extends IdEntity { +public class OrderLog extends BaseIdEntity { private static final long serialVersionUID = -1599270944927160096L; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java index c646b2db..dc1ca9fd 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/Recharge.java @@ -1,10 +1,9 @@ package cn.lili.modules.order.trade.entity.dos; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; -import cn.lili.mybatis.IdEntity; +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; @@ -30,7 +29,7 @@ import java.util.Date; @ApiModel(value = "预存款充值记录") @AllArgsConstructor @NoArgsConstructor -public class Recharge extends IdEntity { +public class Recharge extends BaseIdEntity { private static final long serialVersionUID = -1529240544327161096L; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java index 45956e20..8dc7112f 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/dos/WalletLog.java @@ -1,9 +1,8 @@ package cn.lili.modules.order.trade.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -26,7 +25,7 @@ import java.util.Date; @TableName("li_wallet_log") @ApiModel(value = "钱包变动日志") @NoArgsConstructor -public class WalletLog extends IdEntity { +public class WalletLog extends BaseIdEntity { private static final long serialVersionUID = -1599270544927161096L; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java index 2143b8c9..efdc559d 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Feedback.java @@ -1,10 +1,9 @@ package cn.lili.modules.page.entity.dos; import cn.lili.modules.page.entity.enums.FeedbackTypeEnum; -import cn.lili.mybatis.IdEntity; +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,7 +14,6 @@ import org.springframework.data.annotation.CreatedDate; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotEmpty; -import java.io.Serializable; import java.util.Date; /** @@ -27,7 +25,7 @@ import java.util.Date; @Data @TableName("li_feedback") @ApiModel(value = "意见反馈") -public class Feedback extends IdEntity { +public class Feedback extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java b/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java index 024bfd6d..8309380c 100644 --- a/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java +++ b/framework/src/main/java/cn/lili/modules/payment/entity/RefundLog.java @@ -1,9 +1,8 @@ package cn.lili.modules.payment.entity; -import cn.lili.mybatis.IdEntity; +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; @@ -29,7 +28,7 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @ApiModel(value = "退款日志") -public class RefundLog extends IdEntity { +public class RefundLog extends BaseIdEntity { @ApiModelProperty(value = "会员ID") private String memberId; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java index 077bbb21..a079b4ec 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/CashierSupport.java @@ -76,7 +76,7 @@ public class CashierSupport { case APP: return payment.appPay(request, payParam); case JSAPI: - return payment.JSApiPay(request, payParam); + return payment.jsApiPay(request, payParam); case NATIVE: return payment.nativePay(request, payParam); case MP: diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java index 1378ea10..0e7c067d 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/Payment.java @@ -36,7 +36,7 @@ public interface Payment { * @param payParam api参数 * @return 公众号内部支付参数 */ - default ResultMessage JSApiPay(HttpServletRequest request, PayParam payParam) { + default ResultMessage jsApiPay(HttpServletRequest request, PayParam payParam) { throw new ServiceException(ResultCode.PAY_ERROR); } diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java index 27238e03..af4f43e7 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayPlugin.java @@ -104,7 +104,7 @@ public class AliPayPlugin implements Payment { @Override - public ResultMessage JSApiPay(HttpServletRequest request, PayParam payParam) { + public ResultMessage jsApiPay(HttpServletRequest request, PayParam payParam) { throw new ServiceException(ResultCode.PAY_NOT_SUPPORT); } diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java index 6d1e0315..4e491544 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wallet/WalletPlugin.java @@ -64,7 +64,7 @@ public class WalletPlugin implements Payment { } @Override - public ResultMessage JSApiPay(HttpServletRequest request, PayParam payParam) { + public ResultMessage jsApiPay(HttpServletRequest request, PayParam payParam) { savePaymentLog(payParam); return ResultUtil.success(ResultCode.PAY_SUCCESS); } diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java index 55426ed9..8755dd2c 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatPlugin.java @@ -156,7 +156,7 @@ public class WechatPlugin implements Payment { } @Override - public ResultMessage JSApiPay(HttpServletRequest request, PayParam payParam) { + public ResultMessage jsApiPay(HttpServletRequest request, PayParam payParam) { try { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java index 9cd86a31..f6605d22 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/UserRole.java @@ -1,6 +1,6 @@ package cn.lili.modules.permission.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; @@ -15,7 +15,7 @@ import lombok.Data; @Data @TableName("li_user_role") @ApiModel(value = "用户角色") -public class UserRole extends IdEntity { +public class UserRole extends BaseIdEntity { @ApiModelProperty(value = "用户唯一id") private String userId; diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java index b8189ea1..4710c956 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionGoodsServiceImpl.java @@ -103,7 +103,7 @@ public class PromotionGoodsServiceImpl extends ServiceImpl fullDiscountVOS = mongoTemplate.find(query, FullDiscountVO.class); for (FullDiscountVO fullDiscountVO : fullDiscountVOS) { if (fullDiscountVO.getPromotionGoodsList() == null && diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java index 3bae74b5..159c749c 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrderItem.java @@ -1,9 +1,8 @@ package cn.lili.modules.purchase.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -23,7 +22,7 @@ import java.util.Date; @Data @TableName("li_purchase_order_item") @ApiModel(value = "采购单子内容") -public class PurchaseOrderItem extends IdEntity { +public class PurchaseOrderItem extends BaseIdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java index 57a43e90..4a297b18 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuoted.java @@ -1,9 +1,8 @@ package cn.lili.modules.purchase.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -23,7 +22,7 @@ import java.util.Date; @Data @ApiModel(value = "供求单报价") @TableName("li_purchase_quoted") -public class PurchaseQuoted extends IdEntity { +public class PurchaseQuoted extends BaseIdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java index 33fd7067..f7a576ae 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseQuotedItem.java @@ -1,10 +1,8 @@ package cn.lili.modules.purchase.entity.dos; -import cn.lili.common.utils.SnowFlake; -import cn.lili.mybatis.IdEntity; +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; @@ -24,7 +22,7 @@ import java.util.Date; @Data @ApiModel(value = "供求单报价") @TableName("li_purchase_quoted_item") -public class PurchaseQuotedItem extends IdEntity { +public class PurchaseQuotedItem extends BaseIdEntity { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java b/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java index ce002435..7cb076dc 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/dos/MemberStatisticsData.java @@ -1,6 +1,6 @@ package cn.lili.modules.statistics.model.dos; -import cn.lili.mybatis.IdEntity; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -18,7 +18,7 @@ import java.util.Date; @Data @TableName("li_member_statistics_data") @ApiModel(value = "会员统计") -public class MemberStatisticsData extends IdEntity { +public class MemberStatisticsData extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java b/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java index b6655835..9b38fd3a 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/dos/PlatformViewData.java @@ -1,8 +1,6 @@ package cn.lili.modules.statistics.model.dos; -import cn.lili.mybatis.IdEntity; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -19,7 +17,7 @@ import java.util.Date; @Data @TableName("li_s_platform_view_data") @ApiModel(value = "平台pv统计") -public class PlatformViewData extends IdEntity { +public class PlatformViewData extends BaseIdEntity { @ApiModelProperty(value = "pv数量") diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java index 7df55683..2020ec8c 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Bill.java @@ -1,10 +1,9 @@ package cn.lili.modules.store.entity.dos; import cn.lili.modules.store.entity.enums.BillStatusEnum; -import cn.lili.mybatis.IdEntity; +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; @@ -24,7 +23,7 @@ import java.util.Date; @Data @TableName("li_bill") @ApiModel(value = "结算单") -public class Bill extends IdEntity { +public class Bill extends BaseIdEntity { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java index f8596331..87820fd7 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreDetail.java @@ -6,7 +6,7 @@ import cn.hutool.core.date.DateUtil; import cn.lili.common.validation.Mobile; import cn.lili.common.validation.Phone; import cn.lili.modules.store.entity.dto.AdminStoreApplyDTO; -import cn.lili.mybatis.IdEntity; +import cn.lili.mybatis.BaseIdEntity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -31,7 +31,7 @@ import java.util.Date; @TableName("li_store_detail") @ApiModel(value = "店铺详细") @NoArgsConstructor -public class StoreDetail extends IdEntity { +public class StoreDetail extends BaseIdEntity { private static final long serialVersionUID = 4949782642253898816L; diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java index 53412601..c9fa4e4c 100644 --- a/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/interceptor/SystemLogAspect.java @@ -43,8 +43,10 @@ public class SystemLogAspect { @Autowired private SystemLogService systemLogService; + @Autowired private HttpServletRequest request; + @Autowired private IpHelper ipHelper; @@ -118,6 +120,8 @@ public class SystemLogAspect { //调用线程保存 ThreadPoolUtil.getPool().execute(new SaveSystemLogThread(systemLogVO, systemLogService)); + + BEGIN_TIME_THREAD_LOCAL.remove(); } catch (Exception e) { log.error("系统日志保存异常", e); } diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java index e152e398..d6c7dad9 100755 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/AppVersion.java @@ -1,9 +1,8 @@ package cn.lili.modules.system.entity.dos; -import cn.lili.mybatis.IdEntity; +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; @@ -25,7 +24,7 @@ import java.util.Date; @Data @TableName("li_app_version") @ApiModel(value = "app版本控制") -public class AppVersion extends IdEntity { +public class AppVersion extends BaseIdEntity { private static final long serialVersionUID = 3034686331756935L; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java index 4812d13b..b62f8959 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDeliveryLog.java @@ -4,10 +4,9 @@ package cn.lili.modules.system.entity.dos; import cn.lili.common.utils.StringUtils; import cn.lili.modules.system.entity.plugin.logistics.dada.enums.DadaOrderStatusEnum; import cn.lili.modules.system.entity.plugin.logistics.dada.vo.DdOrderBackVO; -import cn.lili.mybatis.IdEntity; +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; @@ -32,7 +31,7 @@ import java.util.Date; @ApiModel(value = "即时配送日志") @AllArgsConstructor @NoArgsConstructor -public class InstantDeliveryLog extends IdEntity { +public class InstantDeliveryLog extends BaseIdEntity { @CreatedDate diff --git a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java index 1a265b63..07cb838d 100644 --- a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java @@ -27,7 +27,7 @@ import java.util.Date; * @since 2020/8/20 14:34 */ @Data -@JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"}) +@JsonIgnoreProperties(value = { "handler", "fieldHandler"}) @AllArgsConstructor @NoArgsConstructor public abstract class BaseEntity implements Serializable { diff --git a/framework/src/main/java/cn/lili/mybatis/IdEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java similarity index 82% rename from framework/src/main/java/cn/lili/mybatis/IdEntity.java rename to framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java index 8ba15c9a..cab38ce6 100644 --- a/framework/src/main/java/cn/lili/mybatis/IdEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/BaseIdEntity.java @@ -19,10 +19,10 @@ import java.io.Serializable; * @since 2020/8/20 14:34 */ @Data -@JsonIgnoreProperties(value = {"hibernateLazyInitializer", "handler", "fieldHandler"}) +@JsonIgnoreProperties(value = {"handler", "fieldHandler"}) @AllArgsConstructor @NoArgsConstructor -public abstract class IdEntity implements Serializable { +public abstract class BaseIdEntity implements Serializable { private static final long serialVersionUID = 1L; diff --git a/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java b/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java index 2e79068f..b0e3da8d 100644 --- a/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java +++ b/framework/src/main/java/cn/lili/trigger/model/TimeExecuteConstant.java @@ -6,7 +6,7 @@ package cn.lili.trigger.model; * @author paulG * @since 2020/8/20 **/ -public abstract class TimeExecuteConstant { +public interface TimeExecuteConstant { /** * 促销延迟加载执行器