diff --git a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java index 3e8f283b..41ee3d9e 100644 --- a/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java +++ b/buyer-api/src/main/java/cn/lili/BuyerApiApplication.java @@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; * 买家API * * @author Chopper - * @date 2020/11/16 10:03 下午 + * @since 2020/11/16 10:03 下午 */ @SpringBootApplication @EnableJpaAuditing diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java index f36e14b8..49ed7429 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/CategoryBuyerController.java @@ -21,7 +21,7 @@ import java.util.List; * 买家端,商品分类接口 * * @author Chopper - * @date: 2020/11/16 10:05 下午 + * @since: 2020/11/16 10:05 下午 */ @RestController @Api(tags = "买家端,商品分类接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java index b293b4fa..55530434 100644 --- a/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/goods/GoodsBuyerController.java @@ -38,7 +38,7 @@ import java.util.Map; * 买家端,商品接口 * * @author Chopper - * @date 2020/11/16 10:06 下午 + * @since 2020/11/16 10:06 下午 */ @Slf4j @Api(tags = "买家端,商品接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java index 307b3f04..edb29fa9 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/CouponBuyerController.java @@ -27,7 +27,7 @@ import javax.validation.constraints.NotNull; * 买家端,买家优惠券接口 * * @author paulG - * @date 2020/11/17 3:35 下午 + * @since 2020/11/17 3:35 下午 */ @RestController @Api(tags = "买家端,买家优惠券接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java index 30d41365..4d7d73f2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/FootprintController.java @@ -19,7 +19,7 @@ import java.util.List; * 买家端,浏览历史接口 * * @author Chopper - * @date: 2020/11/16 10:06 下午 + * @since: 2020/11/16 10:06 下午 */ @RestController @Api(tags = "买家端,浏览历史接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java index aa7af08a..42cf0a6d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberAddressBuyerController.java @@ -20,7 +20,7 @@ import javax.validation.Valid; * 买家端,会员地址接口 * * @author Bulbasaur - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,会员地址接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java index 22a43a03..0c13c58e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberCollectionController.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotNull; * 买家端,会员收藏接口 * * @author Chopper - * @date: 2020/11/17 2:32 下午 + * @since: 2020/11/17 2:32 下午 */ @RestController @Api(tags = "买家端,会员收藏接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java index dc13e010..6801d9e5 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberEvaluationBuyerController.java @@ -24,7 +24,7 @@ import javax.validation.constraints.NotNull; * 买家端,会员商品评价接口 * * @author Bulbasaur - * @date: 2020/11/16 10:08 下午 + * @since: 2020/11/16 10:08 下午 */ @RestController @Api(tags = "买家端,会员商品评价接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java index 0ca41606..d4f9520b 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberMessageBuyerController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * 买家端,会员站内消息接口 * * @author Bulbasaur - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,会员站内消息接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java index 99b3c046..9f591e96 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberReceiptController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * 买家端,会员发票接口 * * @author paulG - * @date: 2021-03-29 14:10:16 + * @since: 2021-03-29 14:10:16 */ @RestController @Api(tags = "买家端,会员发票接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java index eb55af7f..06c99504 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberSignBuyerController.java @@ -18,7 +18,7 @@ import java.util.List; * 会员签到控制器 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端，会员签到API") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java index 73716710..e2a0ac3d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWalletBuyerController.java @@ -30,7 +30,7 @@ import javax.validation.constraints.Pattern; * 买家端,会员余额接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,会员余额接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java index 059485f5..28306be0 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyBuyerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,余额提现记录接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,余额提现记录接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java index 93c5f551..20434742 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/PointsHistoryBuyerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,会员积分历史接口 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "买家端,会员积分历史接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java index f22f0879..dc57af9f 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/RechargeBuyerController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,预存款充值记录接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,预存款充值记录接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java index ecd72e4e..6b173d38 100644 --- a/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/member/ServiceNoticeBuyerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,会员站服务消息接口 * * @author Chopper - * @date: 2020/11/17 2:31 下午 + * @since: 2020/11/17 2:31 下午 */ @RestController @RequestMapping("/service/notice") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java index 61354b6c..6249bd52 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/AppVersionBuyerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,APP版本 * * @author Bulbasaur - * @date: 2021/5/21 11:15 上午 + * @since: 2021/5/21 11:15 上午 */ @RestController @Api(tags = "买家端,APP版本") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java index 17d3c63a..bb0a4685 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/ArticleBuyerController.java @@ -25,7 +25,7 @@ import java.util.List; * 买家端,文章接口 * * @author Chopper - * @date: 2020/11/16 10:02 下午 + * @since: 2020/11/16 10:02 下午 */ @RestController @Api(tags = "买家端,文章接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java index 2f84439b..f47827db 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/FeedbackBuyerController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,意见反馈接口 * * @author Bulbasaur - * @date 2020-05-5 15:10:16 + * @since 2020-05-5 15:10:16 */ @RestController @Api(tags = "买家端,意见反馈接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java index 5c9e62d5..36c798cf 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/LogisticsBuyerController.java @@ -17,7 +17,7 @@ import java.util.List; * 买家端,物流公司接口 * * @author Bulbasaur - * @date 2020-05-5 15:10:16 + * @since 2020-05-5 15:10:16 */ @RestController @Api(tags = "买家端,物流公司接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java index 54726ff2..35b262a8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/PageBuyerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,页面接口 * * @author Chopper - * @date 2020/11/16 10:08 下午 + * @since 2020/11/16 10:08 下午 */ @RestController @Api(tags = "买家端,页面接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java index 23e37f8a..121f50ce 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/broadcast/StudioController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,直播间接口 * * @author Bulbasaur - * @date: 2021/5/20 12:03 下午 + * @since: 2021/5/20 12:03 下午 */ @RestController @Api(tags = "买家端,直播间接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java index edc3d3f0..515c49a2 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionBuyerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * 买家端,分销员接口 * * @author pikachu - * @date: 2020/11/16 10:03 下午 + * @since: 2020/11/16 10:03 下午 */ @RestController @Api(tags = "买家端,分销员接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java index d79adfe9..5030d8e4 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashBuyerController.java @@ -26,7 +26,7 @@ import javax.validation.constraints.NotNull; * 买家端,分销商品佣金提现接口 * * @author pikachu - * @date: 2020/11/16 10:03 下午 + * @since: 2020/11/16 10:03 下午 */ @RestController @Api(tags = "买家端,分销商品佣金提现接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java index 2a97f34b..eafb4250 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsBuyerController.java @@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull; * 买家端,分销商品接口 * * @author Bulbasaur - * @date: 2020/11/16 10:06 下午 + * @since: 2020/11/16 10:06 下午 */ @RestController @Api(tags = "买家端,分销商品接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java index 9f7b32b8..30a46f49 100644 --- a/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderBuyerController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,分销商品佣金提现接口 * * @author pikachu - * @date: 2020/11/16 10:03 下午 + * @since: 2020/11/16 10:03 下午 */ @RestController @Api(tags = "买家端,分销订单接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java index aeae60d6..43a5ca6c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/MemberBuyerController.java @@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull; * 买家端,会员接口 * * @author Chopper - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,会员接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java index c6b01fbe..7557e952 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/ConnectBuyerBindController.java @@ -17,7 +17,7 @@ import java.util.List; * 买家端,app/小程序 联合登录 * * @author Chopper - * @date 2020-11-25 19:29 + * @since 2020-11-25 19:29 */ @RestController @Api(tags = "买家端,app/小程序 联合登录") 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 03efbbc9..76093ff1 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 @@ -29,7 +29,6 @@ import java.io.IOException; * 买家端,web联合登录 * * @author Chopper - * @date 2020-11-25 19:29 */ @Slf4j @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java index bd3db44d..7c3697a8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/passport/connect/MiniProgramBuyerController.java @@ -23,7 +23,7 @@ import java.util.List; * 买家端,小程序登录接口 * * @author Chopper - * @date 2021/2/19 09:28 + * @since 2021/2/19 09:28 */ @RestController @RequestMapping("/buyer/mini-program") diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java index 0ba33e91..389b7e3f 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierController.java @@ -25,7 +25,7 @@ import javax.servlet.http.HttpServletResponse; * 买家端,收银台接口 * * @author Chopper - * @date 2020-12-18 16:59 + * @since 2020-12-18 16:59 */ @Slf4j @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java index 1efa16a6..e39c7225 100644 --- a/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java +++ b/buyer-api/src/main/java/cn/lili/controller/payment/CashierRefundController.java @@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest; * 买家端,退款回调 * * @author Chopper - * @date 2020-12-18 16:59 + * @since 2020-12-18 16:59 */ @Api(tags = "买家端,退款回调") @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java index 53e6ce6c..7e8143e8 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PintuanBuyerController.java @@ -27,7 +27,7 @@ import java.util.List; * 买家端,拼团接口 * * @author paulG - * @date 2021/2/20 + * @since 2021/2/20 **/ @Api(tags = "买家端,拼团接口") @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java index 3074053b..75dbf129 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/PointsGoodsBuyerController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,积分商品接口 * * @author paulG - * @date 2021/1/19 + * @since 2021/1/19 **/ @RestController @Api(tags = "买家端,积分商品接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java index 466bc376..7a64747d 100644 --- a/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/promotion/SeckillBuyerController.java @@ -20,7 +20,7 @@ import java.util.List; * 买家端,秒杀活动接口 * * @author paulG - * @date 2020/11/17 2:30 下午 + * @since 2020/11/17 2:30 下午 */ @Api(tags = "买家端,秒杀活动接口") @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java index a3974480..4a7a3318 100644 --- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseBuyerController.java @@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull; * 买家端,采购接口 * * @author Chopper - * @date: 2020/11/16 10:06 下午 + * @since: 2020/11/16 10:06 下午 */ @Api(tags = "买家端,采购接口") @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java index e990e00d..facb7063 100644 --- a/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java +++ b/buyer-api/src/main/java/cn/lili/controller/purchase/PurchaseQuotedController.java @@ -18,7 +18,7 @@ import java.util.List; * 买家端,采购报价接口 * * @author Bulbasaur - * @date: 2020/11/16 10:06 下午 + * @since: 2020/11/16 10:06 下午 */ @Api(tags = "买家端,采购报价接口") @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java index 32120938..a472a92a 100644 --- a/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/store/StoreBuyerController.java @@ -29,7 +29,7 @@ import java.util.List; * 买家端,店铺接口 * * @author Bulbasaur - * @date: 2020/11/17 2:32 下午 + * @since: 2020/11/17 2:32 下午 */ @RestController @RequestMapping("/buyer/store") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java index 12a18716..bc16e587 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/AfterSaleBuyerController.java @@ -30,7 +30,7 @@ import java.util.List; * 买家端,售后管理接口 * * @author Chopper - * @date 2020/11/16 10:02 下午 + * @since 2020/11/16 10:02 下午 */ @RestController @Api(tags = "买家端,售后管理接口") @@ -95,7 +95,7 @@ public class AfterSaleBuyerController { public ResultMessage delivery(@NotNull(message = "售后编号不能为空") @PathVariable("afterSaleSn") String afterSaleSn, @NotNull(message = "发货单号不能为空") @RequestParam String logisticsNo, @NotNull(message = "请选择物流公司") @RequestParam String logisticsId, - @NotNull(message = "请选择发货时间") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date mDeliverTime) { + @NotNull(message = "请选择发货时间") @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date mDeliverTime) { return ResultUtil.data(afterSaleService.buyerDelivery(afterSaleSn, logisticsNo, logisticsId, mDeliverTime)); } diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java index 3ae85451..ef62421c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/CartController.java @@ -25,7 +25,7 @@ import javax.validation.constraints.NotNull; * 买家端，购物车接口 * * @author Chopper - * @date 2020/11/16 10:04 下午 + * @since 2020/11/16 10:04 下午 */ @Slf4j @RestController diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java index dbb2ac27..ca35081e 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/OrderBuyerController.java @@ -28,7 +28,7 @@ import javax.validation.constraints.NotNull; * 买家端,订单接口 * * @author Chopper - * @date 2020/11/16 10:08 下午 + * @since 2020/11/16 10:08 下午 */ @RestController @Api(tags = "买家端,订单接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java index 9af8a36a..5f2466dc 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/RechargeTradeBuyerController.java @@ -21,7 +21,7 @@ import javax.validation.constraints.Min; * 买家端,预存款充值记录接口 * * @author paulG - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,预存款充值记录接口") diff --git a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java index aabb6b58..fc990f5c 100644 --- a/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java +++ b/buyer-api/src/main/java/cn/lili/controller/trade/WalletLogBuyerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * 买家端,预存款变动日志记录接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "买家端,预存款变动日志记录接口") diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java index 2b7134af..bee0fde5 100755 --- a/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerAuthenticationFilter.java @@ -35,8 +35,7 @@ import java.util.List; * * @author Chopper * @version v4.1 - * @date 2020/11/17 3:37 下午 - * @Description: + * @since 2020/11/17 3:37 下午 * @since */ @Slf4j diff --git a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java index 779e0d78..79eedb9f 100644 --- a/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java +++ b/buyer-api/src/main/java/cn/lili/security/BuyerSecurityConfig.java @@ -19,7 +19,6 @@ import org.springframework.web.cors.CorsConfigurationSource; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/14 16:20 */ diff --git a/common-api/src/main/java/cn/lili/CommonApiApplication.java b/common-api/src/main/java/cn/lili/CommonApiApplication.java index c97858ec..ceeefb59 100644 --- a/common-api/src/main/java/cn/lili/CommonApiApplication.java +++ b/common-api/src/main/java/cn/lili/CommonApiApplication.java @@ -8,7 +8,7 @@ import org.springframework.cache.annotation.EnableCaching; * 基础API * * @author Chopper - * @date 2020/11/17 3:38 下午 + * @since 2020/11/17 3:38 下午 */ @EnableCaching @SpringBootApplication diff --git a/common-api/src/main/java/cn/lili/controller/common/FileController.java b/common-api/src/main/java/cn/lili/controller/common/FileController.java index 20e33256..02c5f7dc 100644 --- a/common-api/src/main/java/cn/lili/controller/common/FileController.java +++ b/common-api/src/main/java/cn/lili/controller/common/FileController.java @@ -27,7 +27,7 @@ import java.util.List; * 文件管理管理接口 * * @author Chopper - * @date 2020/11/26 15:41 + * @since 2020/11/26 15:41 */ @RestController @Api(tags = "文件管理管理接口") diff --git a/common-api/src/main/java/cn/lili/controller/common/LogoController.java b/common-api/src/main/java/cn/lili/controller/common/LogoController.java index b3825ddf..63595430 100644 --- a/common-api/src/main/java/cn/lili/controller/common/LogoController.java +++ b/common-api/src/main/java/cn/lili/controller/common/LogoController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController; * 文件管理管理接口 * * @author Chopper - * @date 2020/11/26 15:41 + * @since 2020/11/26 15:41 */ @RestController @Api(tags = "文件管理管理接口") diff --git a/common-api/src/main/java/cn/lili/controller/common/RegionController.java b/common-api/src/main/java/cn/lili/controller/common/RegionController.java index 96a45dee..0ddc11cc 100644 --- a/common-api/src/main/java/cn/lili/controller/common/RegionController.java +++ b/common-api/src/main/java/cn/lili/controller/common/RegionController.java @@ -19,7 +19,6 @@ import java.util.List; * 地址信息接口 * * @author Chopper - * @date: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "地址信息接口") diff --git a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java index b41d0ace..f8f42657 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SliderImageController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.*; * 滑块验证码接口 * * @author Chopper - * @date 2020/11/26 15:41 + * @since 2020/11/26 15:41 */ @Slf4j @RestController diff --git a/common-api/src/main/java/cn/lili/controller/common/SmsController.java b/common-api/src/main/java/cn/lili/controller/common/SmsController.java index cfec27ab..c3683c64 100644 --- a/common-api/src/main/java/cn/lili/controller/common/SmsController.java +++ b/common-api/src/main/java/cn/lili/controller/common/SmsController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * 短信验证码接口 * * @author Chopper - * @date 2020/11/26 15:41 + * @since 2020/11/26 15:41 */ @RestController @Api(tags = "短信验证码接口") diff --git a/common-api/src/main/java/cn/lili/controller/common/UploadController.java b/common-api/src/main/java/cn/lili/controller/common/UploadController.java index d4f5cdfd..047dc8aa 100644 --- a/common-api/src/main/java/cn/lili/controller/common/UploadController.java +++ b/common-api/src/main/java/cn/lili/controller/common/UploadController.java @@ -35,7 +35,7 @@ import java.io.InputStream; * 文件上传接口 * * @author Chopper - * @date 2020/11/26 15:41 + * @since 2020/11/26 15:41 */ @Slf4j @RestController diff --git a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java index a3cd9e4c..c1d1d110 100644 --- a/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java +++ b/common-api/src/main/java/cn/lili/controller/security/CommonSecurityConfig.java @@ -17,7 +17,6 @@ import org.springframework.web.cors.CorsConfigurationSource; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/14 16:20 */ @Slf4j diff --git a/consumer/src/main/java/cn/lili/ConsumerApplication.java b/consumer/src/main/java/cn/lili/ConsumerApplication.java index afa05d8e..5b0ef78c 100644 --- a/consumer/src/main/java/cn/lili/ConsumerApplication.java +++ b/consumer/src/main/java/cn/lili/ConsumerApplication.java @@ -7,7 +7,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * 消费者 * * @author Chopper - * @date 2020/11/16 10:03 下午 + * @since 2020/11/16 10:03 下午 */ @SpringBootApplication public class ConsumerApplication { diff --git a/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java b/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java index 9524e265..0229cfb0 100644 --- a/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java +++ b/consumer/src/main/java/cn/lili/event/AfterSaleStatusChangeEvent.java @@ -7,7 +7,7 @@ import cn.lili.modules.order.order.entity.dos.AfterSale; * 售后单改变状态 * * @author Chopper - * @date 2020/11/17 7:13 下午 + * @since 2020/11/17 7:13 下午 */ public interface AfterSaleStatusChangeEvent { diff --git a/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java b/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java index 4ec0abfe..70c808a7 100644 --- a/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java +++ b/consumer/src/main/java/cn/lili/event/GoodsCommentCompleteEvent.java @@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dos.MemberEvaluation; * 订单状态改变事件 * * @author Chopper - * @date 2020/11/17 7:13 下午 + * @since 2020/11/17 7:13 下午 */ public interface GoodsCommentCompleteEvent { diff --git a/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java b/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java index 3a87ddfa..7b9802fe 100644 --- a/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java +++ b/consumer/src/main/java/cn/lili/event/MemberPointChangeEvent.java @@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dto.MemberPointMessage; * 会员积分改变消息 * * @author Chopper - * @date 2020/11/17 7:13 下午 + * @since 2020/11/17 7:13 下午 */ public interface MemberPointChangeEvent { diff --git a/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java b/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java index e9a32947..eef3231e 100644 --- a/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java +++ b/consumer/src/main/java/cn/lili/event/MemberRegisterEvent.java @@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dos.Member; * 会员注册消息 * * @author Chopper - * @date 2020/11/17 7:13 下午 + * @since 2020/11/17 7:13 下午 */ public interface MemberRegisterEvent { diff --git a/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java b/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java index 2738692a..0a2b333d 100644 --- a/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java +++ b/consumer/src/main/java/cn/lili/event/MemberWithdrawalEvent.java @@ -6,7 +6,7 @@ import cn.lili.modules.member.entity.dto.MemberWithdrawalMessage; * 会员提现消息 * * @author Chopper - * @date 2020/11/17 7:13 下午 + * @since 2020/11/17 7:13 下午 */ public interface MemberWithdrawalEvent { diff --git a/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java b/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java index f1598758..f370392c 100644 --- a/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java +++ b/consumer/src/main/java/cn/lili/event/OrderStatusChangeEvent.java @@ -6,7 +6,7 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage; * 订单状态改变事件 * * @author Chopper - * @date 2020/11/17 7:13 下午 + * @since 2020/11/17 7:13 下午 */ public interface OrderStatusChangeEvent { diff --git a/consumer/src/main/java/cn/lili/event/TradeEvent.java b/consumer/src/main/java/cn/lili/event/TradeEvent.java index 87316758..8d51eb13 100644 --- a/consumer/src/main/java/cn/lili/event/TradeEvent.java +++ b/consumer/src/main/java/cn/lili/event/TradeEvent.java @@ -6,7 +6,7 @@ import cn.lili.modules.order.cart.entity.dto.TradeDTO; * 订单创建消息 * * @author Chopper - * @date 2021/2/2 15:15 + * @since 2021/2/2 15:15 */ public interface TradeEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java index 21fe71f1..d917bc83 100644 --- a/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/DistributionOrderExecute.java @@ -22,7 +22,7 @@ import javax.annotation.Resource; * 分销订单入库 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 */ @Slf4j @Service diff --git a/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java b/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java index 1d465dac..6d91e9e7 100644 --- a/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/GoodsSkuExecute.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; * 商品SKU变化 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 */ @Service public class GoodsSkuExecute implements GoodsCommentCompleteEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java index 7fa3318a..883e3e70 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberExperienceExecute.java @@ -24,7 +24,7 @@ import org.springframework.stereotype.Service; * 会员经验值 * * @author Bulbasaur - * @date: 2021/5/16 11:16 下午 + * @since: 2021/5/16 11:16 下午 */ @Service public class MemberExperienceExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java index 6891833d..71cd6d01 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java @@ -28,7 +28,7 @@ import org.springframework.stereotype.Service; * 会员积分 * * @author Bulbasaur - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 */ @Service public class MemberPointExecute implements MemberRegisterEvent, GoodsCommentCompleteEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java b/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java index d4c8fa3b..99703c25 100644 --- a/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/MemberWalletExecute.java @@ -12,7 +12,7 @@ import org.springframework.stereotype.Service; * 会员钱包创建 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 */ @Service public class MemberWalletExecute implements MemberRegisterEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java index 29bbec5a..ab6fe54a 100644 --- a/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/NoticeMessageExecute.java @@ -27,7 +27,7 @@ import java.util.Map; * 通知类消息实现 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 **/ @Service public class NoticeMessageExecute implements TradeEvent, OrderStatusChangeEvent, AfterSaleStatusChangeEvent, MemberPointChangeEvent, MemberWithdrawalEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java index ca5ced61..36826a60 100644 --- a/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/OrderCreateReceiptExecute.java @@ -19,7 +19,7 @@ import java.util.List; * 订单创建发票相关处理 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 **/ @Service public class OrderCreateReceiptExecute implements TradeEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java index 8d99bace..93f80a0c 100644 --- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; * 订单状态处理类 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 **/ @Service public class OrderStatusHandlerExecute implements TradeEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java index 33819f7c..47df9720 100644 --- a/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/PaymentExecute.java @@ -18,7 +18,7 @@ import org.springframework.stereotype.Service; * 支付 * * @author Chopper - * @date 2021-03-13 16:58 + * @since 2021-03-13 16:58 */ @Slf4j @Service diff --git a/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java b/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java index 9eabd094..1f7a55b0 100644 --- a/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/RegisteredCouponActivityExecute.java @@ -16,7 +16,7 @@ import java.util.List; * 注册赠券活动 * * @author Bulbasaur - * @date: 2021/5/24 10:48 上午 + * @since: 2021/5/24 10:48 上午 */ @Component public class RegisteredCouponActivityExecute implements MemberRegisterEvent { diff --git a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java index 402b74f0..78c7e962 100644 --- a/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/StockUpdateExecute.java @@ -26,7 +26,7 @@ import java.util.List; * 库存扣减，他表示了订单状态是否出库成功 * * @author Chopper - * @date 2020-07-03 11:20 + * @since 2020-07-03 11:20 */ @Slf4j @Service diff --git a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java index 0b696158..a5177012 100644 --- a/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/VerificationOrderExecute.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Component; * 虚拟商品 * * @author Bulbasaur - * @date: 2021/5/29 9:17 上午 + * @since: 2021/5/29 9:17 上午 */ @Component public class VerificationOrderExecute implements OrderStatusChangeEvent { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java index dd927f90..e5fc9a59 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/EveryDayExecute.java @@ -5,7 +5,7 @@ package cn.lili.timetask.handler; * 每日凌晨1点执行 * * @author Chopper - * @date 2020/12/24 11:52 + * @since 2020/12/24 11:52 */ public interface EveryDayExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java index 9ebc83d8..46042203 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/EveryHourExecute.java @@ -4,7 +4,7 @@ package cn.lili.timetask.handler; * 每小时任务 * * @author Chopper - * @date 2020/12/24 11:52 + * @since 2020/12/24 11:52 */ public interface EveryHourExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java index 4d7e08c8..e1960e24 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/EveryMinuteExecute.java @@ -4,7 +4,7 @@ package cn.lili.timetask.handler; * 每分钟任务 * * @author Chopper - * @date 2020/12/24 11:52 + * @since 2020/12/24 11:52 */ public interface EveryMinuteExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java index c32087ba..f197ab07 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/bill/BillExecute.java @@ -16,7 +16,7 @@ import java.util.List; * 店铺结算执行 * * @author Bulbasaur - * @date 2021/2/18 3:45 下午 + * @since 2021/2/18 3:45 下午 */ @Component public class BillExecute implements EveryDayExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java index 3f3b5c70..69043a2d 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/broadcast/BroadcastExecute.java @@ -9,7 +9,7 @@ import org.springframework.stereotype.Component; * 小程序直播状态获取 * * @author Bulbasaur - * @date: 2021/5/20 2:52 下午 + * @since: 2021/5/20 2:52 下午 */ @Component public class BroadcastExecute implements EveryHourExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java index 68a66e98..bb56133c 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/coupon/CouponExecute.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * 优惠券状态监测 * * @author Bulbasaur - * @date: 2021/5/24 10:08 上午 + * @since: 2021/5/24 10:08 上午 */ @Component public class CouponExecute implements EveryDayExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java index 04a3bbca..85a68132 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/goods/GoodsExecute.java @@ -18,7 +18,7 @@ import java.util.Map; * 商品定时器 * * @author Chopper - * @date 2021/3/18 3:23 下午 + * @since 2021/3/18 3:23 下午 */ @Component public class GoodsExecute implements EveryDayExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java index 31c5e587..84e34132 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/order/CancelOrderTaskExecute.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; * 订单自动取消（每分钟执行） * * @author paulG - * @date 2021/3/11 + * @since 2021/3/11 **/ @Slf4j @Component diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java index 482963fb..4b397e38 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java @@ -33,7 +33,7 @@ import java.util.List; * 促销活动每日定时器 * * @author Chopper - * @date 2021/3/18 3:23 下午 + * @since 2021/3/18 3:23 下午 */ @Slf4j @Component diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java index a7d766dc..c939a334 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/MemberStatisticsExecute.java @@ -14,7 +14,7 @@ import java.util.Date; * 会员数据统计 * * @author Chopper - * @date 2021-03-02 14:56 + * @since 2021-03-02 14:56 */ @Slf4j @Component diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java index 2b80be56..6a35f44a 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/statistics/OnlineMemberStatistics.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * 实时在线人数统计 * * @author Chopper - * @date 2021-02-21 09:47 + * @since 2021-02-21 09:47 */ @Component public class OnlineMemberStatistics implements EveryHourExecute { 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 index 963ae544..d648c6a1 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 @@ -21,7 +21,7 @@ import java.util.List; * 店铺评分 * * @author Chopper - * @date 2021/3/15 5:30 下午 + * @since 2021/3/15 5:30 下午 */ @Component public class StoreRatingExecute implements EveryDayExecute { diff --git a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java index b39e455f..2601b761 100644 --- a/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java +++ b/consumer/src/main/java/cn/lili/timetask/handler/impl/view/PageViewStatisticsExecute.java @@ -23,7 +23,7 @@ import java.util.List; * 统计 入库 * * @author Chopper - * @date 2021-01-15 18:20 + * @since 2021-01-15 18:20 */ @Slf4j @Component diff --git a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java index f0910140..f4d40721 100644 --- a/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java +++ b/consumer/src/main/java/cn/lili/trigger/TimeTriggerConsumer.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; * 事件触发消费者 * * @author paulG - * @date 2020/11/17 7:19 下午 + * @since 2020/11/17 7:19 下午 */ @Component @Slf4j diff --git a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java index b421b129..a6bbeeb5 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/BroadcastTimeTriggerExecutor.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Component; * 直播间事件触发 * * @author Bulbasaur - * @date: 2021/6/1 5:02 下午 + * @since: 2021/6/1 5:02 下午 */ @Slf4j @Component(TimeExecuteConstant.BROADCAST_EXECUTOR) diff --git a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java index ddb90e51..77d80e91 100644 --- a/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java +++ b/consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java @@ -20,7 +20,7 @@ import org.springframework.stereotype.Component; * * @author Chopper * @version v4.1 - * @date 2020/11/17 7:20 下午 + * @since 2020/11/17 7:20 下午 */ @Slf4j @Component(TimeExecuteConstant.PROMOTION_EXECUTOR) diff --git a/framework/src/main/java/cn/lili/base/BaseEntity.java b/framework/src/main/java/cn/lili/base/BaseEntity.java index b87c511a..c667b149 100644 --- a/framework/src/main/java/cn/lili/base/BaseEntity.java +++ b/framework/src/main/java/cn/lili/base/BaseEntity.java @@ -57,7 +57,7 @@ public abstract class BaseEntity 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; @@ -69,7 +69,7 @@ public abstract class BaseEntity implements Serializable { @LastModifiedDate @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.UPDATE) @ApiModelProperty(value = "更新时间", hidden = true) private Date updateTime; diff --git a/framework/src/main/java/cn/lili/common/cache/Cache.java b/framework/src/main/java/cn/lili/common/cache/Cache.java index 25d919ce..a6064b52 100644 --- a/framework/src/main/java/cn/lili/common/cache/Cache.java +++ b/framework/src/main/java/cn/lili/common/cache/Cache.java @@ -19,7 +19,7 @@ public interface Cache { /** * Get an item from the cache, nontransactionally * - * @param key + * @param key 缓存key * @return the cached object or null */ T get(Object key); @@ -27,7 +27,7 @@ public interface Cache { /** * Get an item from the cache, nontransactionally * - * @param key + * @param key 缓存key * @return the cached object or null */ String getString(Object key); @@ -37,14 +37,14 @@ public interface Cache { * multiGet * * @param keys 要查询的key集合 - * @return + * @return 集合 */ List multiGet(Collection keys); /** * 批量set * - * @param map + * @param map 键值对 */ void multiSet(Map map); @@ -60,16 +60,16 @@ public interface Cache { * Add an item to the cache, nontransactionally, with * failfast semantics * - * @param key - * @param value + * @param key 缓存key + * @param value 缓存value */ void put(Object key, T value); /** * 往缓存中写入内容 * - * @param key - * @param value + * @param key 缓存key + * @param value 缓存value * @param exp 超时时间，单位为秒 */ void put(Object key, T value, Long exp); @@ -77,24 +77,24 @@ public interface Cache { /** * 往缓存中写入内容 * - * @param key - * @param value - * @param exp - * @param timeUnit 写入单位 + * @param key 缓存key + * @param value 缓存value + * @param exp 过期时间 + * @param timeUnit 过期单位 */ void put(Object key, T value, Long exp, TimeUnit timeUnit); /** * 删除 * - * @param key + * @param key 缓存key */ void remove(Object key); /** * 删除 * - * @param key + * @param key 缓存key */ void vagueDel(Object key); @@ -116,33 +116,34 @@ public interface Cache { /** * 玩缓存中写入内容 * - * @param key - * @param map + * @param key 缓存key + * @param map map value */ void putAllHash(Object key, Map map); /** * 读取缓存值 * - * @param key - * @param hashKey - * @return + * @param key 缓存key + * @param hashKey map value + * @return 返回缓存中的数据 */ T getHash(Object key, Object hashKey); /** * 读取缓存值 * - * @param key - * @return + * @param key 缓存key + * @return 缓存中的数据 */ Map getHash(Object key); /** * 是否包含 * - * @param key - * @return + * @param key 缓存key + * @return 缓存中的数据 + * */ boolean hasKey(Object key); @@ -150,8 +151,8 @@ public interface Cache { /** * 模糊匹配key * - * @param pattern - * @return + * @param pattern 模糊key + * @return 缓存中的数据 */ List keys(String pattern); @@ -163,9 +164,9 @@ public interface Cache { * 效率较高的 计数器 * 如需清零，按照普通key 移除即可 * - * @param key - * @param value - * @return + * @param key key值 + * @param value 去重统计值 + * @return 计数器结果 */ Long cumulative(Object key, Object value); @@ -175,8 +176,8 @@ public interface Cache { * 效率较高的 计数器 统计返回 * 如需清零，按照普通key 移除即可 * - * @param key - * @return + * @param key 计数器key + * @return 计数器结果 */ Long counter(Object key); @@ -184,7 +185,7 @@ public interface Cache { * 批量计数 * * @param keys 要查询的key集合 - * @return + * @return 批量计数 */ List multiCounter(Collection keys); @@ -194,8 +195,8 @@ public interface Cache { * 效率较高的 计数器 统计返回 * 如需清零，按照普通key 移除即可 * - * @param key - * @return + * @param key key值 + * @return 计数器结果 */ Long mergeCounter(Object... key); //---------------------------------------------------用于特殊场景，redis去重统计----------------------------------------- @@ -208,7 +209,7 @@ public interface Cache { * * @param key 为累计的key，同一key每次调用则值 +1 * @param liveTime 单位秒后失效 - * @return + * @return 计数器结果 */ Long incr(String key, long liveTime); //-----------------------------------------------redis计数--------------------------------------------- @@ -230,7 +231,7 @@ public interface Cache { * @param sortedSetName sortedSetName * @param start 查询范围开始位置 * @param end 查询范围结束位置 - * @return + * @return 获取满足条件的集合 */ Set> reverseRangeWithScores(String sortedSetName, Integer start, Integer end); diff --git a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java b/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java index ef331665..880882b2 100644 --- a/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java +++ b/framework/src/main/java/cn/lili/common/cache/impl/RedisCache.java @@ -86,7 +86,7 @@ public class RedisCache implements Cache { /** * 删除 * - * @param key + * @param key 模糊删除key */ @Override public void vagueDel(Object key) { @@ -130,7 +130,7 @@ public class RedisCache implements Cache { * 获取符合条件的key * * @param pattern 表达式 - * @return + * @return 模糊匹配key */ @Override public List keys(String pattern) { @@ -236,7 +236,7 @@ public class RedisCache implements Cache { * @param sortedSetName sortedSetName * @param start 查询范围开始位置 * @param end 查询范围结束位置 - * @return + * @return 符合排序的集合 */ @Override public Set> reverseRangeWithScores(String sortedSetName, Integer start, Integer end) { diff --git a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java b/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java index a133da67..8c547e98 100644 --- a/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java +++ b/framework/src/main/java/cn/lili/common/elasticsearch/BaseElasticsearchService.java @@ -335,7 +335,7 @@ public abstract class BaseElasticsearchService { * @param index index名 * @return boolean * @author fanxb - * @date 2019/7/24 14:57 + * @since 2019/7/24 14:57 */ public boolean indexExist(String index) { try { diff --git a/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java index 3a216470..78bbdf75 100644 --- a/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java +++ b/framework/src/main/java/cn/lili/common/enums/ClientTypeEnum.java @@ -5,7 +5,7 @@ package cn.lili.common.enums; * 客户端类型 * * @author Chopper - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum ClientTypeEnum { diff --git a/framework/src/main/java/cn/lili/common/enums/ResultCode.java b/framework/src/main/java/cn/lili/common/enums/ResultCode.java index 3635cd19..1f8b41fd 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultCode.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultCode.java @@ -5,7 +5,7 @@ package cn.lili.common.enums; * 第一位 1:商品；2:用户；3:交易,4:促销,5:店铺,6:页面,7:设置,8:其他 * * @author Chopper - * @date 2020/4/8 1:36 下午 + * @since 2020/4/8 1:36 下午 */ public enum ResultCode { diff --git a/framework/src/main/java/cn/lili/common/enums/ResultUtil.java b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java index b4883e5a..e7076480 100644 --- a/framework/src/main/java/cn/lili/common/enums/ResultUtil.java +++ b/framework/src/main/java/cn/lili/common/enums/ResultUtil.java @@ -33,8 +33,8 @@ public class ResultUtil { /** * 返回数据 * - * @param t - * @return + * @param t 范型 + * @return 消息 */ public ResultMessage setData(T t) { this.resultMessage.setResult(t); @@ -58,9 +58,9 @@ public class ResultUtil { /** * 抽象静态方法，返回结果集 - * @param t - * @param - * @return + * @param t 范型 + * @param 范型 + * @return 消息 */ public static ResultMessage data(T t) { return new ResultUtil().setData(t); @@ -70,6 +70,7 @@ public class ResultUtil { * 返回成功 * * @param resultCode 返回状态码 + * @return 消息 */ public static ResultMessage success(ResultCode resultCode) { return new ResultUtil().setSuccessMsg(resultCode); @@ -77,6 +78,7 @@ public class ResultUtil { /** * 返回成功 + * @return 消息 */ public static ResultMessage success() { return new ResultUtil().setSuccessMsg(ResultCode.SUCCESS); @@ -86,6 +88,7 @@ public class ResultUtil { * 返回失败 * * @param resultCode 返回状态码 + * @return 消息 */ public static ResultMessage error(ResultCode resultCode) { return new ResultUtil().setErrorMsg(resultCode); @@ -96,6 +99,7 @@ public class ResultUtil { * * @param code 状态码 * @param msg 返回消息 + * @return 消息 */ public static ResultMessage error(Integer code, String msg) { return new ResultUtil().setErrorMsg(code, msg); @@ -103,8 +107,8 @@ public class ResultUtil { /** * 服务器异常 追加状态码 - * * @param resultCode 返回码 + * @return 消息 */ public ResultMessage setErrorMsg(ResultCode resultCode) { this.resultMessage.setSuccess(false); @@ -118,6 +122,7 @@ public class ResultUtil { * * @param code 状态码 * @param msg 返回消息 + * @return 消息 */ public ResultMessage setErrorMsg(Integer code, String msg) { this.resultMessage.setSuccess(false); diff --git a/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java b/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java index 2437cc99..fad46b09 100644 --- a/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java +++ b/framework/src/main/java/cn/lili/common/heath/DataSourceHealthConfig.java @@ -17,7 +17,6 @@ import java.util.Map; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/24 19:31 */ diff --git a/framework/src/main/java/cn/lili/common/security/context/AuthenticationHandler.java b/framework/src/main/java/cn/lili/common/security/context/AuthenticationHandler.java deleted file mode 100644 index 0a7b8c55..00000000 --- a/framework/src/main/java/cn/lili/common/security/context/AuthenticationHandler.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.lili.common.security.context; - -import cn.lili.common.security.AuthUser; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; - -/** - * 获取用户信息 处理 - * - * @author Chopper - * @version v4.0 - * @Description: - * @since 2020/11/14 20:35 - */ -@Component -public class AuthenticationHandler { - - /** - * 获取当前用户信息 - * - * @return - */ - public AuthUser getAuthUser() { - //获取spring security 权限信息，如果token有权限，在这里就会得到内容 - Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - if (authentication == null) { - return null; - } - Object object = authentication.getDetails(); - if (object instanceof AuthUser) { - return (AuthUser) authentication.getDetails(); - } - return null; - } -} diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContext.java b/framework/src/main/java/cn/lili/common/security/context/UserContext.java index af1c4623..1cb42b92 100644 --- a/framework/src/main/java/cn/lili/common/security/context/UserContext.java +++ b/framework/src/main/java/cn/lili/common/security/context/UserContext.java @@ -19,7 +19,6 @@ import javax.servlet.http.HttpServletRequest; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/14 20:27 */ public class UserContext { @@ -27,7 +26,7 @@ public class UserContext { /** * 根据request获取用户信息 * - * @return + * @return 授权用户 */ public static AuthUser getCurrentUser() { if (RequestContextHolder.getRequestAttributes() != null) { @@ -44,7 +43,7 @@ public class UserContext { * * @param cache 缓存 * @param accessToken token - * @return + * @return 授权用户 */ public static AuthUser getAuthUser(Cache cache, String accessToken) { try { @@ -61,7 +60,7 @@ public class UserContext { * 根据jwt获取token重的用户信息 * * @param accessToken token - * @return + * @return 授权用户 */ public static AuthUser getAuthUser(String accessToken) { try { diff --git a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java b/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java deleted file mode 100644 index f6dbaa1d..00000000 --- a/framework/src/main/java/cn/lili/common/security/context/UserContextInit.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.lili.common.security.context; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.ApplicationArguments; -import org.springframework.boot.ApplicationRunner; -import org.springframework.stereotype.Component; - -/** - * 给予用户上下文，初始化参数 - * - * @author Chopper - * @version v4.0 - * @Description: - * @since 2020/11/14 20:30 - */ -@Component -public class UserContextInit implements ApplicationRunner { - - /** - * 用户信息holder，认证信息的获取者 - */ - @Autowired - private AuthenticationHandler authenticationHandler; - - /** - * 在项目加载时指定认证信息获取者 - * 默认是由spring 安全上下文中获取 - * - * @param args - * @throws Exception - */ - @Override - public void run(ApplicationArguments args) { - //UserContext.setHolder(authenticationHandler); - } -} diff --git a/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java b/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java index cb30323c..07d86b64 100644 --- a/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java +++ b/framework/src/main/java/cn/lili/common/security/enums/UserEnums.java @@ -5,7 +5,6 @@ package cn.lili.common.security.enums; * * @author Chopper * @version v1.0 - * @Description: * @since 2020/8/18 15:23 */ public enum UserEnums { diff --git a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java b/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java index ebc0e2f9..a48c0545 100644 --- a/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java +++ b/framework/src/main/java/cn/lili/common/sms/AliSmsUtil.java @@ -8,7 +8,6 @@ import java.util.Map; /** * @author Chopper * @version v4.1 - * @Description: * @since 2021/2/1 6:05 下午 */ public interface AliSmsUtil { diff --git a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java b/framework/src/main/java/cn/lili/common/sms/SmsUtil.java index 2f2cf4a2..e47e5f1e 100644 --- a/framework/src/main/java/cn/lili/common/sms/SmsUtil.java +++ b/framework/src/main/java/cn/lili/common/sms/SmsUtil.java @@ -10,7 +10,6 @@ import java.util.Map; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/30 15:44 */ public interface SmsUtil { diff --git a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java index adf9c124..8148317f 100644 --- a/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java +++ b/framework/src/main/java/cn/lili/common/sms/impl/SmsUtilAliImplService.java @@ -40,7 +40,6 @@ import java.util.Map; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/30 15:44 */ @Component @@ -343,10 +342,9 @@ public class SmsUtilAliImplService implements SmsUtil, AliSmsUtil { /** - * 使用AK&SK初始化账号Client + * 初始化账号Client * - * @return Client - * @throws Exception + * @return Client 短信操作util */ public com.aliyun.dysmsapi20170525.Client createClient() { try { diff --git a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java b/framework/src/main/java/cn/lili/common/token/PermissionEnum.java index be6e1d28..cc49343c 100644 --- a/framework/src/main/java/cn/lili/common/token/PermissionEnum.java +++ b/framework/src/main/java/cn/lili/common/token/PermissionEnum.java @@ -5,7 +5,6 @@ package cn.lili.common.token; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/25 09:21 */ diff --git a/framework/src/main/java/cn/lili/common/token/TokenUtil.java b/framework/src/main/java/cn/lili/common/token/TokenUtil.java index fbf85423..7646a833 100644 --- a/framework/src/main/java/cn/lili/common/token/TokenUtil.java +++ b/framework/src/main/java/cn/lili/common/token/TokenUtil.java @@ -37,7 +37,8 @@ public class TokenUtil { * @param username 主体 * @param claim 私有声明 * @param longTerm 长时间特殊token 如：移动端，微信小程序等 - * @return + * @param userEnums 用户枚举 + * @return TOKEN */ public Token createToken(String username, Object claim, boolean longTerm, UserEnums userEnums) { Token token = new Token(); @@ -61,6 +62,7 @@ public class TokenUtil { * 刷新token * * @param oldRefreshToken 刷新token + * @param userEnums 用户枚举 * @return token */ public Token refreshToken(String oldRefreshToken, UserEnums userEnums) { @@ -118,7 +120,7 @@ public class TokenUtil { * @param username 主体 * @param claim 私有神明内容 * @param expirationTime 过期时间（分钟） - * @return + * @return token字符串 */ private String createToken(String username, Object claim, Long expirationTime) { //JWT 生成 diff --git a/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java index ff22fd0c..ddb5cf46 100644 --- a/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/AbstractTokenGenerate.java @@ -18,7 +18,7 @@ public abstract class AbstractTokenGenerate { * * @param username 用户名 * @param longTerm 是否长时间有效 - * @return + * @return TOKEN对象 */ public abstract Token createToken(String username, Boolean longTerm); diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java index e4c629b6..b6994d7d 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/ManagerTokenGenerate.java @@ -25,7 +25,6 @@ import java.util.Map; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/16 10:51 */ @Component diff --git a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java index 003c0db1..185e087d 100644 --- a/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java +++ b/framework/src/main/java/cn/lili/common/token/base/generate/MemberTokenGenerate.java @@ -19,7 +19,6 @@ import java.util.Date; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/16 10:50 */ @Component diff --git a/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java b/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java index 28f92713..edf0b0e0 100644 --- a/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java +++ b/framework/src/main/java/cn/lili/common/trigger/delay/queue/PromotionDelayQueue.java @@ -9,8 +9,7 @@ import org.springframework.stereotype.Component; * * @author paulG * @version v4.1 - * @date 2020/11/17 7:19 下午 - * @description + * @since 2020/11/17 7:19 下午 * @since 1 */ @Component diff --git a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java b/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java index 54998fda..488fc476 100644 --- a/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java +++ b/framework/src/main/java/cn/lili/common/trigger/enums/DelayQueueEnums.java @@ -4,7 +4,6 @@ package cn.lili.common.trigger.enums; * 队列枚举 * * @author Bulbasaur - * @date: 2021/7/9 1:40 上午 */ public enum DelayQueueEnums { diff --git a/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java b/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java index 42e96cbf..105769ec 100644 --- a/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java +++ b/framework/src/main/java/cn/lili/common/trigger/message/BroadcastMessage.java @@ -10,7 +10,7 @@ import java.util.Date; * 直播消息实体 * * @author Bulbasaur - * @date: 2021/6/1 4:48 下午 + * @since: 2021/6/1 4:48 下午 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java b/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java index 1ec5c1ae..39afaf8b 100644 --- a/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java +++ b/framework/src/main/java/cn/lili/common/trigger/message/PromotionMessage.java @@ -10,7 +10,7 @@ import java.util.Date; * 信息队列传输促销信息实体 * * @author paulG - * @date 2020/10/30 + * @since 2020/10/30 **/ @Data @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/common/utils/BeanUtil.java b/framework/src/main/java/cn/lili/common/utils/BeanUtil.java index 849f89d3..55eda005 100644 --- a/framework/src/main/java/cn/lili/common/utils/BeanUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/BeanUtil.java @@ -15,8 +15,8 @@ public class BeanUtil { /** * 复制属性 * - * @param objectFrom - * @param objectTo + * @param objectFrom 源自对象 + * @param objectTo 复制给对象 */ public static void copyProperties(Object objectFrom, Object objectTo) { BeanUtils.copyProperties(objectFrom, objectTo); @@ -25,6 +25,8 @@ public class BeanUtil { /** * 获取属性名数组 + * @param o 获取字段的对象 + * @return 返回各个字段 */ public static String[] getFiledName(Object o) { Field[] fields = o.getClass().getDeclaredFields(); @@ -67,6 +69,8 @@ public class BeanUtil { /** * 将对象转换为key value * A=a&B=b&C=c 格式 + * @param object 对象 + * @return 格式化结果 */ public static String formatKeyValuePair(Object object) { //准备接受的字符串 @@ -91,6 +95,10 @@ public class BeanUtil { /** * key value键值对 转换为 对象 * A=a&B=b&C=c 格式 转换为对象 + * @param str 对象字符串 + * @param t 范型 + * @param 范型 + * @return 格式化结果 */ public static T formatKeyValuePair(String str, T t) { //填写对参数键值对 diff --git a/framework/src/main/java/cn/lili/common/utils/CommonUtil.java b/framework/src/main/java/cn/lili/common/utils/CommonUtil.java index e6c8e0e8..65c82bc8 100644 --- a/framework/src/main/java/cn/lili/common/utils/CommonUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/CommonUtil.java @@ -11,8 +11,8 @@ public class CommonUtil { /** * 以UUID重命名 - * @param fileName - * @return + * @param fileName 文件名称 + * @return 格式化名称 */ public static String rename(String fileName) { String extName = fileName.substring(fileName.lastIndexOf(".")); @@ -32,20 +32,4 @@ public class CommonUtil { return str; } - /** - * 批量递归删除时 判断target是否在ids中 避免重复删除 - * @param target - * @param ids - * @return - */ - public static Boolean judgeIds(String target, String[] ids){ - Boolean flag = false; - for(String id : ids){ - if(id.equals(target)){ - flag = true; - break; - } - } - return flag; - } } diff --git a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java index b860d68e..d16bd544 100644 --- a/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/CurrencyUtil.java @@ -6,7 +6,7 @@ import java.math.BigDecimal; * 金额计算工具 * * @author Bulbasaur - * @date: 2021/7/9 1:40 上午 + * @since: 2021/7/9 1:40 上午 */ public final class CurrencyUtil { /** @@ -130,8 +130,8 @@ public final class CurrencyUtil { /** * 金额转分 * - * @param money - * @return + * @param money 金额 + * @return 转换单位为分 */ public static Integer fen(Double money) { double price = mul(money, 100); @@ -141,15 +141,11 @@ public final class CurrencyUtil { /** * 金额转分 * - * @param money - * @return + * @param money 金额 + * @return double类型分 */ public static double reversalFen(Double money) { double price = div(money, 100); return price; } - - public static void main(String[] args) { - System.out.println(fen(23.4324)); - } } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/common/utils/DateUtil.java b/framework/src/main/java/cn/lili/common/utils/DateUtil.java index 7a3db41c..769c312f 100644 --- a/framework/src/main/java/cn/lili/common/utils/DateUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/DateUtil.java @@ -23,7 +23,7 @@ public class DateUtil { /** * 当天的开始时间 * - * @return + * @return 今天开始时间 */ public static Date startOfTodDayTime() { Calendar calendar = Calendar.getInstance(); @@ -36,8 +36,8 @@ public class DateUtil { /** * 当天的开始时间 - * - * @return + * @param date 时间 + * @return 根据传入的时间获取开始时间 */ public static Date startOfTodDayTime(Date date) { Calendar calendar = Calendar.getInstance(); @@ -51,7 +51,7 @@ public class DateUtil { /** * 当天的开始时间 * - * @return + * @return 今天开始时间 */ public static long startOfTodDay() { Calendar calendar = Calendar.getInstance(); @@ -63,14 +63,10 @@ public class DateUtil { return date.getTime() / 1000; } - public static void main(String[] args) { - - } - /** * 当天的结束时间 * - * @return + * @return 今天结束时间 */ public static Date endOfDate() { Calendar calendar = Calendar.getInstance(); @@ -83,8 +79,8 @@ public class DateUtil { /** * 当天的结束时间 - * - * @return + * @param date 传入日期 + * @return 获得传入日期当天结束时间 */ public static Date endOfDate(Date date) { if (date == null) { @@ -125,7 +121,7 @@ public class DateUtil { * * @param date 字符串日期 * @param pattern 日期格式 - * @return + * @return date */ public static Date toDate(String date, String pattern) { if ("".equals("" + date)) { @@ -148,7 +144,7 @@ public class DateUtil { /** * 获取上个月的开始结束时间 * - * @return + * @return 上个月的开始结束时间 */ public static Long[] getLastMonth() { //取得系统当前时间 @@ -198,7 +194,7 @@ public class DateUtil { * 把日期转换成字符串型 * * @param date 日期 - * @return + * @return 字符串时间 */ public static String toString(Date date) { return toString(date, STANDARD_FORMAT); @@ -207,8 +203,8 @@ public class DateUtil { /** * 把日期转换成字符串型 * - * @param Long 日期 - * @return + * @param date 日期 + * @return 字符串时间 */ public static String toString(Long date) { return toString(date, STANDARD_FORMAT); @@ -219,7 +215,7 @@ public class DateUtil { * * @param date 日期 * @param pattern 类型 - * @return + * @return 字符串时间 */ public static String toString(Date date, String pattern) { if (date == null) { @@ -243,7 +239,7 @@ public class DateUtil { * * @param time 时间戳 * @param pattern 格式 - * @return + * @return 字符串时间 */ public static String toString(Long time, String pattern) { if (time > 0) { @@ -251,8 +247,7 @@ public class DateUtil { time = time * 1000; } Date date = new Date(time); - String str = DateUtil.toString(date, pattern); - return str; + return DateUtil.toString(date, pattern); } return ""; } @@ -321,7 +316,7 @@ public class DateUtil { * 获取几个月之前的日期时间戳 * * @param beforeMonth 几个月之前 - * @return + * @return 时间戳 */ public static long getBeforeMonthDateline(int beforeMonth) { SimpleDateFormat format = new SimpleDateFormat(STANDARD_FORMAT); diff --git a/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java b/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java index dccbb6cf..18f17fba 100644 --- a/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java +++ b/framework/src/main/java/cn/lili/common/utils/HttpClientUtils.java @@ -35,7 +35,7 @@ import java.util.Map; * HttpClientUtils * * @author Bulbasaur - * @date: 2021/7/9 1:40 上午 + * @since: 2021/7/9 1:40 上午 */ @Slf4j public class HttpClientUtils { diff --git a/framework/src/main/java/cn/lili/common/utils/IpHelper.java b/framework/src/main/java/cn/lili/common/utils/IpHelper.java index 7c5a136e..6dbae5bb 100644 --- a/framework/src/main/java/cn/lili/common/utils/IpHelper.java +++ b/framework/src/main/java/cn/lili/common/utils/IpHelper.java @@ -40,8 +40,8 @@ public class IpHelper { /** * 获取IP返回地理信息 * - * @param - * @return + * @param request 请求参数 + * @return 城市信息 */ public String getIpCity(HttpServletRequest request) { diff --git a/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java b/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java index d1b7ced3..b756fcef 100644 --- a/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/JasyptUtil.java @@ -14,29 +14,32 @@ public class JasyptUtil { * Jasypt生成加密结果 * @param password 配置文件中设定的加密密码 jasypt.encryptor.password * @param value 待加密值 - * @return + * @return 加密字符串 */ - public static String encyptPwd(String password,String value){ + public static String encryptPwd(String password, String value){ PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - encryptor.setConfig(cryptor(password)); - String result = encryptor.encrypt(value); - return result; + encryptor.setConfig(encryptor(password)); + return encryptor.encrypt(value); } /** * 解密 * @param password 配置文件中设定的加密密码 jasypt.encryptor.password * @param value 待解密密文 - * @return + * @return 揭秘字符串 */ - public static String decyptPwd(String password,String value){ + public static String decryptPwd(String password, String value){ PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor(); - encryptor.setConfig(cryptor(password)); + encryptor.setConfig(encryptor(password)); encryptor.decrypt(value); - String result = encryptor.decrypt(value); - return result; + return encryptor.decrypt(value); } - public static SimpleStringPBEConfig cryptor(String password){ + /** + * 加密处理 + * @param password 密码 + * @return 加密字符串 + */ + public static SimpleStringPBEConfig encryptor(String password){ SimpleStringPBEConfig config = new SimpleStringPBEConfig(); config.setPassword(password); config.setAlgorithm("PBEWITHHMACSHA512ANDAES_256"); @@ -52,8 +55,8 @@ public class JasyptUtil { public static void main(String[] args){ //加密 若修改了第一个参数加密password记得在配置文件同步修改 - System.out.println(encyptPwd("jasypt.encryptor.password","123456")); + System.out.println(encryptPwd("jasypt.encryptor.password","123456")); //解密 - System.out.println(decyptPwd("jasypt.encryptor.password","PYVnAYh+j5C3jkMV1d+myj6JzDaUk7pcfTWUaYsvQdEVkuvIVf7Y0mOU9XkffxT8")); + System.out.println(decryptPwd("jasypt.encryptor.password","PYVnAYh+j5C3jkMV1d+myj6JzDaUk7pcfTWUaYsvQdEVkuvIVf7Y0mOU9XkffxT8")); } } diff --git a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java b/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java index 4eb47a6d..e7545116 100644 --- a/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java +++ b/framework/src/main/java/cn/lili/common/utils/OperationalJudgment.java @@ -18,8 +18,8 @@ public class OperationalJudgment { * 需要判定的对象必须包含属性 memberId，storeId 代表判定的角色 * * @param object 判定的对象 - * @param - * @return + * @param 判定处理对象 + * @return 处理结果 */ public static t judgment(t object) { return judgment(object, "memberId", "storeId"); @@ -28,10 +28,10 @@ public class OperationalJudgment { /** * 需要判定的对象必须包含属性 memberId，storeId 代表判定的角色 * - * @param object - * @param buyerIdField - * @param storeIdField - * @param + * @param object 判定对象 + * @param buyerIdField 买家id + * @param storeIdField 店铺id + * @param 范型 * @return 返回判定本身，防止多次查询对象 */ public static t judgment(t object, String buyerIdField, String storeIdField) { diff --git a/framework/src/main/java/cn/lili/common/utils/PageUtil.java b/framework/src/main/java/cn/lili/common/utils/PageUtil.java index 3fcb5e0d..119a9124 100644 --- a/framework/src/main/java/cn/lili/common/utils/PageUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/PageUtil.java @@ -17,7 +17,6 @@ import java.util.List; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/26 15:23 */ public class PageUtil { @@ -26,8 +25,9 @@ public class PageUtil { /** * Mybatis-Plus分页封装 * - * @param page - * @return + * @param page 分页VO + * @param 范型 + * @return 分页响应 */ public static Page initPage(PageVO page) { @@ -74,8 +74,8 @@ public class PageUtil { * 生成条件搜索 全对象对比 equals * 如果需要like 需要另行处理 * - * @param object - * @return + * @param object 对象（根据对象构建查询条件） + * @return 查询wrapper */ public static QueryWrapper initWrapper(Object object) { return initWrapper(object, null); @@ -84,9 +84,9 @@ public class PageUtil { /** * 生成条件搜索 全对象对比 * - * @param object - * @param searchVo - * @return + * @param object 对象 + * @param searchVo 查询条件 + * @return 查询wrapper */ public static QueryWrapper initWrapper(Object object, SearchVO searchVo) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -118,9 +118,9 @@ public class PageUtil { /** * List 手动分页 * - * @param page - * @param list - * @return + * @param page 分页对象 + * @param list 分页集合 + * @return 范型结果 */ public static List listToPage(PageVO page, List list) { diff --git a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java b/framework/src/main/java/cn/lili/common/utils/RedisUtil.java index ece32671..c1ac34b3 100644 --- a/framework/src/main/java/cn/lili/common/utils/RedisUtil.java +++ b/framework/src/main/java/cn/lili/common/utils/RedisUtil.java @@ -29,7 +29,7 @@ public class RedisUtil { * * @param key 键 * @param time 时间(秒) - * @return + * @return 操作结果 */ public boolean expire(String key, long time) { try { @@ -133,7 +133,7 @@ public class RedisUtil { * * @param key 键 * @param value 值 - * @return + * @return 操作结果 */ public boolean lSet(String key, Object value) { try { @@ -151,7 +151,7 @@ public class RedisUtil { * @param key 键 * @param value 值 * @param time 时间(秒) - * @return + * @return 操作结果 */ public boolean lSet(String key, Object value, long time) { try { @@ -171,7 +171,7 @@ public class RedisUtil { * * @param key 键 * @param value 值 - * @return + * @return 操作结果 */ public boolean lSet(String key, List value) { try { @@ -190,7 +190,7 @@ public class RedisUtil { * @param key 键 * @param value 值 * @param time 时间(秒) - * @return + * @return 操作结果 */ public boolean lSet(String key, List value, long time) { try { @@ -211,10 +211,10 @@ public class RedisUtil { /** * 向Zset里添加成员 * - * @param key - * @param score - * @param value - * @return + * @param key 键 + * @param score 分数 + * @param value 值 + * @return 操作结果 */ public boolean zadd(String key, long score, String value) { return redisTemplate.opsForZSet().add(key, value, score); @@ -225,10 +225,10 @@ public class RedisUtil { /** * 获取 某key 下 某一分值区间的队列 * - * @param key - * @param from - * @param to - * @return + * @param key 键 + * @param from 起始位置 + * @param to 结束为止 + * @return 符合条件的结果集 */ public Set zrangeByScoreWithScores(String key, int from, long to) { Set set = redisTemplate.opsForZSet().rangeByScoreWithScores(key, from, to); @@ -238,9 +238,9 @@ public class RedisUtil { /** * 移除 Zset队列值 * - * @param key - * @param value - * @return + * @param key 键 + * @param value 值集合 + * @return 移除数量 */ public Long zremove(String key, String... value) { return redisTemplate.opsForZSet().remove(key, value); diff --git a/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java b/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java index 63d673ba..c27656f6 100644 --- a/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java +++ b/framework/src/main/java/cn/lili/common/validation/impl/MobileValidator.java @@ -12,7 +12,7 @@ import java.util.regex.Pattern; * 支持手机号+电话同时校验 * * @author Bulbasaur - * @date: 2021/7/9 1:41 上午 + * @since: 2021/7/9 1:41 上午 */ public class MobileValidator implements ConstraintValidator { diff --git a/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java b/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java index ad0d9885..8e95ebf9 100644 --- a/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java +++ b/framework/src/main/java/cn/lili/common/validation/impl/PhoneValidator.java @@ -11,7 +11,7 @@ import java.util.regex.Pattern; * 手机号校验 * * @author Bulbasaur - * @date: 2021/7/9 1:42 上午 + * @since: 2021/7/9 1:42 上午 */ public class PhoneValidator implements ConstraintValidator { diff --git a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java b/framework/src/main/java/cn/lili/common/verification/ImageUtil.java index 98891ec5..e80959f7 100644 --- a/framework/src/main/java/cn/lili/common/verification/ImageUtil.java +++ b/framework/src/main/java/cn/lili/common/verification/ImageUtil.java @@ -16,9 +16,9 @@ public class ImageUtil { /** * 添加水印 * - * @param oriImage - * @param text - * @throws IOException + * @param oriImage 原图 + * @param text 文字 + * @throws IOException 流操作异常 */ public static void addWatermark(BufferedImage oriImage, String text) { Graphics2D graphics2D = oriImage.createGraphics(); diff --git a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java b/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java index 69339d02..988325c4 100644 --- a/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java +++ b/framework/src/main/java/cn/lili/common/verification/SliderImageUtil.java @@ -19,7 +19,6 @@ import java.util.Random; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/17 14:34 */ @Component diff --git a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java b/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java index 4508033a..86630ff3 100644 --- a/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java +++ b/framework/src/main/java/cn/lili/common/verification/VerificationSDK.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Component; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/17 15:43 */ @Component diff --git a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java b/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java index 382a6868..b9065fac 100644 --- a/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java +++ b/framework/src/main/java/cn/lili/common/verification/service/VerificationService.java @@ -9,7 +9,7 @@ import java.util.Map; * 验证码模块 * * @author Bulbasaur - * @date: 2021/7/9 1:42 上午 + * @since: 2021/7/9 1:42 上午 */ public interface VerificationService { /** diff --git a/framework/src/main/java/cn/lili/common/vo/PageVO.java b/framework/src/main/java/cn/lili/common/vo/PageVO.java index cc379fae..6d7fca44 100644 --- a/framework/src/main/java/cn/lili/common/vo/PageVO.java +++ b/framework/src/main/java/cn/lili/common/vo/PageVO.java @@ -10,7 +10,6 @@ import java.io.Serializable; * 查询参数 * * @author Chopper - * @date 2020/11/26 14:43 */ @Data public class PageVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/common/vo/ResultMessage.java b/framework/src/main/java/cn/lili/common/vo/ResultMessage.java index 6990ab9f..2268ef23 100644 --- a/framework/src/main/java/cn/lili/common/vo/ResultMessage.java +++ b/framework/src/main/java/cn/lili/common/vo/ResultMessage.java @@ -9,7 +9,6 @@ import java.io.Serializable; * 前后端交互VO * * @author Chopper - * @date 2020/11/26 14:40 */ @Data public class ResultMessage implements Serializable { diff --git a/framework/src/main/java/cn/lili/common/vo/SearchVO.java b/framework/src/main/java/cn/lili/common/vo/SearchVO.java index 9664098c..d0d6c818 100644 --- a/framework/src/main/java/cn/lili/common/vo/SearchVO.java +++ b/framework/src/main/java/cn/lili/common/vo/SearchVO.java @@ -15,7 +15,6 @@ import java.util.Date; * 日期搜索参数 * * @author Chopper - * @date 2020/11/26 14:43 */ @Data @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/common/vo/SerializableStream.java b/framework/src/main/java/cn/lili/common/vo/SerializableStream.java index ddeb0cc9..20f10cf1 100644 --- a/framework/src/main/java/cn/lili/common/vo/SerializableStream.java +++ b/framework/src/main/java/cn/lili/common/vo/SerializableStream.java @@ -10,7 +10,6 @@ import java.io.InputStream; * 序列化的input stream * * @author Chopper - * @date 2021-03-25 16:32 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java b/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java index ff54b924..2c7b5380 100644 --- a/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java +++ b/framework/src/main/java/cn/lili/config/cache/FastJsonRedisSerializer.java @@ -11,7 +11,6 @@ import java.nio.charset.Charset; * 要实现对象的缓存，定义自己的序列化和反序列化器。使用阿里的fastjson来实现的比较多 * * @author Bulbasaur - * @date: 2021/7/9 12:25 上午 */ public class FastJsonRedisSerializer implements RedisSerializer { private static final Charset DEFAULT_CHARSET = Charset.forName("UTF-8"); diff --git a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java b/framework/src/main/java/cn/lili/config/cache/RedisConfig.java index 63271fb8..8f490649 100644 --- a/framework/src/main/java/cn/lili/config/cache/RedisConfig.java +++ b/framework/src/main/java/cn/lili/config/cache/RedisConfig.java @@ -36,7 +36,6 @@ import java.util.Map; * * @author Chopper * @version v4.0 - * @Description: * @since 2021/3/20 09:37 */ @@ -54,8 +53,8 @@ public class RedisConfig extends CachingConfigurerSupport { /** * 当有多个管理器的时候，必须使用该注解在一个管理器上注释：表示该管理器为默认的管理器 * - * @param connectionFactory - * @return + * @param connectionFactory 链接工厂 + * @return 缓存 */ @Bean @Primary diff --git a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java b/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java index a8cb28e1..b78c4ca0 100644 --- a/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java +++ b/framework/src/main/java/cn/lili/config/context/ThreadContextHolderInterceptorAdapter.java @@ -12,7 +12,6 @@ import javax.servlet.http.HttpServletResponse; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/9 10:44 */ public class ThreadContextHolderInterceptorAdapter extends HandlerInterceptorAdapter { @@ -21,11 +20,11 @@ public class ThreadContextHolderInterceptorAdapter extends HandlerInterceptorAda /** * 拦截request和response并放到上下文中 * - * @param request - * @param response - * @param handler - * @return - * @throws Exception + * @param request 请求 + * @param response 响应 + * @param handler 处理程序 + * @return 处理结果 + * @throws Exception 未知异常 */ @Override public boolean preHandle(HttpServletRequest request, @@ -41,11 +40,11 @@ public class ThreadContextHolderInterceptorAdapter extends HandlerInterceptorAda /** * 从上下文中移除 request 和response * - * @param request - * @param response - * @param handler - * @param ex - * @throws Exception + * @param request 请求 + * @param response 响应 + * @param handler 处理程序 + * @param ex 异常 + * @throws Exception 完成之前处理异常 */ @Override public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, @Nullable Exception ex) throws Exception { diff --git a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java b/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java index f943c75e..8bb5c5f7 100644 --- a/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java +++ b/framework/src/main/java/cn/lili/config/interceptor/UrlConfiguration.java @@ -32,7 +32,8 @@ public class UrlConfiguration implements WebMvcConfigurer { /** * 开放资源 这里配置swagger可以在前端访问 - * @param registry + * + * @param registry 资源处理 */ @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { diff --git a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java b/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java index a2e69777..b4669080 100644 --- a/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java +++ b/framework/src/main/java/cn/lili/config/properties/StatisticsProperties.java @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Configuration; * * @author Chopper * @version v4.0 - * @Description: * @since 2021/2/21 10:19 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java index 179373e9..d0d13e5a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java +++ b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuth.java @@ -9,7 +9,6 @@ import cn.lili.modules.connect.exception.AuthException; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/4 12:17 */ public interface ConnectAuth { diff --git a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java index 7004313f..1e6facdb 100644 --- a/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java +++ b/framework/src/main/java/cn/lili/modules/connect/config/ConnectAuthEnum.java @@ -6,7 +6,6 @@ package cn.lili.modules.connect.config; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/4 14:10 */ public enum ConnectAuthEnum implements ConnectAuth { 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 238b5fc9..2851df9c 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 @@ -48,7 +48,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; diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java b/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java index 0581745d..63fbf623 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/dto/AuthToken.java @@ -12,7 +12,6 @@ import java.io.Serializable; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/4 23:48 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java index 51b12411..1103a9c8 100644 --- a/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java +++ b/framework/src/main/java/cn/lili/modules/connect/entity/enums/ConnectEnum.java @@ -5,7 +5,6 @@ package cn.lili.modules.connect.entity.enums; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/11/25 18:20 */ public enum ConnectEnum { diff --git a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java b/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java index e2854775..1a872c1a 100644 --- a/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java +++ b/framework/src/main/java/cn/lili/modules/connect/util/Base64Utils.java @@ -1,9 +1,5 @@ package cn.lili.modules.connect.util; -import sun.misc.BASE64Decoder; -import sun.misc.BASE64Encoder; - -import java.io.IOException; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; @@ -236,29 +232,4 @@ public class Base64Utils { return new String(data, charset); } - - /** - * 二进制流转Base64字符串 - * - * @param data 二进制流 - * @return data - * @throws IOException 异常 - */ - public static String getImageString(byte[] data) throws IOException { - BASE64Encoder encoder = new BASE64Encoder(); - return data != null ? encoder.encode(data) : ""; - } - - - /** - * Base64字符串转 二进制流 - * - * @param base64String Base64 - * @return base64String - * @throws IOException 异常 - */ - public static byte[] getStringImage(String base64String) throws IOException { - BASE64Decoder decoder = new sun.misc.BASE64Decoder(); - return base64String != null ? decoder.decodeBuffer(base64String) : null; - } } diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java index 7615e194..66bfb690 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/Distribution.java @@ -19,7 +19,7 @@ import javax.validation.constraints.Size; * 分销员对象 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java index 9bfa342b..3171dc6d 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dos/DistributionCash.java @@ -20,7 +20,7 @@ import java.util.Date; * 分销佣金 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @Entity @@ -48,7 +48,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; 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 5e823d9e..67f6361c 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 @@ -30,7 +30,7 @@ import java.util.Map; * 分销商品 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @Entity @@ -56,7 +56,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; 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 85902f6b..acc692df 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 @@ -24,7 +24,7 @@ import java.util.Date; * 分销订单 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @Entity @@ -45,7 +45,7 @@ public class DistributionOrder { @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; 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 620f6e90..37887f1b 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 @@ -17,7 +17,7 @@ import javax.persistence.Table; * 分销员已选择分销商品 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java index b98026de..c9f5ec1a 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionApplyDTO.java @@ -9,7 +9,7 @@ import javax.validation.constraints.Size; /** * 分销员申请DTO * @author Bulbasaur - * @date: 2021/6/30 11:07 上午 + * @since: 2021/6/30 11:07 上午 * */ @Data diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java index 70cead14..bd6f0214 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionGoodsSearchParams.java @@ -11,7 +11,7 @@ import lombok.Data; * 分销员商品查询条件 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data public class DistributionGoodsSearchParams extends PageVO { diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java index 49d0b226..4233113e 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/dto/DistributionSearchParams.java @@ -9,7 +9,7 @@ import lombok.Data; * 分销查询参数 * * @author Chopper - * @date 2021/3/20 10:13 + * @since 2021/3/20 10:13 */ @Data public class DistributionSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java index 56e0a137..ff1cc2ca 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionCashStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.distribution.entity.enums; * 分销佣金状态 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ public enum DistributionCashStatusEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java index dfc0266a..16c6fdc0 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionOrderStatusEnum.java @@ -4,7 +4,6 @@ package cn.lili.modules.distribution.entity.enums; * 分销员订单状态 * * @author pikachu - * @date 2020-03-14 23:04:56 */ public enum DistributionOrderStatusEnum { //待结算（冻结） diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java index fc02eab0..302ad4f1 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/enums/DistributionStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.distribution.entity.enums; * 分销员状态 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ public enum DistributionStatusEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java index 71302248..4373e307 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionCashSearchParams.java @@ -10,7 +10,7 @@ import lombok.Data; * 分销佣金查询信息 * * @author pikachu - * @date 2020-03-26 09:04:53 + * @since 2020-03-26 09:04:53 */ @Data public class DistributionCashSearchParams extends PageVO { diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java index 07d266d1..a7a786ea 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionGoodsVO.java @@ -12,7 +12,7 @@ import java.util.Date; * 分销商品信息 * * @author pikachu - * @date 2020-03-26 09:04:53 + * @since 2020-03-26 09:04:53 */ @Data public class DistributionGoodsVO { @@ -52,7 +52,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; diff --git a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java index befe4480..a2343493 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/distribution/entity/vos/DistributionOrderSearchParams.java @@ -16,7 +16,7 @@ import java.util.Date; * 分销员对象 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @ApiModel(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; diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java index ec21ecf1..5a3c9a4a 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionCashMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 分销佣金数据处理层 * * @author pikachu - * @date 2020-03-26 18:45:56 + * @since 2020-03-26 18:45:56 */ public interface DistributionCashMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java index 2ee3d579..e20a95fa 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionGoodsMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 分销商品数据处理层 * * @author pikachu - * @date 2020-03-24 23:04:56 + * @since 2020-03-24 23:04:56 */ public interface DistributionGoodsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java index 56d49e27..ccc87296 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update; * 分销员数据处理层 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ public interface DistributionMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java index 973c7041..3a5b273e 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionOrderMapper.java @@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Update; * 分销订单数据处理层 * * @author pikachu - * @date 2020-03-15 10:45:56 + * @since 2020-03-15 10:45:56 */ public interface DistributionOrderMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java index e104a837..6b4335da 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/distribution/mapper/DistributionSelectedGoodsMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 选择分销商品数据处理层 * * @author pikachu - * @date 2020-03-15 10:45:56 + * @since 2020-03-15 10:45:56 */ public interface DistributionSelectedGoodsMapper extends BaseMapper { } diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java index fad9793f..b5e75c01 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionCashService.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestParam; * 分销佣金业务层 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ public interface DistributionCashService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java index 868d35da..21c456e0 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionGoodsService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 分销商品业务层 * * @author pikachu - * @date 2020-03-24 10:46:33 + * @since 2020-03-24 10:46:33 */ public interface DistributionGoodsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java index 894773a6..ee789adb 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionOrderService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 分销订单业务层 * * @author pikachu - * @date 2020-03-15 10:46:33 + * @since 2020-03-15 10:46:33 */ public interface DistributionOrderService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java index 994d5d8a..86534f3b 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionSelectedGoodsService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 分销选择商品业务层 * * @author pikachu - * @date 2020-03-24 10:46:33 + * @since 2020-03-24 10:46:33 */ public interface DistributionSelectedGoodsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java index c1d8c4e3..8b42b066 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java +++ b/framework/src/main/java/cn/lili/modules/distribution/service/DistributionService.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 分销员业务层 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ public interface DistributionService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java index 7a0bef76..45b47cb4 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionCashServiceImpl.java @@ -37,7 +37,7 @@ import java.util.Date; * 分销佣金业务层实现 * * @author pikachu - * @date 2020-03-126 18:04:56 + * @since 2020-03-126 18:04:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java index 73ddee8c..b45f8b4b 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionGoodsServiceImpl.java @@ -28,7 +28,7 @@ import org.springframework.transaction.annotation.Transactional; * 分销商品接口实现 * * @author pikachu - * @date 2020-03-24 23:04:56 + * @since 2020-03-24 23:04:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java index 7837e10c..b7fde9ed 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionOrderServiceImpl.java @@ -36,7 +36,7 @@ import java.util.List; * 分销订单接口实现 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java index 1c2f0f59..972bc944 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionSelectedGoodsServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; * 分销选择商品接口实现 * * @author pikachu - * @date 2020-03-24 23:04:56 + * @since 2020-03-24 23:04:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java index 7a255e05..bf35f7e6 100644 --- a/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/distribution/serviceimpl/DistributionServiceImpl.java @@ -35,7 +35,7 @@ import java.util.concurrent.TimeUnit; * 分销员接口实现 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/file/entity/File.java b/framework/src/main/java/cn/lili/modules/file/entity/File.java index 5ad4ad11..72f6c024 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/File.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/File.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 文件系统 * * @author Chopper - * @date 2020/11/26 15:35 + * @since 2020/11/26 15:35 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java index cf2cbefc..396d28df 100644 --- a/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java +++ b/framework/src/main/java/cn/lili/modules/file/entity/dto/FileOwnerDTO.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; * 文件查询所属者参数对象 * * @author Chopper - * @date 2021-02-22 17:20 + * @since 2021-02-22 17:20 */ @Data @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java b/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java index b16e8862..0a817110 100644 --- a/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java +++ b/framework/src/main/java/cn/lili/modules/file/mapper/FileMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 文件管理数据处理层 * * @author Chopper - * @date 2021-02-22 17:20 + * @since 2021-02-22 17:20 */ public interface FileMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java index f16e90fd..7aacc714 100644 --- a/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java +++ b/framework/src/main/java/cn/lili/modules/file/plugin/FileManagerPlugin.java @@ -7,7 +7,6 @@ import java.util.List; * 文件管理插件 * * @author Chopper - * @date 2020/11/26 17:50 */ public interface FileManagerPlugin { diff --git a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java index 763780e6..e28bfc88 100644 --- a/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java +++ b/framework/src/main/java/cn/lili/modules/file/plugin/impl/AliFileManagerPlugin.java @@ -27,7 +27,6 @@ import java.util.List; * 阿里oss 文件操作 * * @author Chopper - * @date 2020/11/26 17:50 */ @Component diff --git a/framework/src/main/java/cn/lili/modules/file/service/FileService.java b/framework/src/main/java/cn/lili/modules/file/service/FileService.java index de729174..0760096e 100644 --- a/framework/src/main/java/cn/lili/modules/file/service/FileService.java +++ b/framework/src/main/java/cn/lili/modules/file/service/FileService.java @@ -14,7 +14,6 @@ import java.util.List; * 文件管理业务层 * * @author Chopper - * @date 2020/11/26 17:50 */ public interface FileService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index 52931040..41aa06f9 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -26,7 +26,7 @@ import java.util.List; * 文件管理业务层实现 * * @author Chopper - * @date 2020/11/26 17:50 + * @since 2020/11/26 17:50 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java index 934c0493..c088036a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Brand.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; * 商品品牌 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java index d7653ea7..cfc1c200 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Category.java @@ -19,7 +19,7 @@ import java.util.Date; * 商品分类 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @Entity 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 5ac1f8c1..b724c696 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 @@ -25,7 +25,7 @@ import java.util.Date; * 分类品牌关联 * * @author pikachu - * @date 2020-03-02 09:34:02 + * @since 2020-03-02 09:34:02 */ @Data @Entity @@ -52,7 +52,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; diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java index 3737862d..2a0a8c84 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategoryParameterGroup.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * 分类参数组关联 * * @author pikachu - * @date 2020-02-26 10:34:02 + * @since 2020-02-26 10:34:02 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java index d286db1a..dc547e36 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/CategorySpecification.java @@ -16,7 +16,7 @@ import javax.persistence.Table; * 分类参数组关联 * * @author pikachu - * @date 2020-02-26 10:34:02 + * @since 2020-02-26 10:34:02 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java index 5d053995..56bf56c9 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Commodity.java @@ -12,7 +12,7 @@ import javax.persistence.Table; /** * 小程序直播商品 * @author Bulbasaur - * @date: 2021/5/17 9:34 上午 + * @since: 2021/5/17 9:34 上午 * */ @Data diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java index df07486c..05f9ff3c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/DraftGoods.java @@ -20,7 +20,7 @@ import javax.validation.constraints.Max; * 草稿商品 * * @author pikachu - * @date 2020-02-23 9:14:33 + * @since 2020-02-23 9:14:33 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index a0982129..e589f5db 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -26,7 +26,7 @@ import java.util.Map; * 商品 * * @author pikachu - * @date 2020-02-23 9:14:33 + * @since 2020-02-23 9:14:33 */ @Data @Entity 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 4063bdba..c63b2342 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 @@ -19,7 +19,7 @@ import java.io.Serializable; * 商品相册 * * @author pikachu - * @date 2020-02-23 9:14:33 + * @since 2020-02-23 9:14:33 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java index 056e587d..94e3c3f5 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java @@ -20,7 +20,7 @@ import java.util.Date; * 商品sku * * @author pikachu - * @date 2020-02-23 9:14:33 + * @since 2020-02-23 9:14:33 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java index f8d7d72a..2a9b499c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsUnit.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; * 商品计量单位 * * @author Bulbasaur - * @date: 2020/11/26 16:08 + * @since: 2020/11/26 16:08 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java index 02579a78..966512c8 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsWords.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 商品关键字 * * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 */ @Data @Entity 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 96fcc1f8..888e1c3b 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 @@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull; * 商品参数 * * @author pikachu - * @date 2020-02-23 9:14:33 + * @since 2020-02-23 9:14:33 */ @Data @Entity 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 b4e8a272..cb81072c 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 @@ -16,7 +16,7 @@ import javax.validation.constraints.NotEmpty; * 商品规格项 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java index 90dcdd73..53cdcf60 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Studio.java @@ -13,7 +13,7 @@ import javax.persistence.Table; * 小程序直播间 * * @author Bulbasaur - * @date: 2021/5/17 9:47 上午 + * @since: 2021/5/17 9:47 上午 */ @Data @Entity 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 19c16c43..c041b4c6 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 @@ -17,7 +17,7 @@ import javax.persistence.Table; * 直播商品 * * @author Bulbasaur - * @date: 2021/5/18 5:42 下午 + * @since: 2021/5/18 5:42 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java index 05f85f94..15f07a97 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/BrandPageDTO.java @@ -11,7 +11,7 @@ import lombok.Data; * 商品品牌dto * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @JsonNaming(value = PropertyNamingStrategy.SnakeCaseStrategy.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java index 03e6543c..01921d86 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CategorySearchParams.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; * 分类查询参数 * * @author paulG - * @date 2020/12/1 + * @since 2020/12/1 **/ @Data public class CategorySearchParams { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java index daf86bd5..286ccf33 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/CommodityDTO.java @@ -7,7 +7,7 @@ import lombok.Data; * 用于获取直播商品状态时使用 * * @author Bulbasaur - * @date: 2021/5/25 12:12 下午 + * @since: 2021/5/25 12:12 下午 */ @Data public class CommodityDTO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java index d146fa51..d22a583b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/DraftGoodsSearchParams.java @@ -10,7 +10,7 @@ import lombok.Data; * 草稿商品搜索对象 * * @author paulG - * @date 2020/12/21 + * @since 2020/12/21 **/ @Data public class DraftGoodsSearchParams extends GoodsSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java index 0ff1826c..6dab4d05 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsCompleteMessage.java @@ -7,7 +7,7 @@ import lombok.Data; * 商品购买完成信息 * * @author paulG - * @date 2021/3/24 + * @since 2021/3/24 **/ @Data public class GoodsCompleteMessage { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java index c43b04cd..95dfb90d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsInfo.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; * 微信小程序直播商品DTO * * @author Bulbasaur - * @date: 2021/5/17 11:03 上午 + * @since: 2021/5/17 11:03 上午 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java index 3a646a86..c8f7affc 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java @@ -18,7 +18,7 @@ import java.util.Map; * 商品编辑DTO * * @author pikachu - * @date 2020-02-24 19:27:20 + * @since 2020-02-24 19:27:20 */ @Data @ToString diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java index 09be40e0..77bc42b3 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsParamsDTO.java @@ -11,7 +11,7 @@ import java.util.List; * 商品关联参数 * * @author pikachu - * @date 2020-02-23 9:14:33 + * @since 2020-02-23 9:14:33 */ @Data @ApiModel(value = "商品参数分组") diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java index de388d32..6e891b89 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSearchParams.java @@ -12,7 +12,7 @@ import lombok.Data; * 商品查询条件 * * @author pikachu - * @date 2020-02-24 19:27:20 + * @since 2020-02-24 19:27:20 */ @Data public class GoodsSearchParams extends PageVO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java index 7139e103..39d01981 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuSearchParams.java @@ -9,7 +9,7 @@ import lombok.Data; * 规格商品查询条件 * * @author paulG - * @date 2020/12/15 + * @since 2020/12/15 **/ @Data public class GoodsSkuSearchParams extends GoodsSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java index d6d4841d..694df3c9 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsSkuStockDTO.java @@ -7,7 +7,7 @@ import lombok.Data; * 商品库存DTO * * @author paulG - * @date 2020/12/23 + * @since 2020/12/23 **/ @Data public class GoodsSkuStockDTO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java b/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java index 0e1bdecf..5430503f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dto/SimpleCommodity.java @@ -6,7 +6,7 @@ import io.swagger.annotations.ApiModelProperty; * 用于直播间前台使用的直播间商品DTO * * @author Bulbasaur - * @date: 2021/5/20 2:34 下午 + * @since: 2021/5/20 2:34 下午 */ public class SimpleCommodity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java index e957c8bf..f210acf4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/DraftGoodsSaveType.java @@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums; * 草稿商品保存类型 * * @author paulG - * @date 2020/12/21 + * @since 2020/12/21 **/ public enum DraftGoodsSaveType { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java index ff5a9d63..2576a85f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsAuthEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums; * 商品审核 * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ public enum GoodsAuthEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java index 73b11585..89ff2822 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsOperate.java @@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums; * 商品操作枚举 * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ public enum GoodsOperate { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java index ed6361d6..2cabe2c7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsSalesModeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums; * 商品审核 * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ public enum GoodsSalesModeEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java index 7ea1a0cf..4f666422 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums; * 商品类型枚举 * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ public enum GoodsStatusEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java index a81f870c..30a5557b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/GoodsTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.goods.entity.enums; * 商品类型 * * @author Bulbasaur - * @date: 2021/5/28 4:23 下午 + * @since: 2021/5/28 4:23 下午 */ public enum GoodsTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java b/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java index b3510524..77a11e81 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/enums/StudioStatusEnum.java @@ -5,7 +5,7 @@ package cn.lili.modules.goods.entity.enums; * 直播间状态 * * @author Bulbasaur - * @date: 2021/5/31 10:32 上午 + * @since: 2021/5/31 10:32 上午 */ public enum StudioStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java index beab43a5..354c473d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/BrandVO.java @@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode; * 品牌VO * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class BrandVO extends Brand { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java index c30a694f..3e413833 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryBrandVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 分类品牌VO * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class CategoryBrandVO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java index e03b16a5..3f298e26 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CategoryVO.java @@ -17,7 +17,7 @@ import java.util.List; * 分类VO * * @author paulG - * @date 2020/12/1 + * @since 2020/12/1 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java index 3e3ff8d9..a4b94178 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/CommodityVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 直播商品VO * * @author Bulbasaur - * @date: 2021/5/26 6:09 下午 + * @since: 2021/5/26 6:09 下午 */ @Data public class CommodityVO extends Commodity { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java index 2bf39fad..ad1a47ce 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/DraftGoodsVO.java @@ -11,7 +11,7 @@ import java.util.List; * 草稿商品VO * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class DraftGoodsVO extends DraftGoods { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java index 1be9128d..0c9f87b7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ExchangeVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 兑换VO * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class ExchangeVO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java index 7ea76081..e7b85e01 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsOperateAllowable.java @@ -11,7 +11,7 @@ import java.io.Serializable; * 商品操作允许的范围 * * @author Bulbasaur - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java index 18d0a9d5..c3807097 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsGroupVO.java @@ -10,7 +10,7 @@ import java.util.List; * 商品参数vo * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class GoodsParamsGroupVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java index 8b9a41e4..75928656 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsParamsVO.java @@ -9,7 +9,7 @@ import lombok.Data; * 商品关联参数的VO * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class GoodsParamsVO extends GoodsParamsDTO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java index 3fe8a9e7..70b980b3 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuSpecVO.java @@ -9,7 +9,7 @@ import java.util.List; * 商品规格VO * * @author paulG - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class GoodsSkuSpecVO { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java index bd526f81..32f3a030 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsSkuVO.java @@ -13,7 +13,7 @@ import java.util.List; * 商品规格VO * * @author paulG - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java index ebb31251..804940a3 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/GoodsVO.java @@ -11,7 +11,7 @@ import java.util.List; * 商品VO * * @author pikachu - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class GoodsVO extends Goods { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java index 52b9059e..ee3c7045 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/ParameterGroupVO.java @@ -13,7 +13,7 @@ import java.util.List; * 参数组vo * * @author pikachu - * @date 2020年03月02日 16:55:21 + * @since 2020年03月02日 16:55:21 */ @ApiModel @Data diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java index 81bbc39b..89a9d540 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/SpecValueVO.java @@ -11,7 +11,7 @@ import java.util.List; * 规格值 * * @author Chopper - * @date 2020-02-26 23:24:13 + * @since 2020-02-26 23:24:13 */ @Data public class SpecValueVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java index 4175772a..dadf68ee 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StockWarningVO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; * 库存警告封装类 * * @author paulG - * @date 2020/12/24 + * @since 2020/12/24 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java index 8e69a784..d0be8433 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/vos/StudioVO.java @@ -11,7 +11,7 @@ import java.util.List; * 直播间VO * * @author Bulbasaur - * @date: 2021/5/31 11:58 上午 + * @since: 2021/5/31 11:58 上午 */ @Data public class StudioVO extends Studio { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java index ded9fee8..fd04b50c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/BrandMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 商品品牌数据处理层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface BrandMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java index daee3eb8..189d5b76 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryBrandMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 商品分类品牌数据处理层 * * @author pikachu - * @date 2020-02-26 18:12:56 + * @since 2020-02-26 18:12:56 */ public interface CategoryBrandMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java index 2a518778..2610fb34 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryMapper.java @@ -14,7 +14,7 @@ import java.util.List; * 商品分类数据处理层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface CategoryMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java index 7bedb837..e0427cd6 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategoryParameterGroupMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 分类绑定参数组数据处理层 * * @author pikachu - * @date 2020-03-02 16:44:56 + * @since 2020-03-02 16:44:56 */ public interface CategoryParameterGroupMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java index 703ac95e..8667be9d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CategorySpecificationMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 商品分类规格数据处理层 * * @author pikachu - * @date 2020-02-27 15:18:56 + * @since 2020-02-27 15:18:56 */ public interface CategorySpecificationMapper extends BaseMapper { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java index a2d2f58f..da1559a8 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/CommodityMapper.java @@ -15,7 +15,7 @@ import java.util.List; * 直播商品数据层 * * @author Bulbasaur - * @date: 2021/5/17 9:56 上午 + * @since: 2021/5/17 9:56 上午 */ public interface CommodityMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java index 0e1137f5..d08bb376 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/DraftGoodsMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 草稿商品数据处理层 * * @author paulG - * @date 2020/12/19 + * @since 2020/12/19 **/ public interface DraftGoodsMapper extends BaseMapper { } diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java index 5ce5232f..1289d21b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsGalleryMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 商品相册数据处理层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface GoodsGalleryMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java index 561bf9c3..9c1b5259 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsMapper.java @@ -16,7 +16,7 @@ import java.util.List; * 规格项数据处理层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface GoodsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java index 285ac23d..304b8cd9 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsSkuMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 规格项数据处理层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface GoodsSkuMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java index 912c5a52..53b3b040 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsUnitMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 商品计量单位数据处理层 * * @author Bulbasaur - * @date 2020/11/26 16:11 + * @since 2020/11/26 16:11 */ public interface GoodsUnitMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java index f34e4fa3..3308b384 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/GoodsWordsMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 商品关键字数据处理层 * * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ public interface GoodsWordsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java index c57dc7d5..bb9010b7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/ParametersMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 商品参数数据处理层 * * @author pikachu - * @date 2020-03-02 17:27:56 + * @since 2020-03-02 17:27:56 */ public interface ParametersMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java index 609f4cd1..8c554d83 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/SpecificationMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 规格数据处理层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface SpecificationMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java index 32fa0e7c..00d7c77a 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioCommodityMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 直播间-商品关联持久层 * @author Bulbasaur - * @date: 2021/5/17 3:14 下午 + * @since: 2021/5/17 3:14 下午 * */ public interface StudioCommodityMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java index de5c6522..d7509194 100644 --- a/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java +++ b/framework/src/main/java/cn/lili/modules/goods/mapper/StudioMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 直播间数据层 * * @author Bulbasaur - * @date: 2021/5/17 9:56 上午 + * @since: 2021/5/17 9:56 上午 */ public interface StudioMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java b/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java index 45d3f2c3..622d735d 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/BrandService.java @@ -13,7 +13,7 @@ import java.util.List; * 商品品牌业务层 * * @author pikachu - * @date 2020-02-18 16:18:56 + * @since 2020-02-18 16:18:56 */ public interface BrandService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java index 8ef40842..95703167 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryBrandService.java @@ -10,7 +10,7 @@ import java.util.List; * 商品分类品牌业务层 * * @author pikachu - * @date 2020-02-26 16:18:56 + * @since 2020-02-26 16:18:56 */ public interface CategoryBrandService extends IService { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java index a870b4b8..ededf284 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryParameterGroupService.java @@ -10,7 +10,7 @@ import java.util.List; * 分类绑定参数组业务层 * * @author pikachu - * @date 2020-03-02 16:44:56 + * @since 2020-03-02 16:44:56 */ public interface CategoryParameterGroupService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java index 29aa26d0..abc9e479 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CategoryService.java @@ -11,7 +11,7 @@ import java.util.List; * 商品分类业务层 * * @author pikachu - * @date 2020-03-02 16:44:56 + * @since 2020-03-02 16:44:56 */ public interface CategoryService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java b/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java index c0a24f78..e560255e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CategorySpecificationService.java @@ -10,7 +10,7 @@ import java.util.List; * 商品分类规格业务层 * * @author pikachu - * @date 2020-02-26 16:18:56 + * @since 2020-02-26 16:18:56 */ public interface CategorySpecificationService extends IService { /** diff --git a/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java b/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java index 669215e5..46437a39 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/CommodityService.java @@ -12,7 +12,7 @@ import java.util.List; * 直播商品业务层 * * @author Bulbasaur - * @date: 2021/5/17 10:39 上午 + * @since: 2021/5/17 10:39 上午 */ public interface CommodityService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java index e23769d8..0c9d2134 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsService.java @@ -18,7 +18,7 @@ import java.util.List; * 商品业务层 * * @author pikachu - * @date 2020-02-23 16:18:56 + * @since 2020-02-23 16:18:56 */ @CacheConfig(cacheNames = "{goods}") public interface GoodsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java index c2976aaa..8e455c25 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsSkuService.java @@ -17,7 +17,7 @@ import java.util.Map; * 商品sku业务层 * * @author pikachu - * @date 2020-02-24 16:18:56 + * @since 2020-02-24 16:18:56 */ public interface GoodsSkuService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java b/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java index 3b4e2cf3..b29da3b0 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/GoodsUnitService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 商品计量单位业务层 * * @author Bulbasaur - * @date: 2020/11/26 16:12 + * @since: 2020/11/26 16:12 */ public interface GoodsUnitService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java b/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java index 6c438b22..3a390f36 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/ParametersService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 商品参数业务层 * * @author pikachu - * @date 2020-03-02 16:18:56 + * @since 2020-03-02 16:18:56 */ public interface ParametersService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java b/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java index b6e436a6..8ebdfc00 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/SpecificationService.java @@ -10,7 +10,7 @@ import java.util.List; * 规格业务层 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ public interface SpecificationService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java index ced678fb..aee3a2f7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioCommodityService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 直播间-商品关联业务层 * * @author Bulbasaur - * @date: 2021/5/17 3:19 下午 + * @since: 2021/5/17 3:19 下午 */ public interface StudioCommodityService extends IService { } diff --git a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java index d102dd7a..3b982985 100644 --- a/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java +++ b/framework/src/main/java/cn/lili/modules/goods/service/StudioService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 直播间业务层 * * @author Bulbasaur - * @date: 2021/5/17 10:02 上午 + * @since: 2021/5/17 10:02 上午 */ public interface StudioService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java index e90a8757..2926f4ea 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/BrandServiceImpl.java @@ -27,7 +27,7 @@ import java.util.stream.Collectors; * 商品品牌业务层实现 * * @author pikachu - * @date 2020-02-18 16:18:56 + * @since 2020-02-18 16:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java index 34b2ef23..622ebd20 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryBrandServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; * 规格项业务层实现 * * @author pikachu - * @date 2020-02-18 16:18:56 + * @since 2020-02-18 16:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java index bc102fca..33c9d44c 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategoryServiceImpl.java @@ -30,7 +30,7 @@ import java.util.stream.Collectors; * 商品分类业务层实现 * * @author pikachu - * @date 2020-02-23 15:18:56 + * @since 2020-02-23 15:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java index 7a76119a..49b0a82b 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CategorySpecificationServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 商品分类规格业务层实现 * * @author pikachu - * @date 2020-02-23 15:18:56 + * @since 2020-02-23 15:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java index 088ffc6b..3258783e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/CommodityServiceImpl.java @@ -33,7 +33,7 @@ import java.util.List; * 直播商品业务层实现 * * @author Bulbasaur - * @date: 2021/5/17 11:16 上午 + * @since: 2021/5/17 11:16 上午 */ @Service public class CommodityServiceImpl extends ServiceImpl implements CommodityService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java index 35232459..3679103f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsServiceImpl.java @@ -57,7 +57,7 @@ import java.util.List; * 商品业务层实现 * * @author pikachu - * @date 2020-02-23 15:18:56 + * @since 2020-02-23 15:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index 567572f7..badc3634 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -53,7 +53,7 @@ import java.util.stream.Collectors; * 商品sku业务层实现 * * @author pikachu - * @date 2020-02-23 15:18:56 + * @since 2020-02-23 15:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java index 83655296..f7c689c4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsUnitServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; * 计量单位业务层实现 * * @author Bulbasaur - * @date 2020/11/26 16:13 + * @since 2020/11/26 16:13 */ @Service public class GoodsUnitServiceImpl extends ServiceImpl implements GoodsUnitService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java index 1316a719..c468b0a7 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/ParametersServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; * 商品参数业务层实现 * * @author pikachu - * @date 2020-03-02 16:18:56 + * @since 2020-03-02 16:18:56 */ @Service public class ParametersServiceImpl extends ServiceImpl implements ParametersService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java index ea1b5575..e1c645d4 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/SpecificationServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; * 商品规格业务层实现 * * @author pikachu - * @date 2020-02-18 16:18:56 + * @since 2020-02-18 16:18:56 */ @Service public class SpecificationServiceImpl extends ServiceImpl implements SpecificationService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java index 8111b8c7..9ff349a1 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioCommodityServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 直播间-商品关联业务层实现 * * @author Bulbasaur - * @date: 2021/5/17 3:20 下午 + * @since: 2021/5/17 3:20 下午 */ @Service public class StudioCommodityServiceImpl extends ServiceImpl implements StudioCommodityService { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java index aa487b98..93926270 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StudioServiceImpl.java @@ -41,7 +41,7 @@ import java.util.Map; * 小程序直播间业务层实现 * * @author Bulbasaur - * @date: 2021/5/17 10:04 上午 + * @since: 2021/5/17 10:04 上午 */ @Service public class StudioServiceImpl extends ServiceImpl implements StudioService { diff --git a/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java index 7c19170f..6dd97a8f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java +++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatLivePlayerUtil.java @@ -20,7 +20,7 @@ import java.util.Map; * 微信小程序直播工具类 * * @author Bulbasaur - * @date: 2021/5/17 10:16 上午 + * @since: 2021/5/17 10:16 上午 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java index 6053b7f3..686fa51f 100644 --- a/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java +++ b/framework/src/main/java/cn/lili/modules/goods/util/WechatMediaUtil.java @@ -17,7 +17,7 @@ import java.net.URL; * 微信媒体工具 * * @author Bulbasaur - * @date: 2021/5/19 8:02 下午 + * @since: 2021/5/19 8:02 下午 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java index 61b3d1a6..2eb036f2 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/annotation/PointLogPoint.java @@ -7,7 +7,7 @@ import java.lang.annotation.*; * 会员积分操作aop * * @author pikachu - * @date 2020/11/17 7:22 下午 + * @since 2020/11/17 7:22 下午 */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java index 6699442f..bc9dc56b 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/aop/interceptor/PointLogInterceptor.java @@ -17,7 +17,7 @@ import org.springframework.stereotype.Component; * 积分操作切面 * * @author Chopper - * @date 2020/11/17 7:22 下午 + * @since 2020/11/17 7:22 下午 */ @Slf4j @Aspect diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java index 9c68a425..bdc95d0a 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/FootPrint.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 浏览历史 * * @author Chopper - * @date 2020/11/17 7:22 下午 + * @since 2020/11/17 7:22 下午 */ @Data @Entity 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 749a97c4..d0569475 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 @@ -22,7 +22,7 @@ import java.util.Date; * 会员商品收藏 * * @author Chopper - * @date 2020/11/18 3:31 下午 + * @since 2020/11/18 3:31 下午 */ @Data @Entity @@ -41,7 +41,7 @@ public class GoodsCollection { @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; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java index 6b95367d..85b2844c 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/Member.java @@ -20,7 +20,7 @@ import java.util.Date; * 会员 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -46,7 +46,7 @@ public class Member extends BaseEntity { private Integer sex; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "会员生日") private Date birthday; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java index ad78c35b..c351d091 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberAddress.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotEmpty; * 会员地址 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java index 7e9f35c0..b005392a 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberEvaluation.java @@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull; * 会员商品评价 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java index e65abef7..caa611f9 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberGrade.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; * 会员等级 * * @author Bulbasaur - * @date 2021/5/14 5:43 下午 + * @since 2021/5/14 5:43 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java index 12fdb810..3aa30631 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNotice.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 会员站内信 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java index 44dfe402..bf8bb9f1 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeLog.java @@ -17,7 +17,7 @@ import java.util.Date; * 会员消息 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -63,7 +63,7 @@ public class MemberNoticeLog extends BaseEntity { @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; /** * 发送类型 diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java index e7c8d4c8..f4ebd4be 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberNoticeSenter.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 会员消息 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity 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 8da788be..97519e06 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 @@ -25,7 +25,7 @@ import java.util.Date; * 会员积分历史 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -50,7 +50,7 @@ public class MemberPointsHistory { @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; 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 b8ef4538..a912ce41 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 @@ -21,7 +21,7 @@ import java.util.Date; * 会员发票 * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ @Data @Entity @@ -70,7 +70,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; 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 2691fedd..aa27d31c 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 @@ -21,7 +21,7 @@ import java.util.Date; * 会员签到 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -41,7 +41,7 @@ public class MemberSign { @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; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java index cf7c3a35..240f927a 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWallet.java @@ -13,7 +13,7 @@ import javax.persistence.Table; * 会员预存款 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java index 5d3a779c..4c79cd0d 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/MemberWithdrawApply.java @@ -18,7 +18,7 @@ import java.util.Date; * 会员提现申请 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -46,7 +46,7 @@ public class MemberWithdrawApply extends BaseEntity { @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; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java index 09aba9b8..b08c3ee5 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dos/StoreCollection.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 会员店铺收藏 * * @author Chopper - * @date 2020/11/18 3:32 下午 + * @since 2020/11/18 3:32 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java index 5ff36340..28fb21f8 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/EvaluationQueryParams.java @@ -12,7 +12,7 @@ import lombok.Data; * 评价查询条件 * * @author Bulbasaur - * @date 2020/11/30 14:52 + * @since 2020/11/30 14:52 */ @Data public class EvaluationQueryParams extends PageVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java index 1e2987a7..6b021869 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/ManagerMemberEditDTO.java @@ -16,7 +16,7 @@ import java.util.Date; * 用于后台的用户信息修改 * * @author Bulbasaur - * @date 2020/12/15 9:57 + * @since 2020/12/15 9:57 */ @Data public class ManagerMemberEditDTO { @@ -45,7 +45,7 @@ public class ManagerMemberEditDTO { private Integer sex; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "会员生日") private Date birthday; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java index 4389e2af..6d54c0a9 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.Size; * 添加会员DTO * * @author Bulbasaur - * @date 2020/12/14 16:31 + * @since 2020/12/14 16:31 */ @Data public class MemberAddDTO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java index ad07b84b..dd77a186 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberAddressDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.NotEmpty; * 会员地址DTO * * @author Bulbasaur - * @date 2020/12/14 16:31 + * @since 2020/12/14 16:31 */ @Data public class MemberAddressDTO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java index f07866cd..37aa56df 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEditDTO.java @@ -15,7 +15,7 @@ import java.util.Date; * 会员信息修改DTO * * @author Bulbasaur - * @date 2020/12/11 14:39 + * @since 2020/12/11 14:39 */ @Data public class MemberEditDTO { @@ -38,7 +38,7 @@ public class MemberEditDTO { private Integer sex; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "会员生日") private Date birthday; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java index 825944a3..ceef0503 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberEvaluationDTO.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotEmpty; * 会员评价DTO * * @author Chopper - * @date 2020/11/29 11:13 下午 + * @since 2020/11/29 11:13 下午 */ @Data public class MemberEvaluationDTO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java index 439bff9f..02eccd08 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberPointMessage.java @@ -7,7 +7,7 @@ import lombok.Data; * 会员积分 * * @author Bulbasaur - * @date 2020/12/14 16:31 + * @since 2020/12/14 16:31 */ @Data public class MemberPointMessage { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java index c12fc573..56921b9e 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/dto/MemberWithdrawalMessage.java @@ -7,7 +7,7 @@ import lombok.Data; * 会员提现消息 * * @author Bulbasaur - * @date 2020/12/14 16:31 + * @since 2020/12/14 16:31 */ @Data public class MemberWithdrawalMessage { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java index a6a0758b..61f3a051 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/EvaluationGradeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums; * 评价枚举 * * @author Chopper - * @date 2021/3/20 10:44 + * @since 2021/3/20 10:44 */ public enum EvaluationGradeEnum { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java index 9e846658..d483d896 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberReceiptEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums; * 发票类型 * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ public enum MemberReceiptEnum { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java index bdbbedee..bfcbaa0a 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/MemberWithdrawalDestinationEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums; * 会员提现到哪里 枚举 * * @author Chopper - * @date 2021/3/20 10:44 + * @since 2021/3/20 10:44 */ public enum MemberWithdrawalDestinationEnum { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java index 3f965ae5..3c456c40 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/PointTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums; * 积分类型枚举 * * @author Chopper - * @date 2021/3/20 10:44 + * @since 2021/3/20 10:44 */ public enum PointTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java index f34f30a1..36ec9f86 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/SendTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums; * 发送类型 * * @author Chopper - * @date 2020-03-10 11:35 上午 + * @since 2020-03-10 11:35 上午 */ public enum SendTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java b/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java index bb4ea569..53b96e94 100755 --- a/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/enums/WithdrawStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.member.entity.enums; * 提现申请状态枚举类 * * @author pikachu - * @date 2020-11-06 + * @since 2020-11-06 */ public enum WithdrawStatusEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java index 9993b449..152bee47 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/EvaluationNumberVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 评价数量VO * * @author Chopper - * @date 2021/1/27 10:41 上午 + * @since 2021/1/27 10:41 上午 */ @Data public class EvaluationNumberVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java index e0478568..a885c758 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/GoodsCollectionVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 会员商品收藏VO * * @author Chopper - * @date 2021/1/27 10:41 上午 + * @since 2021/1/27 10:41 上午 */ @Data public class GoodsCollectionVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java index 3b02e2dc..c272cfe3 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberDistributionVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 会员分布VO * * @author Chopper - * @date 2021-02-26 17:25 + * @since 2021-02-26 17:25 */ @Data public class MemberDistributionVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java index ae6408a9..b7887db2 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationListVO.java @@ -11,7 +11,7 @@ import java.util.Date; * 会员评价VO * * @author Bulbasaur - * @date 2020/11/30 15:00 + * @since 2020/11/30 15:00 */ @Data public class MemberEvaluationListVO { @@ -39,7 +39,7 @@ public class MemberEvaluationListVO { @ApiModelProperty(value = "创建时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java index 1806d0e4..db0dbe26 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberEvaluationVO.java @@ -12,7 +12,7 @@ import java.util.List; * 会员评价VO * * @author Bulbasaur - * @date 2020/11/30 15:00 + * @since 2020/11/30 15:00 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java index 04b43ada..d5272b2a 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberPointsHistoryVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 会员积分VO * * @author Chopper - * @date 2021/2/25 9:52 上午 + * @since 2021/2/25 9:52 上午 */ @Data public class MemberPointsHistoryVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java index 4c3d030f..eaf5f049 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptAddVO.java @@ -9,7 +9,7 @@ import lombok.Data; * 会员发票添加VO * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ @Data @ApiModel(value = "会员发票") diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java index 9de46587..fb9ae9d7 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberReceiptVO.java @@ -12,7 +12,7 @@ import lombok.Data; * 会员发票查询VO * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ @Data @ApiModel(value = "会员发票") diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java index f40e5eba..caae52d6 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberSearchVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 会员搜索VO * * @author Bulbasaur - * @date 2020/12/15 10:48 + * @since 2020/12/15 10:48 */ @Data public class MemberSearchVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java index 257d7cbe..774084ea 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWalletVO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; * 会员预存款VO * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @ApiModel(value = "会员预存款") diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java index c3fd1e1c..e5c72401 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/MemberWithdrawApplyQueryVO.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 余额提现记录查询条件 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @ApiModel(value = "余额提现记录查询条件") diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java index 1068bb1b..903fcd12 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreCollectionVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 会员店铺收藏VO * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data public class StoreCollectionVO { diff --git a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java index e455e1f7..2410eeda 100644 --- a/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java +++ b/framework/src/main/java/cn/lili/modules/member/entity/vo/StoreRatingVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 评分VO * * @author Chopper - * @date 2021/3/15 5:55 下午 + * @since 2021/3/15 5:55 下午 */ @Data public class StoreRatingVO { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java index d85a0525..ecfee4c7 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/FootprintMapper.java @@ -15,7 +15,7 @@ import java.util.List; * 浏览历史数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface FootprintMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java index 651d4439..f7a83fa7 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/GoodsCollectionMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 会员收藏数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface GoodsCollectionMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java index 525d768d..45561976 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberAddressMapper.java @@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberAddress; * 会员地址数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberAddressMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java index 2f6c9afa..f6b88ce2 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberEvaluationMapper.java @@ -17,7 +17,7 @@ import java.util.Map; * 会员商品评价数据处理层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberEvaluationMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java index 64073199..60814123 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberGradeMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 会员等级数据层 * * @author Bulbasaur - * @date: 2021/5/14 5:57 下午 + * @since: 2021/5/14 5:57 下午 */ public interface MemberGradeMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java index 4dde7577..d25516dd 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberMapper.java @@ -12,7 +12,7 @@ import java.util.List; * 会员数据处理层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java index 4c806c27..74c70076 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeLogMapper.java @@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNoticeLog; * 会员消息数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberNoticeLogMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java index a13a70cd..7d325a89 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeMapper.java @@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNotice; * 会员站内信数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberNoticeMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java index 44ed0c07..0508f4b4 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberNoticeSenterMapper.java @@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNoticeSenter; * 会员消息数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberNoticeSenterMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java index 37d4e8fb..e9e8f906 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberPointsHistoryMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select; * 会员积分历史数据处理层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberPointsHistoryMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java index c197f018..27dba0ac 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberReceiptMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 会员发票数据层 * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ public interface MemberReceiptMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java index 257e506c..14454e3c 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberSignMapper.java @@ -14,7 +14,7 @@ import java.util.List; * 会员签到数据处理层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberSignMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java index 32290f8a..eec4d70f 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWalletMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 会员预存款数据处理层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberWalletMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java index 7ebbf646..8ed446b2 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/MemberWithdrawApplyMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 会员提现申请数据处理层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberWithdrawApplyMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java b/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java index d0ebd514..ed874f43 100644 --- a/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java +++ b/framework/src/main/java/cn/lili/modules/member/mapper/StoreCollectionMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 会员收藏数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface StoreCollectionMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java index 3dd22c24..624683d5 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/FootprintService.java @@ -11,7 +11,7 @@ import java.util.List; * 会员浏览历史业务层 * * @author Chopper - * @date 2020/11/18 10:46 上午 + * @since 2020/11/18 10:46 上午 */ public interface FootprintService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java b/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java index 9847f86f..fa855d82 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/GoodsCollectionService.java @@ -12,7 +12,7 @@ import java.util.List; * 商品收藏业务层 * * @author Chopper - * @date 2020/11/18 2:25 下午 + * @since 2020/11/18 2:25 下午 */ public interface GoodsCollectionService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java index 052ae723..7c5792df 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberEvaluationService.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员商品评价业务层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberEvaluationService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java index 44002848..bbc28ded 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberGradeService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * 会员等级业务层 * @author Bulbasaur - * @date: 2021/5/14 5:57 下午 + * @since: 2021/5/14 5:57 下午 * */ public interface MemberGradeService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java index 89902c0c..af034ad8 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeLogService.java @@ -7,7 +7,7 @@ import cn.lili.modules.member.entity.dos.MemberNoticeLog; * 会员消息业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface MemberNoticeLogService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java index e4372c75..d783f423 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeSenterService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员消息业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface MemberNoticeSenterService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java index 045e47f2..07e06f30 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberNoticeService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员站内信业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface MemberNoticeService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java index 0597d871..ce523a6f 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberPointsHistoryService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员积分历史业务层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberPointsHistoryService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java index 601178e9..99815390 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberReceiptService.java @@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员发票业务层 * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ public interface MemberReceiptService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java index 6f6ed6b5..b8b6e740 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberService.java @@ -19,7 +19,7 @@ import java.util.List; * 会员业务层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java index 268aa9c3..de3e0fbc 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberSignService.java @@ -9,7 +9,7 @@ import java.util.List; * 会员签到业务层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberSignService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java index cc5bf418..effcc319 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberWalletService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员预存款业务层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberWalletService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java b/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java index cc4fecf6..ae9ac2b5 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/MemberWithdrawApplyService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 会员提现申请业务层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberWithdrawApplyService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java b/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java index df2d12a4..7e9e60f8 100644 --- a/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java +++ b/framework/src/main/java/cn/lili/modules/member/service/StoreCollectionService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 店铺收藏业务层 * * @author Chopper - * @date 2020/11/18 2:52 下午 + * @since 2020/11/18 2:52 下午 */ public interface StoreCollectionService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java index df895f66..2ef10e7c 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/FootprintServiceImpl.java @@ -23,7 +23,7 @@ import java.util.Objects; * 会员浏览历史业务层实现 * * @author Chopper - * @date 2020/11/18 10:46 上午 + * @since 2020/11/18 10:46 上午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java index 4aa7f925..d9efe129 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/GoodsCollectionServiceImpl.java @@ -29,7 +29,7 @@ import java.util.Optional; * 会员收藏业务层实现 * * @author Chopper - * @date 2020/11/18 2:25 下午 + * @since 2020/11/18 2:25 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java index 34aab3fb..e785660a 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberEvaluationServiceImpl.java @@ -53,7 +53,7 @@ import java.util.Map; * 会员商品评价业务层实现 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java index 0152e4da..4aa78f02 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberGradeServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 会员等级业务层实现 * * @author Bulbasaur - * @date: 2021/5/14 5:58 下午 + * @since: 2021/5/14 5:58 下午 */ @Service public class MemberGradeServiceImpl extends ServiceImpl implements MemberGradeService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java index ad0d24a0..98dedbbb 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeLogServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 会员消息业务层实现 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ @Service public class MemberNoticeLogServiceImpl extends ServiceImpl implements MemberNoticeLogService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java index b42bc6ea..934a5495 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeSenterServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; * 会员消息业务层实现 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = java.lang.Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java index 1444b14e..c2668d0b 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberNoticeServiceImpl.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Service; * 会员站内信业务层实现 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ @Service public class MemberNoticeServiceImpl extends ServiceImpl implements MemberNoticeService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java index 638dbd88..613e771e 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberPointsHistoryServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; * 会员积分历史业务层实现 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service public class MemberPointsHistoryServiceImpl extends ServiceImpl implements MemberPointsHistoryService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java index 7cec3001..3ead1ed6 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberReceiptServiceImpl.java @@ -29,7 +29,7 @@ import java.util.List; * 会员发票业务层实现 * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ @Service public class MemberReceiptServiceImpl extends ServiceImpl implements MemberReceiptService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index f8fb9bcd..25f89c49 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -57,7 +57,7 @@ import java.util.List; * 会员接口业务层实现 * * @author Chopper - * @date 2021-03-29 14:10:16 + * @since 2021-03-29 14:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java index 5fccdd4c..ddccc8ae 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberSignServiceImpl.java @@ -33,7 +33,7 @@ import java.util.Map; * 会员签到业务层实现 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service public class MemberSignServiceImpl extends ServiceImpl implements MemberSignService { diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java index 1cdf7af9..915f1707 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWalletServiceImpl.java @@ -39,7 +39,7 @@ import java.util.Date; * 会员预存款业务层实现 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java index 9813925f..f090f862 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberWithdrawApplyServiceImpl.java @@ -28,7 +28,7 @@ import java.util.Date; * 会员提现申请业务层实现 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java index e3114cb6..84e1ebe5 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/StoreCollectionServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Optional; * 会员店铺收藏业务层实现 * * @author Chopper - * @date 2020/11/18 2:52 下午 + * @since 2020/11/18 2:52 下午 */ @Service public class StoreCollectionServiceImpl extends ServiceImpl implements StoreCollectionService { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java index 4ccb3fdd..c4b8439c 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/MemberMessage.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 会员接受消息对象 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java index 5ff11608..68ea7428 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/NoticeMessage.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * * @author Bulbasaur * @version v4.1 - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ @Data @Entity 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 51e02367..5398a0e2 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 @@ -21,7 +21,7 @@ import java.util.Date; * 短信任务 * * @author Chopper - * @date 2021/1/30 4:13 下午 + * @since 2021/1/30 4:13 下午 */ @Data @Entity @@ -56,7 +56,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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java index e1f0cb10..86011ac4 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/SmsSign.java @@ -17,7 +17,7 @@ import javax.persistence.Table; * 短信签名 * * @author Chopper - * @date 2021/1/30 4:13 下午 + * @since 2021/1/30 4:13 下午 */ @Data @Entity 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 e17da568..2d8cd6ab 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 @@ -17,7 +17,7 @@ import javax.persistence.Table; * 短信模板 * * @author Chopper - * @date 2021/1/30 4:13 下午 + * @since 2021/1/30 4:13 下午 */ @Data @Entity 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 25fdfbd0..28f8f60d 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 @@ -19,7 +19,7 @@ import java.util.Date; /** * 店铺接收消息对象 * @author Chopper - * @date 2021/1/30 4:13 下午 + * @since 2021/1/30 4:13 下午 */ @Data @Entity @@ -44,7 +44,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; diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java index 2422fed7..115e4f1f 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dos/WechatMessage.java @@ -14,7 +14,6 @@ import javax.persistence.Table; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/10 17:02 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java index 473ab68a..835e3394 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDTO.java @@ -9,7 +9,7 @@ import java.util.Map; /** * 站内信消息 * @author Chopper - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ @Data public class NoticeMessageDTO { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java index 9ef8195a..0aaea8ee 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dto/NoticeMessageDetailDTO.java @@ -9,7 +9,7 @@ import java.util.List; /** * 站内信消息DTO * @author Chopper - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ @Data public class NoticeMessageDetailDTO extends NoticeMessage { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java b/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java index 7840ed28..14ac747f 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/dto/SmsReachDTO.java @@ -8,7 +8,7 @@ import java.util.List; /** * 短信任务DTO * @author Chopper - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ @Data public class SmsReachDTO extends SmsReach { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java index 36580a5d..322c5818 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageRangeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 发送消息范围枚举 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum MessageRangeEnum { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java index f063535b..c9dd51eb 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageSendClient.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息发送客户端 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum MessageSendClient { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java index 319ca812..cb0b15b5 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageShowType.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息展示类型 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum MessageShowType { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java index 11e107cf..592de0ff 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息状态枚举 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum MessageStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java index 3783a2e5..5a15e175 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTemplateType.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息模板类型 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum MessageTemplateType { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java index 9252aca7..36152245 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/MessageTitle.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息标题 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum MessageTitle { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java index 55552f6b..979f39fa 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageNodeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息编码枚举 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum NoticeMessageNodeEnum { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java index da5b6997..55abcaf5 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/NoticeMessageParameterEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息编码枚举 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum NoticeMessageParameterEnum { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java b/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java index 0f622253..f1fad9b6 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/enums/RangeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.message.entity.enums; * 消息发送类型 * * @author pikachu - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public enum RangeEnum { diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java index 1311d052..435555d7 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MemberMessageQueryVO.java @@ -10,7 +10,7 @@ import lombok.Data; * 会员接收消息查询vo * * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 */ @Data @ApiModel(value = "会员接收消息查询vo") diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java index 577f9779..2d306f58 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageShowVO.java @@ -12,7 +12,7 @@ import lombok.NoArgsConstructor; * 消息 * * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 */ @Data @ApiModel(value = "消息") diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java index 8221dcdf..d534c21f 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/MessageVO.java @@ -10,7 +10,7 @@ import lombok.Data; /** * 消息 * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 * */ @Data diff --git a/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java b/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java index fc746773..62cfdcfc 100644 --- a/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java +++ b/framework/src/main/java/cn/lili/modules/message/entity/vos/StoreMessageQueryVO.java @@ -10,7 +10,7 @@ import lombok.Data; * 店铺消息查询 * * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 */ @Data @ApiModel(value = "消息") diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java index a745aa83..8f843a03 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/MemberMessageMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 会员接收到消息数据处理层 * * @author lili - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface MemberMessageMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java index 8292f430..9bad1ed7 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/MessageMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 管理端发送消息内容数据处理层 * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 */ public interface MessageMapper extends BaseMapper { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java index 689af2be..64c8066f 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/NoticeMessageTemplateMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 通知类消息模板数据处理层 * * @author Bulbasaur - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public interface NoticeMessageTemplateMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java index b9e5d8c2..5856195e 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/SmsReachMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 短信任务数据处理层 * @author Chopper - * @date 2021/1/30 4:17 下午 + * @since 2021/1/30 4:17 下午 */ public interface SmsReachMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java index ad24c205..b600937f 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/SmsSignMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 短信签名数据处理层 * @author Chopper - * @date 2021/1/30 4:17 下午 + * @since 2021/1/30 4:17 下午 */ public interface SmsSignMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java index ab6b93b9..78638896 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/SmsTemplateMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 短信模板数据处理层 * @author Chopper - * @date 2021/1/30 4:17 下午 + * @since 2021/1/30 4:17 下午 */ public interface SmsTemplateMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java b/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java index 29c586dc..80b91dc1 100644 --- a/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java +++ b/framework/src/main/java/cn/lili/modules/message/mapper/StoreMessageMapper.java @@ -12,7 +12,7 @@ import org.apache.ibatis.annotations.Select; * 店铺接收到消息发送数据处理层 * * @author Chopper - * @date 2021/1/30 4:17 下午 + * @since 2021/1/30 4:17 下午 */ public interface StoreMessageMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java index f66de34c..e0d92ef6 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/MemberMessageService.java @@ -12,7 +12,7 @@ import java.util.List; * 会员消息发送业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface MemberMessageService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/service/MessageService.java b/framework/src/main/java/cn/lili/modules/message/service/MessageService.java index 0b63799f..425d0eaf 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/MessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/MessageService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 管理端发送消息内容业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface MessageService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java index aac79e54..4b73cdb7 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/NoticeMessageService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 通知类消息模板业务层 * * @author Bulbasaur - * @date 2020/12/8 9:47 + * @since 2020/12/8 9:47 */ public interface NoticeMessageService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java b/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java index 90079065..3d9794f5 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/SmsReachService.java @@ -9,7 +9,7 @@ import java.util.List; * 短信任务业务层 * * @author Bulbasaur - * @date 2021/1/30 3:19 下午 + * @since 2021/1/30 3:19 下午 */ public interface SmsReachService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java b/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java index f527d24e..18439ae5 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/SmsSignService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 签名申请业务层 * * @author Bulbasaur - * @date 2021/1/30 3:19 下午 + * @since 2021/1/30 3:19 下午 */ public interface SmsSignService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java b/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java index fc25b636..7fd1e946 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/SmsTemplateService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 签名申请业务层 * * @author Bulbasaur - * @date 2021/1/30 3:19 下午 + * @since 2021/1/30 3:19 下午 */ public interface SmsTemplateService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java b/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java index ec102af2..81b32d14 100644 --- a/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java +++ b/framework/src/main/java/cn/lili/modules/message/service/StoreMessageService.java @@ -12,7 +12,7 @@ import java.util.List; * 店铺接收消息业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface StoreMessageService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java index 7f0a0c17..b5f40812 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MemberMessageServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; * 会员接收消息业务层实现 * * @author Chopper - * @date 2020/11/17 3:48 下午 + * @since 2020/11/17 3:48 下午 */ @Service public class MemberMessageServiceImpl extends ServiceImpl implements MemberMessageService { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java index e6a04466..86d57037 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/MessageServiceImpl.java @@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional; * 管理端发送消息内容业务层实现 * * @author Chopper - * @date 2020/11/17 3:48 下午 + * @since 2020/11/17 3:48 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java index 740fba02..67679412 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/NoticeMessageServiceImpl.java @@ -25,7 +25,7 @@ import java.util.Map; * 通知类消息模板业务层实现 * * @author Bulbasaur - * @date 2020/12/8 9:48 + * @since 2020/12/8 9:48 */ @Service public class NoticeMessageServiceImpl extends ServiceImpl implements NoticeMessageService { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java index d8fa32b2..436f7a63 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsReachServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; * 短信任务业务层实现 * * @author Bulbasaur - * @date 2021/1/30 3:19 下午 + * @since 2021/1/30 3:19 下午 */ @Service public class SmsReachServiceImpl extends ServiceImpl implements SmsReachService { diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java index e7ec89dd..957d6ec0 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsSignServiceImpl.java @@ -23,7 +23,7 @@ import java.util.Map; /** * 短信签名业务层实现 * @author Chopper - * @date 2021/1/30 4:27 下午 + * @since 2021/1/30 4:27 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java index ad1cca95..291bfd65 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/SmsTemplateServiceImpl.java @@ -21,7 +21,7 @@ import java.util.Map; /** * 短信模板业务层实现 * @author Chopper - * @date 2021/1/30 4:27 下午 + * @since 2021/1/30 4:27 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java index 6d81963c..61954006 100644 --- a/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/message/serviceimpl/StoreMessageServiceImpl.java @@ -22,7 +22,7 @@ import java.util.List; * 消息发送业务层实现 * * @author Chopper - * @date 2020/11/17 3:48 下午 + * @since 2020/11/17 3:48 下午 */ @Service public class StoreMessageServiceImpl extends ServiceImpl implements StoreMessageService { diff --git a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java index b086459e..8866cb31 100644 --- a/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java +++ b/framework/src/main/java/cn/lili/modules/message/util/WechatMessageData.java @@ -13,7 +13,6 @@ import java.util.Map; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/11 09:52 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java index 413956d5..0eb49b60 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/MemberCouponDTO.java @@ -10,7 +10,7 @@ import java.util.Map; * 用于计算优惠券结算详情 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ @Data public class MemberCouponDTO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java index a51f7460..a016057e 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/StoreRemarkDTO.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 店铺备注 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ @Data public class StoreRemarkDTO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java index 2b50795c..37a981cb 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/dto/TradeDTO.java @@ -22,7 +22,7 @@ import java.util.Map; * 购物车视图 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ @Data public class TradeDTO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java index bdc11c9d..32ec0108 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/CartTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums; * 购物车类型 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ public enum CartTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java index 7d549d5f..c329cba9 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/DeliveryMethodEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums; * 配送方式 * * @author paulG - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 **/ public enum DeliveryMethodEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java index 9c7f793e..eaa97222 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/SuperpositionPromotionEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums; * 活动叠加 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ public enum SuperpositionPromotionEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java index 6a98ed64..3e26d466 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/enums/TradeCacheEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.cart.entity.enums; * 交易缓存枚举 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ public enum TradeCacheEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java index 50eea20a..515d1925 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartBase.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 购物车基础 * * @author Chopper - * @date 2020-03-24 10:33 上午 + * @since 2020-03-24 10:33 上午 */ @Data public class CartBase implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java index 7671d446..ab292c31 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartSkuVO.java @@ -16,7 +16,7 @@ import java.util.List; * 购物车中的产品 * * @author Chopper - * @date 2020-03-24 10:33 上午 + * @since 2020-03-24 10:33 上午 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java index 5906b4fb..69b7ffac 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/CartVO.java @@ -16,7 +16,7 @@ import java.util.List; * 购物车展示VO * * @author Chopper - * @date 2020-03-24 10:33 上午 + * @since 2020-03-24 10:33 上午 */ @Data @ApiModel(description = "购物车") diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java index 8422fdf3..e9450707 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/FullDiscountVO.java @@ -10,7 +10,7 @@ import java.util.List; * 满额活动VO * * @author Chopper - * @date 2020-04-01 10:42 上午 + * @since 2020-04-01 10:42 上午 */ @Data public class FullDiscountVO extends FullDiscount { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java index 197faede..9da3d82a 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/GoodsPromotionVO.java @@ -12,7 +12,7 @@ import java.util.Date; * 商品促销VO * * @author Chopper - * @date 2020-04-01 10:42 上午 + * @since 2020-04-01 10:42 上午 */ @Data @ApiModel(description = "购物车中") diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java index 2dbb4082..0ca210d4 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/PriceDetailVO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 订单价格详情 * * @author Chopper - * @date 2020-04-01 10:42 上午 + * @since 2020-04-01 10:42 上午 */ @Data public class PriceDetailVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java index a9cb3d00..f7be7645 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeParams.java @@ -12,7 +12,7 @@ import java.util.List; * 交易参数 * * @author paulG - * @date 2021/2/23 + * @since 2021/2/23 **/ @Data public class TradeParams implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java index b57806c4..ec3dd3ba 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/entity/vo/TradeVO.java @@ -10,7 +10,7 @@ import java.util.List; * 整比交易对象 * * @author Chopper - * @date 2020-04-01 10:42 上午 + * @since 2020-04-01 10:42 上午 */ @Data public class TradeVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java b/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java index 1fcccf63..0b58824f 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/CartRenderStep.java @@ -6,16 +6,16 @@ import cn.lili.modules.order.cart.entity.dto.TradeDTO; * 购物车渲染 * * @author Chopper - * @date 2020-04-01 10:27 上午 + * @since 2020-04-01 10:27 上午 */ public interface CartRenderStep { /** * 渲染一笔交易 - * 0-> 校验商品 1-》 满优惠渲染 2->渲染优惠 3->优惠券渲染 4->计算运费 5->计算价格 6->分销渲染 7->其他渲染 + * 0-》 校验商品 1-》 满优惠渲染 2-》渲染优惠 3-》优惠券渲染 4-》计算运费 5-》计算价格 6-》分销渲染 7-》其他渲染 * - * @param tradeDTO + * @param tradeDTO 交易DTO */ void render(TradeDTO tradeDTO); } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java index 9d5fc853..137aec54 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/TradeBuilder.java @@ -19,7 +19,7 @@ import java.util.stream.Collectors; * 交易构造&&创建 * * @author Chopper - * @date2020-04-01 9:47 下午 + * @since2020-04-01 9:47 下午 */ @Service @Slf4j diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java index 90ba8c93..78b895b0 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CartSnRender.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Service; * sn 生成 * * @author Chopper - * @date 2020-07-02 14:47 + * @since 2020-07-02 14:47 */ @Order(7) @Service diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java index 47164879..9687b989 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * 商品有效性校验 * * @author Chopper - * @date 2020-07-02 14:47 + * @since 2020-07-02 14:47 */ @Order(0) @Service diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java index 0a03515a..54900a2d 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CouponRender.java @@ -15,7 +15,7 @@ import java.util.Map; * 购物促销信息渲染实现 * * @author Chopper - * @date 2020-07-02 14:47 + * @since 2020-07-02 14:47 */ @Order(3) @Service diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java index b8b53792..56d84e04 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/DistributionPriceRender.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Service; * 购物促销信息渲染实现 * * @author Chopper - * @date 2020-07-02 14:47 + * @since 2020-07-02 14:47 */ @Service @Order(6) 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 6690faec..0cfdc714 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 @@ -20,7 +20,7 @@ import java.util.stream.Collectors; * FullDiscountRender * * @author Chopper - * @date 2020-04-01 10:27 上午 + * @since 2020-04-01 10:27 上午 */ @Service @Order(1) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java index 0294e23d..be224ab9 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java @@ -22,7 +22,7 @@ import java.util.List; * sku 运费计算 * * @author Chopper - * @date 2020-07-02 14:47 + * @since 2020-07-02 14:47 */ @Order(4) @Service diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java index 45524d73..48f847e2 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuPromotionRender.java @@ -38,7 +38,7 @@ import java.util.stream.Collectors; * 购物促销信息渲染实现 * * @author Chopper - * @date 2020-07-02 14:47 + * @since 2020-07-02 14:47 */ @Service @Order(2) diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java index c47b37e9..2bcb54df 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartService.java @@ -11,7 +11,7 @@ import cn.lili.modules.order.order.entity.vo.ReceiptVO; * 购物车业务层 * * @author Chopper - * @date 2020-03-23 12:29 下午 + * @since 2020-03-23 12:29 下午 */ public interface CartService { 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 a3c1b50a..cad4fff0 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 @@ -50,7 +50,7 @@ import java.util.stream.Collectors; * 购物车业务层实现 * * @author Chopper - * @date 2020-03-23 12:29 下午 + * @since 2020-03-23 12:29 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java index abd8a8fa..7e3dccbe 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java +++ b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleLogPoint.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 售后日志AOP注解 * * @author Chopper - * @date 2020/11/17 7:22 下午 + * @since 2020/11/17 7:22 下午 */ @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java index 8b6eddfb..43ee90aa 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java +++ b/framework/src/main/java/cn/lili/modules/order/order/aop/AfterSaleOperationLogAspect.java @@ -22,7 +22,7 @@ import java.util.Map; * 订单操作日志 * * @author Chopper - * @date 2020/11/17 7:22 下午 + * @since 2020/11/17 7:22 下午 */ @Slf4j @Aspect diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java index 431e9a5e..d1427a86 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java +++ b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderLogPoint.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 订单日志AOP注解 * * @author Chopper - * @date 2020/11/17 7:22 下午 + * @since 2020/11/17 7:22 下午 */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java index 05677dd2..f1c4e183 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java +++ b/framework/src/main/java/cn/lili/modules/order/order/aop/OrderOperationLogAspect.java @@ -21,7 +21,7 @@ import java.util.Map; * 订单操作日志 * * @author Chopper - * @date: 2020/11/17 7:22 下午 + * @since: 2020/11/17 7:22 下午 */ @Slf4j @Aspect diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java index 575da880..99488837 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSale.java @@ -17,7 +17,7 @@ import java.util.Date; * 售后 * * @author Chopper - * @date 2020/11/17 7:30 下午 + * @since 2020/11/17 7:30 下午 */ @Data @Entity @@ -148,7 +148,7 @@ public class AfterSale extends BaseEntity { private String mLogisticsName; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "买家发货时间") private Date mDeliverTime; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java index bfbd7a4e..8a69eb09 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/AfterSaleReason.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; * 售后原因 * * @author Bulbasaur - * @date: 2021/7/9 1:39 上午 + * @since: 2021/7/9 1:39 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java index 5361566f..e8f766ff 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Order.java @@ -31,7 +31,7 @@ import java.util.Optional; * 订单 * * @author Chopper - * @date 2020/11/17 7:30 下午 + * @since 2020/11/17 7:30 下午 */ @Data @Entity @@ -85,7 +85,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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java index 0ef83e44..7f1d62ab 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/OrderItem.java @@ -29,7 +29,7 @@ import java.util.stream.Collectors; * 子订单 * * @author Chopper - * @date 2020/11/17 7:30 下午 + * @since 2020/11/17 7:30 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java index f4b4df72..d900074d 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Receipt.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 发票 * * @author Bulbasaur - * @date 2020/11/28 11:38 + * @since 2020/11/28 11:38 */ @Data @Entity 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 c4747861..9495fcdb 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 @@ -22,7 +22,7 @@ import java.util.Date; * 商家订单流水 * * @author Chopper - * @date 2020/11/17 7:31 下午 + * @since 2020/11/17 7:31 下午 */ @Data @Entity @@ -124,7 +124,7 @@ public class StoreFlow { @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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java index 20966d8c..1f5c121d 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dos/Trade.java @@ -17,7 +17,7 @@ import javax.persistence.Table; * 交易 * * @author Chopper - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java index e2fba22b..20e110c7 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSaleDTO.java @@ -7,7 +7,7 @@ import lombok.Data; * 售后dto * * @author Chopper - * @date 2021/3/20 10:48 + * @since 2021/3/20 10:48 */ @Data public class AfterSaleDTO { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java index 613912f5..b442dd83 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/AfterSalePriceDetailDTO.java @@ -13,7 +13,7 @@ import java.util.List; * 商城退款流水 * * @author Chopper - * @date 2020/11/17 7:25 下午 + * @since 2020/11/17 7:25 下午 */ @Data public class AfterSalePriceDetailDTO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java index d6ccd31c..6d9eb229 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderBatchDeliverDTO.java @@ -6,7 +6,7 @@ import lombok.Data; /** * 订单批量发货DTO * @author Bulbasaur - * @date: 2021/5/26 4:21 下午 + * @since: 2021/5/26 4:21 下午 * */ @Data diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java index a6588751..f2e39dba 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderComplaintDTO.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotBlank; * 交易投诉DTO * * @author Bulbasaur - * @date 2021/1/7 19:39 + * @since 2021/1/7 19:39 */ @Data public class OrderComplaintDTO { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java index 8d0b794b..2da9899c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderExportDTO.java @@ -13,7 +13,7 @@ import java.util.Date; /** * 订单导出DTO * @author Bulbasaur - * @date: 2021/6/3 6:36 下午 + * @since: 2021/6/3 6:36 下午 * */ @Data diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java index 460305fb..6c8640b2 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderReceiptDTO.java @@ -10,7 +10,7 @@ import lombok.Data; * 订单发票 * * @author lili - * @date 2020/11/28 11:38 + * @since 2020/11/28 11:38 */ @Data @ApiModel(value = "订单发票") diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java index 8c59d279..067b44f5 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/OrderSearchParams.java @@ -21,7 +21,7 @@ import java.util.Date; * 订单查询参数 * * @author Chopper - * @date 2020/11/17 4:33 下午 + * @since 2020/11/17 4:33 下午 */ @Data public class OrderSearchParams extends PageVO { @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java index 06ab410c..a74f2765 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/PriceDetailDTO.java @@ -14,7 +14,7 @@ import java.util.List; * 商城流水，细节到orderItem * * @author Chopper - * @date 2020/11/17 7:25 下午 + * @since 2020/11/17 7:25 下午 */ @Data public class PriceDetailDTO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java index e0b82ff4..9d28d0f4 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptDTO.java @@ -9,7 +9,7 @@ import javax.persistence.Column; * 发票子内容 * * @author Bulbasaur - * @date 2020/11/28 11:44 + * @since 2020/11/28 11:44 */ @Data public class ReceiptDTO { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java index 496d259b..176391a0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/dto/ReceiptSearchParams.java @@ -9,7 +9,7 @@ import lombok.Data; * 发票搜索参数 * * @author paulG - * @date 2021/1/12 + * @since 2021/1/12 **/ @Data public class ReceiptSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java index eb1f7f43..16eef3ff 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommentStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 评论状态枚举 * * @author Chopper - * @date 2020/11/17 7:25 下午 + * @since 2020/11/17 7:25 下午 */ public enum CommentStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java index de7cd1ba..e019e106 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/CommunicationOwnerEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 投诉角色枚举 * * @author paulG - * @date 2020/12/7 + * @since 2020/12/7 **/ public enum CommunicationOwnerEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java index e2f4c1a3..6877ec75 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/ComplaintStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 交易投诉状态 * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ public enum ComplaintStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java index 6f157857..f381d80e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/DeliverStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 发货状态枚举 * * @author Chopper - * @date 2020/11/17 7:25 下午 + * @since 2020/11/17 7:25 下午 */ public enum DeliverStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java index c2c7fa9b..403fe145 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/FlowTypeEnum.java @@ -5,7 +5,7 @@ package cn.lili.modules.order.order.entity.enums; * 流水类型枚举 * * @author Chopper - * @date 2020/11/17 7:25 下午 + * @since 2020/11/17 7:25 下午 */ public enum FlowTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java index facd49e3..1daa5add 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderComplaintStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单的投诉状态 * * @author paulG - * @date 2020/12/5 + * @since 2020/12/5 **/ public enum OrderComplaintStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java index d1b2a33a..00a34619 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderItemAfterSaleStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单可申请售后状态枚举 * * @author Chopper - * @date 2020/11/17 7:26 下午 + * @since 2020/11/17 7:26 下午 */ public enum OrderItemAfterSaleStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java index 814b9055..6f47de5c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderMetaKeyEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单元Key枚举 * * @author Chopper - * @date 2020/11/17 7:26 下午 + * @since 2020/11/17 7:26 下午 */ public enum OrderMetaKeyEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java index b9283f9a..9a3c4659 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOperateEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单的操作方式枚举 * * @author Chopper - * @date 2020/11/17 7:26 下午 + * @since 2020/11/17 7:26 下午 */ public enum OrderOperateEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java index a00ce1b3..34254a71 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单出库状态枚举 * * @author Chopper - * @date 2020/11/17 7:26 下午 + * @since 2020/11/17 7:26 下午 */ public enum OrderOutStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java index fe2a6d71..9180a7c6 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderOutTypeEnum.java @@ -7,7 +7,7 @@ import java.util.List; * 订单出库的类型枚举 * * @author Chopper - * @date 2020/11/17 7:27 下午 + * @since 2020/11/17 7:27 下午 */ public enum OrderOutTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java index ac06e73c..8d38d8cd 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderPromotionTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单促销类型枚举 * * @author Chopper - * @date 2020/11/17 7:28 下午 + * @since 2020/11/17 7:28 下午 */ public enum OrderPromotionTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java index a2536c7b..6d9f4906 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单状态枚举 * * @author Chopper - * @date 2020/11/17 7:27 下午 + * @since 2020/11/17 7:27 下午 */ public enum OrderStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java index d7b4aaad..8870398e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTagEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 前端订单页面TAB标签枚举 * * @author Chopper - * @date 2020/11/17 7:28 下午 + * @since 2020/11/17 7:28 下午 */ public enum OrderTagEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java index 8fba1a49..6cd2b9b3 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/OrderTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单类型枚举 * * @author Chopper - * @date 2020/11/17 7:28 下午 + * @since 2020/11/17 7:28 下午 */ public enum OrderTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java index 00c3ea44..33188e2c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/enums/PayStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.order.entity.enums; * 订单状态枚举 * * @author Chopper - * @date 2020/11/17 7:28 下午 + * @since 2020/11/17 7:28 下午 */ public enum PayStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java index d165bd67..b830279a 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleAllowOperation.java @@ -9,7 +9,7 @@ import lombok.Data; * 售后可操作类型 * * @author Chopper - * @date 2021/3/12 10:33 上午 + * @since 2021/3/12 10:33 上午 */ @Data public class AfterSaleAllowOperation { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java index 9f7fa32e..a05a416f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleApplyVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 售后申请VO * * @author Chopper - * @date 2021/3/12 10:33 上午 + * @since 2021/3/12 10:33 上午 */ @Data public class AfterSaleApplyVO { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java index 5f729f3f..5c934af0 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleSearchParams.java @@ -15,7 +15,7 @@ import java.util.Date; * 售后搜索参数 * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ @Data public class AfterSaleSearchParams extends PageVO { @@ -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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java index 50650b50..4fdc10b5 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AfterSaleVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 售后VO * * @author Chopper - * @date 2021/3/12 10:32 上午 + * @since 2021/3/12 10:32 上午 */ @Data public class AfterSaleVO extends AfterSale { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java index 2e39d768..6ef7ca59 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/AllowOperation.java @@ -15,7 +15,7 @@ import java.io.Serializable; * 订单可进行的操作 * * @author Chopper - * @date 2020/11/17 7:29 下午 + * @since 2020/11/17 7:29 下午 */ @Data public class AllowOperation implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java index bbcfcb4d..3afa9369 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationSearchParams.java @@ -10,7 +10,7 @@ import lombok.Data; * 订单投诉搜索参数 * * @author paulG - * @date 2020/12/5 + * @since 2020/12/5 **/ @Data public class OrderComplaintCommunicationSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java index 53b55196..342e557f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintCommunicationVO.java @@ -8,7 +8,7 @@ import lombok.NoArgsConstructor; * 投诉通信VO * * @author paulG - * @date 2020/12/5 + * @since 2020/12/5 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java index 83b4db04..4f3b9145 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintOperationParams.java @@ -9,7 +9,7 @@ import java.util.List; * 交易投诉 参数 * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ @Data public class OrderComplaintOperationParams { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java index 707ede7c..025e54cd 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintSearchParams.java @@ -11,7 +11,7 @@ import lombok.Data; * 订单投诉查询参数 * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ @Data public class OrderComplaintSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java index 8cbccce8..96311ad8 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderComplaintVO.java @@ -14,7 +14,7 @@ import java.util.List; * 订单交易投诉VO * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java index a814754e..8fad0217 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderDetailVO.java @@ -21,7 +21,7 @@ import java.util.List; * 订单详情VO * * @author Chopper - * @date 2020/11/17 7:29 下午 + * @since 2020/11/17 7:29 下午 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java index 000a01ed..6d091159 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderItemVO.java @@ -10,7 +10,7 @@ import lombok.Data; * 子订单VO * * @author Chopper - * @date 2020-08-17 20:28 + * @since 2020-08-17 20:28 */ @Data public class OrderItemVO { diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java index 1d6f9319..39dece21 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderSimpleVO.java @@ -19,7 +19,7 @@ import java.util.List; * 用于订单列表查看 * * @author Chopper - * @date 2020-08-17 20:28 + * @since 2020-08-17 20:28 */ @Data public class OrderSimpleVO { @@ -31,7 +31,7 @@ public class OrderSimpleVO { private Double flowPrice; @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; diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java index f6845095..bfb23844 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/OrderVO.java @@ -13,7 +13,7 @@ import java.util.List; * 订单vo * * @author Bulbasaur - * @date 2020/11/28 11:38 + * @since 2020/11/28 11:38 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java index a38ca62a..0b470505 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/PaymentLog.java @@ -16,7 +16,7 @@ import java.util.Date; * 订单支付日志：实际为订单部分字段提取过来的一个vo * * @author Chopper - * @date 2020/11/17 7:30 下午 + * @since 2020/11/17 7:30 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java index cbea30f0..ad7b73ce 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/ReceiptVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 发票 * * @author Bulbasaur - * @date 2020/11/28 11:38 + * @since 2020/11/28 11:38 */ @Data @ApiModel(value = "发票") diff --git a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java index f4aac4b1..fb0a533c 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java +++ b/framework/src/main/java/cn/lili/modules/order/order/entity/vo/StoreAppealVO.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; * 订单交易投诉VO * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java index a67c0ae7..9ee2ceb3 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 售后数据处理层 * * @author Chopper - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface AfterSaleMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java index 2e0f2d7b..2cfe9d2f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/AfterSaleReasonMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 售后原因数据处理层 * * @author Chopper - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface AfterSaleReasonMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java index 91643411..199b2f63 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderItemMapper.java @@ -14,7 +14,7 @@ import java.util.List; * 子订单数据处理层 * * @author Chopper - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface OrderItemMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java index 6bcbbf42..4430748e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java @@ -18,7 +18,7 @@ import java.util.List; * 订单数据处理层 * * @author Chopper - * @date 2020/11/17 7:35 下午 + * @since 2020/11/17 7:35 下午 */ public interface OrderMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java index 3a7ba953..f6df8c3b 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/ReceiptMapper.java @@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Select; * 发票数据处理层 * * @author Chopper - * @date 2020/11/17 7:35 下午 + * @since 2020/11/17 7:35 下午 */ public interface ReceiptMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java index 73e0abc7..faffdc4f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/StoreFlowMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 商家订单流水数据处理层 * * @author Chopper - * @date 2020/11/17 7:35 下午 + * @since 2020/11/17 7:35 下午 */ public interface StoreFlowMapper extends BaseMapper { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java b/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java index 49201fc7..3c5093e4 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/order/mapper/TradeMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Update; * 交易数据处理层 * * @author Chopper - * @date 2020/11/17 7:35 下午 + * @since 2020/11/17 7:35 下午 */ public interface TradeMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java index 9cd4bd68..a5a19a7f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleLogService.java @@ -9,7 +9,7 @@ import java.util.List; * 订单日志业务层 * * @author Chopper - * @date 2020/11/17 7:37 下午 + * @since 2020/11/17 7:37 下午 */ public interface AfterSaleLogService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java index cdd65be7..54ae530d 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleReasonService.java @@ -9,7 +9,7 @@ import java.util.List; * 售后原因业务层 * * @author Chopper - * @date 2020/11/17 7:37 下午 + * @since 2020/11/17 7:37 下午 */ public interface AfterSaleReasonService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java index e27fd9bf..00cee243 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/AfterSaleService.java @@ -20,7 +20,7 @@ import java.util.List; * 售后业务层 * * @author Chopper - * @date 2020/11/17 7:36 下午 + * @since 2020/11/17 7:36 下午 */ public interface AfterSaleService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java index 10a1920a..c0637b41 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintCommunicationService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 订单投诉通信业务层 * * @author paulG - * @date 2020/12/5 + * @since 2020/12/5 **/ public interface OrderComplaintCommunicationService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java index 79bc0461..7ab562da 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderComplaintService.java @@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 交易投诉业务层 * * @author paulG - * @date 2020/12/4 + * @since 2020/12/4 **/ public interface OrderComplaintService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java index 980985b4..cee318a2 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderItemService.java @@ -12,7 +12,7 @@ import java.util.List; * 子订单业务层 * * @author Chopper - * @date 2020/11/17 7:36 下午 + * @since 2020/11/17 7:36 下午 */ public interface OrderItemService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java index 56db9912..1aa5791e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderPriceService.java @@ -6,7 +6,7 @@ import cn.lili.modules.order.order.entity.dos.Order; * 订单价格 * * @author Chopper - * @date 2020/11/17 7:36 下午 + * @since 2020/11/17 7:36 下午 */ public interface OrderPriceService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java index 63fa0ae0..e35b03eb 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/OrderService.java @@ -22,7 +22,7 @@ import java.util.List; * 子订单业务层 * * @author Chopper - * @date 2020/11/17 7:36 下午 + * @since 2020/11/17 7:36 下午 */ public interface OrderService extends IService { @@ -208,9 +208,8 @@ public interface OrderService extends IService { /** * 获取待发货订单编号列表 * - * @param response + * @param response 响应 * @param logisticsName 店铺已选择物流公司列表 - * @return 待发货订单编号列表 */ void getBatchDeliverList(HttpServletResponse response, List logisticsName); diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java b/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java index 2caeed81..748b6051 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/ReceiptService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 发票业务层 * * @author Bulbasaur - * @date 2020/11/17 7:37 下午 + * @since 2020/11/17 7:37 下午 */ public interface ReceiptService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java b/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java index 14740c83..83d07d57 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/StoreFlowService.java @@ -12,7 +12,7 @@ import java.util.Date; * 商家订单流水业务层 * * @author Chopper - * @date 2020/11/17 7:37 下午 + * @since 2020/11/17 7:37 下午 */ public interface StoreFlowService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java b/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java index 21fcfe5b..cf14ea5d 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java +++ b/framework/src/main/java/cn/lili/modules/order/order/service/TradeService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 交易业务层 * * @author Chopper - * @date 2020/11/17 7:37 下午 + * @since 2020/11/17 7:37 下午 */ public interface TradeService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java index 5c69e2fb..e35fd44f 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleLogServiceImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 订单日志业务层实现 * * @author Chopper - * @date 2020/11/17 7:37 下午 + * @since 2020/11/17 7:37 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java index 7599e92a..991b38dc 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleReasonServiceImpl.java @@ -16,7 +16,7 @@ import java.util.List; * 售后原因业务层实现 * * @author Chopper - * @date 2020/11/17 7:38 下午 + * @since 2020/11/17 7:38 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java index 58ae9189..21e3fcab 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/AfterSaleServiceImpl.java @@ -60,7 +60,7 @@ import java.util.List; * 售后业务层实现 * * @author Chopper - * @date 2020/11/17 7:38 下午 + * @since 2020/11/17 7:38 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java index 1f5125a5..7579de46 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderItemServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; * 子订单业务层实现 * * @author Chopper - * @date 2020/11/17 7:38 下午 + * @since 2020/11/17 7:38 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java index 3bc505d8..089dbeda 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderPriceServiceImpl.java @@ -32,7 +32,7 @@ import java.util.List; * 订单价格业务层实现 * * @author Chopper - * @date 2020/11/17 7:36 下午 + * @since 2020/11/17 7:36 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java index d8fff356..677f96cb 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java @@ -83,7 +83,7 @@ import java.util.*; * 子订单业务层实现 * * @author Chopper - * @date 2020/11/17 7:38 下午 + * @since 2020/11/17 7:38 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java index ce57885b..a1b0fa4e 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/ReceiptServiceImpl.java @@ -20,7 +20,7 @@ import org.springframework.transaction.annotation.Transactional; * 发票业务层实现 * * @author Bulbasaur - * @date 2020/11/17 7:38 下午 + * @since 2020/11/17 7:38 下午 */ @Service public class ReceiptServiceImpl extends ServiceImpl implements ReceiptService { diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java index 5eb8d19f..cecab0ce 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java @@ -32,7 +32,7 @@ import java.util.List; * 商家订单流水业务层实现 * * @author Chopper - * @date 2020/11/17 7:38 下午 + * @since 2020/11/17 7:38 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java index 1bb77a78..f0239896 100644 --- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java @@ -1 +1 @@ -package cn.lili.modules.order.order.serviceimpl; import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.common.rocketmq.tags.MqOrderTagsEnum; import cn.lili.config.rocketmq.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.MemberCouponService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @date 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //积分预处理 pointPretreatment(tradeDTO); //优惠券预处理 couponPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //写入缓存，给消费者调用 cache.put(key, tradeDTO); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } /** * 订单配送区域校验 */ if (tradeDTO.getNotSupportFreight() != null && tradeDTO.getNotSupportFreight().size() > 0) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> { stringBuilder.append(sku.getGoodsSku().getGoodsName()); }); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 积分预处理 * 下单同时，使用积分 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()).append(","); } if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { Member userInfo = memberService.getUserInfo(); if (userInfo.getPoint() < tradeDTO.getPriceDetailDTO().getPayPoint()) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO(). getPayPoint().longValue(), false, tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } } \ No newline at end of file +package cn.lili.modules.order.order.serviceimpl; import cn.lili.common.cache.Cache; import cn.lili.common.cache.CachePrefix; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.rocketmq.RocketmqSendCallbackBuilder; import cn.lili.common.rocketmq.tags.MqOrderTagsEnum; import cn.lili.config.rocketmq.RocketmqCustomProperties; import cn.lili.modules.member.entity.dos.Member; import cn.lili.modules.member.entity.dos.MemberAddress; import cn.lili.modules.member.service.MemberService; import cn.lili.modules.order.cart.entity.dto.MemberCouponDTO; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.cart.entity.vo.CartVO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.Trade; import cn.lili.modules.order.order.entity.enums.PayStatusEnum; import cn.lili.modules.order.order.mapper.TradeMapper; import cn.lili.modules.order.order.service.OrderService; import cn.lili.modules.order.order.service.TradeService; import cn.lili.modules.promotion.service.CouponService; import cn.lili.modules.promotion.service.MemberCouponService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; /** * 交易业务层实现 * * @author Chopper * @since 2020/11/17 7:39 下午 */ @Service @Transactional(rollbackFor = Exception.class) public class TradeServiceImpl extends ServiceImpl implements TradeService { /** * 缓存 */ @Autowired private Cache cache; /** * 订单 */ @Autowired private OrderService orderService; /** * 会员 */ @Autowired private MemberService memberService; /** * 优惠券 */ @Autowired private CouponService couponService; /** * 会员优惠券 */ @Autowired private MemberCouponService memberCouponService; /** * RocketMQ */ @Autowired private RocketMQTemplate rocketMQTemplate; /** * RocketMQ 配置 */ @Autowired private RocketmqCustomProperties rocketmqCustomProperties; @Override @Transactional(rollbackFor = Exception.class) public Trade createTrade(TradeDTO tradeDTO) { //创建订单预校验 createTradeCheck(tradeDTO); Trade trade = new Trade(tradeDTO); String key = CachePrefix.TRADE.getPrefix() + trade.getSn(); //积分预处理 pointPretreatment(tradeDTO); //优惠券预处理 couponPretreatment(tradeDTO); //添加交易 this.save(trade); //添加订单 orderService.intoDB(tradeDTO); //写入缓存，给消费者调用 cache.put(key, tradeDTO); //构建订单创建消息 String destination = rocketmqCustomProperties.getOrderTopic() + ":" + MqOrderTagsEnum.ORDER_CREATE.name(); //发送订单创建消息 rocketMQTemplate.asyncSend(destination, key, RocketmqSendCallbackBuilder.commonCallback()); return trade; } /** * 创建订单最后一步校验 * * @param tradeDTO */ private void createTradeCheck(TradeDTO tradeDTO) { //创建订单如果没有收获地址， MemberAddress memberAddress = tradeDTO.getMemberAddress(); if (memberAddress == null) { throw new ServiceException(ResultCode.MEMBER_ADDRESS_NOT_EXIST); } /** * 订单配送区域校验 */ if (tradeDTO.getNotSupportFreight() != null && tradeDTO.getNotSupportFreight().size() > 0) { StringBuilder stringBuilder = new StringBuilder("包含商品有-"); tradeDTO.getNotSupportFreight().forEach(sku -> { stringBuilder.append(sku.getGoodsSku().getGoodsName()); }); throw new ServiceException(ResultCode.ORDER_NOT_SUPPORT_DISTRIBUTION, stringBuilder.toString()); } } @Override public Trade getBySn(String sn) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(Trade::getSn, sn); return this.getOne(queryWrapper); } @Override public void payTrade(String tradeSn, String paymentName, String receivableNo) { LambdaQueryWrapper orderQueryWrapper = new LambdaQueryWrapper<>(); orderQueryWrapper.eq(Order::getTradeSn, tradeSn); List orders = orderService.list(orderQueryWrapper); for (Order order : orders) { orderService.payOrder(order.getSn(), paymentName, receivableNo); } Trade trade = this.getBySn(tradeSn); trade.setPayStatus(PayStatusEnum.PAID.name()); this.saveOrUpdate(trade); } /** * 积分预处理 * 下单同时，使用积分 * * @param tradeDTO */ private void pointPretreatment(TradeDTO tradeDTO) { StringBuilder orderSns = new StringBuilder(); for (CartVO item : tradeDTO.getCartList()) { orderSns.append(item.getSn()).append(","); } if (tradeDTO.getPriceDetailDTO() != null && tradeDTO.getPriceDetailDTO().getPayPoint() != null && tradeDTO.getPriceDetailDTO().getPayPoint() > 0) { Member userInfo = memberService.getUserInfo(); if (userInfo.getPoint() < tradeDTO.getPriceDetailDTO().getPayPoint()) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } boolean result = memberService.updateMemberPoint(tradeDTO.getPriceDetailDTO(). getPayPoint().longValue(), false, tradeDTO.getMemberId(), "订单【" + orderSns + "】创建，积分扣减"); if (!result) { throw new ServiceException(ResultCode.PAY_POINT_ENOUGH); } } } /** * 优惠券预处理 * 下单同时，扣除优惠券 * * @param tradeDTO */ private void couponPretreatment(TradeDTO tradeDTO) { List memberCouponDTOList = new ArrayList<>(); if (null != tradeDTO.getPlatformCoupon()) { memberCouponDTOList.add(tradeDTO.getPlatformCoupon()); } Collection storeCoupons = tradeDTO.getStoreCoupons().values(); if (!storeCoupons.isEmpty()) { memberCouponDTOList.addAll(storeCoupons); } List ids = memberCouponDTOList.stream().map(e -> e.getMemberCoupon().getId()).collect(Collectors.toList()); memberCouponService.used(ids); memberCouponDTOList.forEach(e -> couponService.usedCoupon(e.getMemberCoupon().getCouponId(), 1)); } } \ No newline at end of file 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 a70e8abd..e0b56d16 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 @@ -24,7 +24,7 @@ import java.util.Date; * 售后日志 * * @author Bulbasaur - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ @Data @Entity @@ -48,7 +48,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; 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 39c8a263..0bdfbd91 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 @@ -25,7 +25,7 @@ import java.util.Date; * 订单日志 * * @author Chopper - * @date 2020-03-25 2:30 下午 + * @since 2020-03-25 2:30 下午 */ @Data @Entity @@ -51,7 +51,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; 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 8e039c55..8adcb9fd 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 @@ -26,7 +26,7 @@ import java.util.Date; * 预存款充值记录 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -53,7 +53,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 +86,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; 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 8508af4e..786bf409 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 @@ -23,7 +23,7 @@ import java.util.Date; * 预存款日志实体 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity @@ -81,7 +81,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; diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java index f0ff1d64..b2c24966 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.trade.entity.enums; * 售后状态 * * @author Chopper - * @date 2020-08-20 15:39 + * @since 2020-08-20 15:39 */ public enum AfterSaleStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java index 6b0d26a4..d7ddfc2d 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/AfterSaleTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.trade.entity.enums; * 售后类型 * * @author Chopper - * @date 2020/8/20 15:39 + * @since 2020/8/20 15:39 */ public enum AfterSaleTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java index 51c8eaa7..cbfae540 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/enums/DepositServiceTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.order.trade.entity.enums; * 预存款变动日志业务类型 * * @author Chopper - * @date 2020/8/20 15:39 + * @since 2020/8/20 15:39 */ public enum DepositServiceTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java index dfd438a8..29bcad3f 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/DepositQueryVO.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 预存款充值记录查询条件 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @ApiModel(value = "预存款变动记录查询条件") diff --git a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java index 7bd5d894..d65882ae 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/entity/vo/RechargeQueryVO.java @@ -12,7 +12,7 @@ import java.io.Serializable; * 预存款充值记录查询条件 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @ApiModel(value = "预存款充值记录查询条件") diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java index 8315d63d..4bb728e3 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/AfterSaleLogMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 售后日志数据处理层 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface AfterSaleLogMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java index 91cfb106..2feeaa49 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/OrderLogMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 订单日志数据处理层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface OrderLogMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java index b3af0ac9..fafc2195 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/RechargeMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 预存款充值记录数据处理层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface RechargeMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java b/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java index 428698d8..2ea8ae05 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/mapper/WalletLogMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 预存款日志数据处理层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface WalletLogMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java b/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java index e2be3e7d..ece01032 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/service/OrderLogService.java @@ -9,7 +9,7 @@ import java.util.List; * 订单日志业务层 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface OrderLogService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java b/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java index a4b51e39..3c3cd946 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/service/RechargeService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 预存款充值记录业务层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface RechargeService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java b/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java index a83baece..8ca0722f 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/service/WalletLogService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 预存款日志业务层 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public interface WalletLogService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java index 9d3aa91c..f032a02c 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/OrderLogServiceImpl.java @@ -17,7 +17,7 @@ import java.util.List; * 订单日志业务层实现 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service public class OrderLogServiceImpl extends ServiceImpl implements OrderLogService { diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java index c866ce0e..9d2bac00 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/RechargeServiceImpl.java @@ -30,7 +30,7 @@ import java.util.Date; * 预存款日志业务层实现 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java index 88bb32c9..05cac963 100644 --- a/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/trade/serviceimpl/WalletLogServiceImpl.java @@ -19,7 +19,7 @@ import java.util.Date; * 预存款日志业务层实现 * * @author pikachu - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java index 6a3d756c..9ae3f3fa 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Article.java @@ -17,7 +17,7 @@ import javax.validation.constraints.NotNull; * 文章DO * * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java index 1ef9e680..53240b21 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/ArticleCategory.java @@ -18,7 +18,7 @@ import javax.validation.constraints.NotEmpty; * * @author pikachu * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data @Entity 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 432df5f2..706e9f75 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 @@ -27,7 +27,7 @@ import java.util.Date; * 意见反馈 * * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data @Entity @@ -46,7 +46,7 @@ public class Feedback 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; diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java index fd30ba49..8660da8c 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/PageData.java @@ -18,7 +18,7 @@ import javax.persistence.Table; * 页面数据DO * * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java index 9381253a..61a278ea 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dos/Special.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 专题活动 * * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java b/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java index fe394f53..00271be7 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dto/ArticleSearchParams.java @@ -10,7 +10,7 @@ import lombok.Data; * 商品查询条件 * * @author pikachu - * @date 2020-02-24 19:27:20 + * @since 2020-02-24 19:27:20 */ @Data public class ArticleSearchParams extends PageVO { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java index 0bed2e74..70be533c 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/dto/PageDataDTO.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; * 楼层装修数据DTO * * @author Bulbasaur - * @date 2020/12/10 17:44 + * @since 2020/12/10 17:44 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java index b914f792..d49f7865 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleCategoryEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums; * 文章分类枚举 * * @author Bulbasaur - * @date 2020/12/7 10:50 + * @since 2020/12/7 10:50 */ public enum ArticleCategoryEnum { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java index d2c93723..9a971e8e 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/ArticleEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums; * 文章分类枚举 * * @author Bulbasaur - * @date 2020/12/7 10:50 + * @since 2020/12/7 10:50 */ public enum ArticleEnum { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java index cca95dfb..ee088002 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/FeedbackTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums; * 功能反馈枚举 * * @author Bulbasaur - * @date 2020/12/7 10:50 + * @since 2020/12/7 10:50 */ public enum FeedbackTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java b/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java index 0c5b2948..c8747c8b 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/enums/PageEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.page.entity.enums; * 楼层装修枚举 * * @author Bulbasaur - * @date 2020/12/7 10:50 + * @since 2020/12/7 10:50 */ public enum PageEnum { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java index f6f0f901..112ecc87 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleCategoryVO.java @@ -13,7 +13,7 @@ import java.util.List; * 文章分类VO * * @author Chopper - * @date 2021-03-26 11:32 + * @since 2021-03-26 11:32 */ @Data public class ArticleCategoryVO extends ArticleCategory { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java index 98891628..997216bd 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/ArticleVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 文章VO * * @author Chopper - * @date 2021-03-26 11:32 + * @since 2021-03-26 11:32 */ @Data public class ArticleVO { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java index 1eb61f9c..87bd7553 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataListVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 楼层装修数据VO * * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data public class PageDataListVO { diff --git a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java index 8df6902c..5a555dab 100644 --- a/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java +++ b/framework/src/main/java/cn/lili/modules/page/entity/vos/PageDataVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 楼层装修数据VO * * @author Bulbasaur - * @date 2020/12/10 17:42 + * @since 2020/12/10 17:42 */ @Data public class PageDataVO { diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java index 933db36b..ed28617f 100644 --- a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java +++ b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleCategoryMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 文章分类数据处理层 * * @author pikachu - * @date 2020-05-5 15:10:16 + * @since 2020-05-5 15:10:16 */ public interface ArticleCategoryMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java index 8313b50c..f20cdaaf 100644 --- a/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java +++ b/framework/src/main/java/cn/lili/modules/page/mapper/ArticleMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select; * 文章数据处理层 * * @author pikachu - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ public interface ArticleMapper extends BaseMapper
{ diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java index 4db2f07d..e0364725 100644 --- a/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java +++ b/framework/src/main/java/cn/lili/modules/page/mapper/FeedbackMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 意见反馈处理层 * * @author pikachu - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ public interface FeedbackMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java index 1076cd88..e1c6956d 100644 --- a/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/page/mapper/PageDataMapper.java @@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Select; * 楼层装修设置数据处理层 * * @author paulGao - * @date 2020/12/7 11:26 + * @since 2020/12/7 11:26 */ public interface PageDataMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java b/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java index ddbfc783..0da88e5b 100644 --- a/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java +++ b/framework/src/main/java/cn/lili/modules/page/mapper/SpecialMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 专题活动数据处理层 * * @author Bulbasaur - * @date 2020/12/7 11:26 + * @since 2020/12/7 11:26 */ public interface SpecialMapper extends BaseMapper { } diff --git a/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java b/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java index 0c820c9f..323dab06 100644 --- a/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java +++ b/framework/src/main/java/cn/lili/modules/page/service/ArticleCategoryService.java @@ -11,7 +11,7 @@ import java.util.List; * 文章分类业务层 * * @author Bulbasaur - * @date 2020/11/24 17:07 + * @since 2020/11/24 17:07 */ public interface ArticleCategoryService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java index 6fac59fe..a9bb5e12 100644 --- a/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java +++ b/framework/src/main/java/cn/lili/modules/page/service/ArticleService.java @@ -16,7 +16,7 @@ import java.util.List; * 文章业务层 * * @author pikachu - * @date 2020/11/18 11:40 上午 + * @since 2020/11/18 11:40 上午 */ @CacheConfig(cacheNames = "{article}") public interface ArticleService extends IService
{ diff --git a/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java b/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java index c2b2a51c..6f95c782 100644 --- a/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java +++ b/framework/src/main/java/cn/lili/modules/page/service/FeedbackService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 意见反馈业务层 * * @author pikachu - * @date 2020/11/18 11:40 上午 + * @since 2020/11/18 11:40 上午 */ public interface FeedbackService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java b/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java index 1ddea4c7..09432b50 100644 --- a/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java +++ b/framework/src/main/java/cn/lili/modules/page/service/PageDataService.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 页面业务层 * * @author Bulbasaur - * @date 2020/12/10 17:23 + * @since 2020/12/10 17:23 */ public interface PageDataService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java b/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java index 76c8f424..30863ab6 100644 --- a/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java +++ b/framework/src/main/java/cn/lili/modules/page/service/SpecialService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 专题活动业务层 * * @author Bulbasaur - * @date 2020/12/7 11:27 + * @since 2020/12/7 11:27 */ public interface SpecialService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java index f0e43af9..843bbb1d 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleCategoryServiceImpl.java @@ -26,7 +26,7 @@ import java.util.List; * 文章分类业务层实现 * * @author pikachu - * @date 2020-05-5 15:10:16 + * @since 2020-05-5 15:10:16 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java index 3a9a3696..f8469d71 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/ArticleServiceImpl.java @@ -27,7 +27,7 @@ import java.util.List; * 文章业务层实现 * * @author Chopper - * @date 2020/11/18 11:40 上午 + * @since 2020/11/18 11:40 上午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java index 210c24c2..714cd671 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/FeedbackServiceImpl.java @@ -14,7 +14,7 @@ import org.springframework.transaction.annotation.Transactional; * 意见反馈业务层实现 * * @author Chopper - * @date 2020/11/18 11:40 上午 + * @since 2020/11/18 11:40 上午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java index ceb0c659..5c16d50d 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java @@ -24,7 +24,7 @@ import org.springframework.stereotype.Service; * 楼层装修管理业务层实现 * * @author Bulbasaur - * @date 2020/12/11 9:15 + * @since 2020/12/11 9:15 */ @Service public class PageDataServiceImpl extends ServiceImpl implements PageDataService { diff --git a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java index 60c7fe2b..6e6b4fee 100644 --- a/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/page/serviceimpl/SpecialServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.stereotype.Service; * 专题活动业务层实现 * * @author Bulbasaur - * @date 2020/12/7 11:27 + * @since 2020/12/7 11:27 */ @Service public class SpecialServiceImpl extends ServiceImpl implements SpecialService { 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 9023b991..6fc6c9a3 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 @@ -24,7 +24,7 @@ import java.util.Date; * 退款日志 * * @author Chopper - * @date 2021/1/28 09:21 + * @since 2021/1/28 09:21 */ @Data @Entity @@ -83,7 +83,7 @@ public class RefundLog { @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; 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 742e4854..077bbb21 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 @@ -31,7 +31,7 @@ import java.util.List; * 收银台工具 * * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ @Component @Slf4j 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 8057c401..1378ea10 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 @@ -14,7 +14,7 @@ import javax.servlet.http.HttpServletResponse; * 支付接口 * * @author Chopper - * @date 2020-12-21 09:32 + * @since 2020-12-21 09:32 */ public interface Payment { /** diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java index c00f059c..f62641fd 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/RefundSupport.java @@ -21,7 +21,7 @@ import java.util.Date; * 退款支持 * * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ @Component @Slf4j diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java index 239303ef..d418940b 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/PaymentHttpResponse.java @@ -13,7 +13,7 @@ import java.util.Map; * 支付接口响应 * * @author Chopper - * @date 2020/12/18 15:13 + * @since 2020/12/18 15:13 */ public class PaymentHttpResponse implements Serializable { private static final long serialVersionUID = 6089103955998013402L; diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java index f98591a1..95419cdb 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/RequestMethodEnums.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.core.enums; * HTTP 请求的方法 * * @author Chopper - * @date 2021-01-25 15:10 + * @since 2021-01-25 15:10 */ public enum RequestMethodEnums { /** diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java index d3994217..b7a605a8 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/enums/SignType.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.core.enums; * 签名方式 * * @author Chopper - * @date 2021-01-25 15:10 + * @since 2021-01-25 15:10 */ public enum SignType { /** diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java index 4a4906ff..efad726b 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/http/AbstractHttpDelegate.java @@ -20,7 +20,7 @@ import java.util.Map; * Http 代理类 * * @author Chopper - * @date 2021-01-25 15:10 + * @since 2021-01-25 15:10 */ public abstract class AbstractHttpDelegate { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java index 12083e41..8dd5a458 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/core/kit/PayKit.java @@ -31,7 +31,6 @@ import java.util.*; * * @author Chopper * @version v4.0 - * @Description: * @since 2020/12/18 15:24 */ @Slf4j diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java b/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java index c743ca1d..a0b1f664 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/dto/PayParam.java @@ -10,7 +10,7 @@ import javax.validation.constraints.NotNull; * 支付参数 * * @author Chopper - * @date 2020/12/19 11:46 + * @since 2020/12/19 11:46 */ @Data @ToString diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java b/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java index f5acc84f..d7b3fee8 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/enums/CashierEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.enums; * 订单类型 * * @author Chopper - * @date 2020-12-19 11:50 + * @since 2020-12-19 11:50 */ public enum CashierEnum { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java index 325cf6e0..98895c91 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentClientEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.enums; * 支付方式枚举 * * @author Chopper - * @date 2020/12/18 18:08 + * @since 2020/12/18 18:08 */ public enum PaymentClientEnum { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java index 28f32ebf..0089d149 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/enums/PaymentMethodEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.enums; * 支付方式枚举 * * @author Chopper - * @date 2020/12/18 18:08 + * @since 2020/12/18 18:08 */ public enum PaymentMethodEnum { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java index c756bf6d..c2ee4232 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/CashierExecute.java @@ -9,7 +9,7 @@ import cn.lili.modules.payment.kit.params.dto.CashierParam; * 收银台接口 * * @author Chopper - * @date 2021-01-25 19:08 + * @since 2021-01-25 19:08 */ public interface CashierExecute { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java index d7e9b279..577cd13c 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/dto/CashierParam.java @@ -12,7 +12,7 @@ import java.util.List; * 支付参数 * * @author Chopper - * @date 2021-01-25 19:09 + * @since 2021-01-25 19:09 */ @Data @ToString diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java index 5dfc9fe6..87160fdb 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/OrderCashier.java @@ -27,7 +27,7 @@ import java.util.List; * 订单支付信息获取 * * @author Chopper - * @date 2021-01-25 20:00 + * @since 2021-01-25 20:00 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java index 8478758c..159cb2f8 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/RechargeCashier.java @@ -22,7 +22,7 @@ import org.springframework.stereotype.Component; * 充值信息获取 * * @author Chopper - * @date 2021-01-25 20:00 + * @since 2021-01-25 20:00 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java index 10b7eff9..cddabb05 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/params/impl/TradeCashier.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; * 整笔交易信息获取 * * @author Chopper - * @date 2021-01-25 20:00 + * @since 2021-01-25 20:00 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java index 71a084cf..c63eeced 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApi.java @@ -22,7 +22,7 @@ import java.util.Map; * 支付宝支付 * * @author Chopper - * @date 2020/12/15 19:26 + * @since 2020/12/15 19:26 */ public class AliPayApi { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java index 4d16304b..2c21c767 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayApiConfigKit.java @@ -19,7 +19,7 @@ import java.util.Date; * AliPayApiConfigKit * * @author Chopper - * @date 2020-12-16 09:31 + * @since 2020-12-16 09:31 */ public class AliPayApiConfigKit { 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 e89f141b..67bed77b 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 @@ -43,7 +43,7 @@ import java.util.Map; * 支付宝支付 * * @author Chopper - * @date 2020/12/17 09:55 + * @since 2020/12/17 09:55 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java index f721a281..8a6f9982 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/alipay/AliPayRequest.java @@ -23,7 +23,7 @@ import java.io.PrintWriter; * 支付宝支付 * * @author Chopper - * @date 2020/12/15 19:26 + * @since 2020/12/15 19:26 */ @Slf4j public class AliPayRequest { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java index cd6049aa..f7cff08b 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/WechatApi.java @@ -19,7 +19,7 @@ import java.util.Map; * 微信支付相关接口 * * @author Chopper - * @date 2021/1/26 15:25 + * @since 2021/1/26 15:25 */ public class WechatApi { 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 ef603306..eda518be 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 @@ -59,7 +59,7 @@ import java.util.Objects; * 微信支付 * * @author Chopper - * @date 2020/12/21 17:44 + * @since 2020/12/21 17:44 */ @Slf4j @Component diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java index 864d1476..03b7e839 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatApi.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.plugin.wechat.enums; * 微信api列表 * * @author Chopper - * @date 2020/12/17 17:43 + * @since 2020/12/17 17:43 */ public enum WechatApi { diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java index b9fc7866..fca89e9d 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/enums/WechatDomain.java @@ -4,7 +4,7 @@ package cn.lili.modules.payment.kit.plugin.wechat.enums; * 微信支付域名 * * @author Chopper - * @date 2020/12/17 17:44 + * @since 2020/12/17 17:44 */ public enum WechatDomain { /** diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java index cc8e6d31..fe06d268 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Amount.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-订单金额 * * @author Chopper - * @date 2020/12/17 17:44 + * @since 2020/12/17 17:44 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java index b8a550a5..18b05b0f 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Detail.java @@ -10,7 +10,7 @@ import java.util.List; * 统一下单-优惠功能 * * @author Chopper - * @date 2020/12/17 17:46 + * @since 2020/12/17 17:46 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java index 3225d939..b12e335d 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/GoodsDetail.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-单品列表 * * @author Chopper - * @date 2020/12/17 17:47 + * @since 2020/12/17 17:47 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java index d63430d9..c6c8db37 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/H5Info.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-H5 场景信息 * * @author Chopper - * @date 2020/12/17 17:56 + * @since 2020/12/17 17:56 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java index f6e0cf7d..c6540b5f 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/Payer.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-支付者 * * @author Chopper - * @date 2020/12/17 17:56 + * @since 2020/12/17 17:56 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java index f855e6bb..0e4cdf29 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/RefundModel.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 国内退款-退款申请 * * @author Chopper - * @date 2020/12/17 17:58 + * @since 2020/12/17 17:58 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java index 879511ba..4aaca6a6 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SceneInfo.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-场景信息 * * @author Chopper - * @date 2020/12/17 17:57 + * @since 2020/12/17 17:57 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java index 9e11f8fc..5c83dcba 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/SettleInfo.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-结算信息 * * @author Chopper - * @date 2020/12/17 17:58 + * @since 2020/12/17 17:58 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java index a4aef092..f5a3789d 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/StoreInfo.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 统一下单-商户门店信息 * * @author Chopper - * @date 2020/12/17 17:58 + * @since 2020/12/17 17:58 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java index 91adc5be..25d5a3ca 100644 --- a/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java +++ b/framework/src/main/java/cn/lili/modules/payment/kit/plugin/wechat/model/UnifiedOrderModel.java @@ -8,7 +8,7 @@ import lombok.experimental.Accessors; * 统一下单-商户门店信息 * * @author Chopper - * @date 2020/12/17 17:58 + * @since 2020/12/17 17:58 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java b/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java index 73a4ade7..da84b7fd 100644 --- a/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/payment/mapper/RefundLogMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 退款日志数据层 * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ public interface RefundLogMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java b/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java index f78efc8d..5ecef2a1 100644 --- a/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java +++ b/framework/src/main/java/cn/lili/modules/payment/service/PaymentService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; * 支付日志 业务层 * * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ public interface PaymentService { diff --git a/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java b/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java index 6b01ea1c..f4d56b64 100644 --- a/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java +++ b/framework/src/main/java/cn/lili/modules/payment/service/RefundLogService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 退款日志 业务层 * * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ public interface RefundLogService extends IService { } diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java index 323555bf..97d8a242 100644 --- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/PaymentServiceImpl.java @@ -21,7 +21,7 @@ import java.util.List; * 支付日志 业务实现 * * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java index 601374ac..8a5e7d8c 100644 --- a/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/payment/serviceimpl/RefundLogServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; * 退款日志 业务实现 * * @author Chopper - * @date 2020-12-19 09:25 + * @since 2020-12-19 09:25 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java b/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java index 5065f4c0..8aa026bb 100644 --- a/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java +++ b/framework/src/main/java/cn/lili/modules/permission/SettingKeys.java @@ -4,7 +4,7 @@ package cn.lili.modules.permission; * 系统秘钥 * * @author paulG - * @date 2020/11/17 4:23 下午 + * @since 2020/11/17 4:23 下午 */ public enum SettingKeys { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java index 52993199..1d480eb1 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 管理员类 * * @author Chopper - * @date 2020/11/19 11:42 + * @since 2020/11/19 11:42 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java index 090c633f..bab3acc7 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Department.java @@ -16,7 +16,7 @@ import java.math.BigDecimal; * 部门 * * @author Chopper - * @date 2020/11/19 11:57 + * @since 2020/11/19 11:57 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java index 892747ab..c9045bea 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/DepartmentRole.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 角色部门绑定关系 * * @author Chopper - * @date 2020/11/19 12:18 + * @since 2020/11/19 12:18 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java index 8d34b045..d9a316bc 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Menu.java @@ -15,7 +15,7 @@ import java.math.BigDecimal; * 菜单权限 * * @author Chopper - * @date 2020/11/19 12:12 + * @since 2020/11/19 12:12 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java index 72e33f86..c231b800 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/Role.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 角色 * * @author Chopper - * @date 2020/11/19 11:57 + * @since 2020/11/19 11:57 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java index 46177b63..cea390c5 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/RoleMenu.java @@ -13,7 +13,7 @@ import javax.persistence.Table; * 角色权限绑定关系 * * @author Chopper - * @date 2020/11/19 12:18 + * @since 2020/11/19 12:18 */ @Data @Entity 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 7ce23182..fd8f4a05 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 @@ -13,7 +13,7 @@ import javax.persistence.Table; * 用户角色 * * @author Chopper - * @date 2020/11/19 12:18 + * @since 2020/11/19 12:18 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java index d6cf6247..a105eef7 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java @@ -12,7 +12,7 @@ import javax.validation.constraints.NotEmpty; * 管理员入库dto * * @author Chopper - * @date 2020/11/16 19:55 + * @since 2020/11/16 19:55 */ @Data @ApiModel(value = "管理员入库dto") diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java index a822758a..e4fb54ae 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/MenuSearchParams.java @@ -7,7 +7,7 @@ import lombok.Data; * 权限搜索参数 * * @author Chopper - * @date 2020-11-19 16:46 + * @since 2020-11-19 16:46 */ @Data public class MenuSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java index 72750041..d7bd826b 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/AdminUserVO.java @@ -13,7 +13,7 @@ import java.util.List; * 管理员VO * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ @Data public class AdminUserVO extends AdminUser { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java index b5c291c9..5e273cb2 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/DepartmentVO.java @@ -11,7 +11,7 @@ import java.util.List; * 部门VO * * @author Chopper - * @date 2020-11-23 18:48 + * @since 2020-11-23 18:48 */ @Data public class DepartmentVO extends Department { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java index 3aba6f18..5543c09b 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/MenuVO.java @@ -13,7 +13,7 @@ import java.util.List; * 菜单VO 展示模型 * * @author Chopper - * @date 2020/11/20 15:38 + * @since 2020/11/20 15:38 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java index a9eb9ded..d86352b5 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/RoleVO.java @@ -11,7 +11,7 @@ import java.util.List; * RoleVO * * @author Chopper - * @date 2020-11-22 17:42 + * @since 2020-11-22 17:42 */ @Data public class RoleVO extends Role { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java index 8fea6475..eb1651ab 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/SystemLogVO.java @@ -14,7 +14,7 @@ import java.util.Map; * 日志 * * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 */ @Data public class SystemLogVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java index 671495a0..5313fa72 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/vo/UserMenuVO.java @@ -7,7 +7,7 @@ import lombok.Data; * RoleMenuVO * * @author Chopper - * @date 2020-11-24 11:45 + * @since 2020-11-24 11:45 */ @Data public class UserMenuVO extends Menu { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java index 75ff89ae..d3ff44eb 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/AdminUserMapper.java @@ -9,7 +9,7 @@ import java.util.List; * 用户数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface AdminUserMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java index e6e7c6d3..3881824d 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 部门数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface DepartmentMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java index ca1220fb..5d0c97fc 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/DepartmentRoleMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 部门角色数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface DepartmentRoleMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java index b3515ce3..e5e24aaf 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/MenuMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 菜单数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface MenuMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java index 12c82357..3cfd4eb4 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleDepartmentMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 角色部门数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface RoleDepartmentMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java index 6fc2af6b..5d16cffc 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 角色数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface RoleMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java index 3e64bec2..d08e6579 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RoleMenuMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 角色菜单数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface RoleMenuMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java index 978d2681..af075a9c 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/RolePermissionMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 角色权限数据处理层 * * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface RolePermissionMapper extends BaseMapper { } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java b/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java index 57fe3be8..f513905a 100644 --- a/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java +++ b/framework/src/main/java/cn/lili/modules/permission/mapper/UserRoleMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 角色权限数据处理层 * @author Chopper - * @date 2020-11-22 09:17 + * @since 2020-11-22 09:17 */ public interface UserRoleMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java index 4423c85e..78182afa 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/AdminUserService.java @@ -17,7 +17,7 @@ import java.util.List; * 用户业务层 * * @author Chopper - * @date 2020/11/17 3:42 下午 + * @since 2020/11/17 3:42 下午 */ @CacheConfig(cacheNames = "{adminuser}") public interface AdminUserService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java index ee9e1b03..bd95b17c 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentRoleService.java @@ -9,7 +9,7 @@ import java.util.List; * 部门角色业务层 * * @author Chopper - * @date 2020/11/22 12:08 + * @since 2020/11/22 12:08 */ public interface DepartmentRoleService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java index b13c7126..38ff2e3a 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/DepartmentService.java @@ -11,7 +11,7 @@ import java.util.List; * 部门业务层 * * @author Chopper - * @date 2020/11/17 3:43 下午 + * @since 2020/11/17 3:43 下午 */ public interface DepartmentService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java b/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java index da5280f1..ede5b5d0 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/MenuService.java @@ -12,7 +12,7 @@ import java.util.List; * 权限业务层 * * @author Chopper - * @date 2020/11/17 3:45 下午 + * @since 2020/11/17 3:45 下午 */ @CacheConfig(cacheNames = "{menu}") public interface MenuService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java b/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java index 681124b7..f2261c03 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/RoleMenuService.java @@ -10,7 +10,7 @@ import java.util.List; * 角色菜单接口 * * @author Chopper - * @date 2020/11/22 11:43 + * @since 2020/11/22 11:43 */ public interface RoleMenuService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java b/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java index ba8f0e69..e1334208 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/RoleService.java @@ -10,7 +10,7 @@ import java.util.List; * 角色业务层 * * @author Chopper - * @date 2020/11/17 3:45 下午 + * @since 2020/11/17 3:45 下午 */ public interface RoleService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java b/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java index cb768ab8..923991b2 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/SystemLogService.java @@ -11,7 +11,7 @@ import java.util.List; * 系统日志业务层 * * @author Chopper - * @date 2020/11/17 3:45 下午 + * @since 2020/11/17 3:45 下午 */ public interface SystemLogService { diff --git a/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java b/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java index e63196c9..0cb37699 100644 --- a/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java +++ b/framework/src/main/java/cn/lili/modules/permission/service/UserRoleService.java @@ -9,7 +9,7 @@ import java.util.List; * 管理员业务层 * * @author Chopper - * @date 2020/11/17 3:46 下午 + * @since 2020/11/17 3:46 下午 */ public interface UserRoleService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java index 452377fc..162f7660 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/AdminUserServiceImpl.java @@ -37,7 +37,7 @@ import java.util.stream.Collectors; * 用户业务层实现 * * @author Chopper - * @date 2020/11/17 3:46 下午 + * @since 2020/11/17 3:46 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java index 255e0eaa..3040aaea 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentRoleServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; * 部门角色业务层实现 * * @author Chopper - * @date 2020/11/22 12:08 + * @since 2020/11/22 12:08 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java index cacfa4b0..c9d6e578 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/DepartmentServiceImpl.java @@ -23,7 +23,7 @@ import java.util.List; * 部门业务层实现 * * @author Chopper - * @date 2020/11/17 3:47 下午 + * @since 2020/11/17 3:47 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java index 5a5d9ba4..f90bab4d 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/MenuServiceImpl.java @@ -28,7 +28,7 @@ import java.util.List; * 权限业务层实现 * * @author Chopper - * @date 2020/11/17 3:49 下午 + * @since 2020/11/17 3:49 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java index 9b991eec..b5d0acaa 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleMenuServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; * 角色菜单业务层实现 * * @author Chopper - * @date 2020/11/22 11:43 + * @since 2020/11/22 11:43 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java index 4362f73c..09b4da2d 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/RoleServiceImpl.java @@ -19,7 +19,7 @@ import java.util.List; * 角色业务层实现 * * @author Chopper - * @date 2020/11/17 3:50 下午 + * @since 2020/11/17 3:50 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java index e5459685..0f785fba 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/SystemLogServiceImpl.java @@ -23,7 +23,7 @@ import java.util.regex.Pattern; * 系统日志 * * @author Chopper - * @date 2020/11/17 3:45 下午 + * @since 2020/11/17 3:45 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java index 923835eb..77912879 100644 --- a/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/permission/serviceimpl/UserRoleServiceImpl.java @@ -17,7 +17,7 @@ import java.util.List; * 用户权限业务层实现 * * @author Chopper - * @date 2020/11/17 3:52 下午 + * @since 2020/11/17 3:52 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java index 1188a79a..20961071 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Coupon.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 优惠券活动实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java index a91fff96..7288d969 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivity.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * 优惠券活动实体类 * * @author Bulbasaur - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java index 0bb06e67..7d80accf 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/CouponActivityItem.java @@ -13,7 +13,7 @@ import javax.persistence.Table; * 优惠券活动实体类 * * @author Bulbasaur - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java index d78c7a7c..46ec9d95 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/FullDiscount.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * 满优惠活动实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java index de6f5eb0..38fee247 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/MemberCoupon.java @@ -21,7 +21,7 @@ import java.util.Date; * 会员优惠券实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java index 03661bf5..94be0b0b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Pintuan.java @@ -14,7 +14,7 @@ import javax.validation.constraints.Min; * 拼团活动实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java index 4fec53f1..b302ca6a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoods.java @@ -15,7 +15,7 @@ import javax.persistence.Table; * 积分商品实体类 * * @author paulG - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 **/ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java index d3693cb5..c23327b4 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PointsGoodsCategory.java @@ -18,7 +18,7 @@ import java.math.BigDecimal; * 积分商品分类 * * @author paulG - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 **/ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java index ad85dcde..44cae339 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/PromotionGoods.java @@ -19,7 +19,7 @@ import java.util.Date; * 促销活动商品实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java index 2f00487e..942d43f1 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/Seckill.java @@ -21,7 +21,7 @@ import java.util.Date; * 秒杀活动实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java index 754e0c4c..445bf45d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dos/SeckillApply.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * 秒杀活动申请实体类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java index 42351d0e..e2aaf072 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/BasePromotion.java @@ -16,7 +16,7 @@ import java.util.Date; * 促销活动基础类 * * @author Chopper - * @date 2020-03-19 10:44 上午 + * @since 2020-03-19 10:44 上午 */ @Data @MappedSuperclass diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java index 2fb53534..91505f31 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/CouponActivityDTO.java @@ -11,7 +11,7 @@ import java.util.List; * 优惠券活动DTO * * @author Bulbasaur - * @date: 2021/5/21 7:16 下午 + * @since: 2021/5/21 7:16 下午 */ @Data public class CouponActivityDTO extends CouponActivity { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java index a299ec8c..703fd978 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/GoodsSkuPromotionPriceDTO.java @@ -14,7 +14,7 @@ import java.util.List; * 促销活动商品价格数据传输对象 * * @author paulG - * @date 2020/8/20 + * @since 2020/8/20 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java index de5ce85b..63e034fb 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionGoodsDTO.java @@ -11,7 +11,7 @@ import lombok.NoArgsConstructor; * 促销商品数据传输对象 * * @author paulG - * @date 2020/10/9 + * @since 2020/10/9 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java index afb64321..e8d07f08 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceDTO.java @@ -9,7 +9,7 @@ import java.util.List; * 促销价格数据传输对象 * * @author paulG - * @date 2020/11/17 + * @since 2020/11/17 **/ @Data public class PromotionPriceDTO { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java index 42019a79..d2033e5b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/PromotionPriceParamDTO.java @@ -7,7 +7,7 @@ import lombok.Data; * 促销价格参数数据传输对象 * * @author paulG - * @date 2020/11/17 + * @since 2020/11/17 **/ @Data public class PromotionPriceParamDTO { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java index fc002ca8..dfc952ab 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/dto/StorePromotionPriceDTO.java @@ -9,7 +9,7 @@ import java.util.List; * 店铺促销计算数据传输对象 * * @author paulG - * @date 2020/11/17 + * @since 2020/11/17 **/ @Data public class StorePromotionPriceDTO { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java index cc6148bc..5e2ea398 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivitySendTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 优惠券活动发送类型枚举 * * @author Bulbasaur - * @date: 2021/5/20 5:47 下午 + * @since: 2021/5/20 5:47 下午 */ public enum CouponActivitySendTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java index c127d9f9..fb380a22 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponActivityTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 优惠券活动类型枚举 * * @author Bulbasaur - * @date: 2021/5/20 5:47 下午 + * @since: 2021/5/20 5:47 下午 */ public enum CouponActivityTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java index 9b71ee7c..7396307c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponGetEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 优惠券获取方式枚举 * * @author Chopper - * @date 2020-03-19 9:36 上午 + * @since 2020-03-19 9:36 上午 */ public enum CouponGetEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java index d67aa29d..2c89a3bd 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponRangeDayEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 优惠券时间范围枚举 * * @author Bulbasaur - * @date: 2021/5/24 8:31 上午 + * @since: 2021/5/24 8:31 上午 */ public enum CouponRangeDayEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java index d099ef29..1e0f8fc2 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponScopeTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 优惠券适用范围类型枚举 * * @author Chopper - * @date 2020-03-19 9:36 上午 + * @since 2020-03-19 9:36 上午 */ public enum CouponScopeTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java index b7005f3a..2ff19206 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/CouponTypeEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 优惠券折扣类型 * * @author Chopper - * @date 2020-03-19 9:36 上午 + * @since 2020-03-19 9:36 上午 */ public enum CouponTypeEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java index 8b98856c..e2513c93 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/MemberCouponStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 会员优惠券状态枚举 * * @author Chopper - * @date 2020-03-19 9:36 上午 + * @since 2020-03-19 9:36 上午 */ public enum MemberCouponStatusEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java index cab25f91..16f1b2fe 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionApplyStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 促销活动申请状态枚举 * * @author Chopper - * @date 2020-03-19 9:36 上午 + * @since 2020-03-19 9:36 上午 */ public enum PromotionApplyStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java index bc9e13ff..69423f7d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 促销状态枚举 * * @author Chopper - * @date 2020-03-19 3:53 下午 + * @since 2020-03-19 3:53 下午 */ public enum PromotionStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java index e7e2a883..ee56a296 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/PromotionTypeEnum.java @@ -5,7 +5,7 @@ package cn.lili.modules.promotion.entity.enums; * 促销分类枚举 * * @author Chopper - * @date 2021/2/1 19:32 + * @since 2021/2/1 19:32 */ public enum PromotionTypeEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java index 0479580e..7621fdb2 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/enums/SeckillApplyStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.promotion.entity.enums; * 秒杀活动状态枚举 * * @author paulG - * @date 2020/8/26 + * @since 2020/8/26 **/ public enum SeckillApplyStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java index da003d29..5fd5b8ea 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityItemVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 优惠券活动的优惠券VO * * @author Bulbasaur - * @date: 2021/6/18 11:00 上午 + * @since: 2021/6/18 11:00 上午 */ @Data public class CouponActivityItemVO extends CouponActivityItem { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java index 0a8a9d26..1d8ed0d9 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponActivityVO.java @@ -12,7 +12,7 @@ import java.util.List; * 优惠券活动VO * * @author Bulbasaur - * @date: 2021/5/21 7:01 下午 + * @since: 2021/5/21 7:01 下午 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java index 7cfe4f03..b177d40c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponSearchParams.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; * 优惠券查询通用类 * * @author paulG - * @date 2020/8/14 + * @since 2020/8/14 **/ @Data public class CouponSearchParams implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java index c27e2a52..2a69f0e2 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/CouponVO.java @@ -12,7 +12,7 @@ import java.util.List; * 优惠券视图对象 * * @author Chopper - * @date 2020/8/14 + * @since 2020/8/14 */ @Data @ApiModel(value = "优惠券") diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java index f4709418..b2e35ab1 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/FullDiscountSearchParams.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; * 满优惠查询通用类 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ @Data public class FullDiscountSearchParams implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java index 94baea1e..7b1ce33f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanMemberVO.java @@ -10,7 +10,7 @@ import lombok.NoArgsConstructor; * 拼图会员视图对象 * * @author paulG - * @date 2021/3/3 + * @since 2021/3/3 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java index 34a64425..79da0d01 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanSearchParams.java @@ -18,7 +18,7 @@ import java.util.regex.Pattern; * 拼团查询通用类 * * @author paulG - * @date 2020/10/9 + * @since 2020/10/9 **/ @Data public class PintuanSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java index fa9a2ba0..20909287 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanShareVO.java @@ -9,7 +9,7 @@ import java.util.List; * 拼图会员分享对象 * * @author paulG - * @date 2021/3/24 + * @since 2021/3/24 **/ @Data public class PintuanShareVO { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java index 3b134d0e..3467aef5 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PintuanVO.java @@ -11,7 +11,7 @@ import java.util.List; * 拼团视图对象 * * @author paulG - * @date 2020/10/28 + * @since 2020/10/28 **/ @Data public class PintuanVO extends Pintuan { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java index 919dd989..568be735 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsCategoryVO.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; * 积分商品分类视图对象 * * @author paulG - * @date 2021/1/15 + * @since 2021/1/15 **/ @Data public class PointsGoodsCategoryVO extends PointsGoodsCategory { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java index af2b717c..ec03d05e 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsSearchParams.java @@ -15,7 +15,7 @@ import java.util.regex.Pattern; * 积分商品查询通用类 * * @author paulG - * @date 2021/1/13 + * @since 2021/1/13 **/ @Data public class PointsGoodsSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java index e649ffa6..68c71df8 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PointsGoodsVO.java @@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode; * 积分商品视图对象 * * @author paulG - * @date 2021/1/13 + * @since 2021/1/13 **/ @EqualsAndHashCode(callSuper = true) @Data diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java index 12951732..8e1a9365 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/PromotionGoodsSearchParams.java @@ -12,7 +12,7 @@ import java.util.Date; * 促销商品查询通用类 * * @author paulG - * @date 2021/2/21 + * @since 2021/2/21 **/ @Data public class PromotionGoodsSearchParams { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java index ca07f14b..f51b3c75 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillApplyVO.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; * 秒杀活动申请视图对象 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ @Data public class SeckillApplyVO extends SeckillApply { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java index 011c9e04..01b1ffba 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillGoodsVO.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 秒杀活动商品视图对象 * * @author paulG - * @date 2020/8/26 + * @since 2020/8/26 **/ @Data public class SeckillGoodsVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java index 063921b7..1725a2bd 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillSearchParams.java @@ -20,7 +20,7 @@ import java.util.regex.Pattern; * 秒杀活动查询通用类 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ @Data public class SeckillSearchParams implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java index b03e9fd6..3fa276d3 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillTimelineVO.java @@ -10,7 +10,7 @@ import java.util.List; * 秒杀活动时刻视图对象 * * @author paulG - * @date 2020/8/27 + * @since 2020/8/27 **/ @Data public class SeckillTimelineVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java index 10c1246d..336c541f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java +++ b/framework/src/main/java/cn/lili/modules/promotion/entity/vos/SeckillVO.java @@ -11,7 +11,7 @@ import java.util.List; * 秒杀活动视图对象 * * @author paulG - * @date 2020/8/20 + * @since 2020/8/20 **/ @Data public class SeckillVO extends Seckill { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java index 168d97a4..ea344a97 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityItemMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 优惠券活动 * * @author Bulbasaur - * @date: 2021/5/20 6:11 下午 + * @since: 2021/5/20 6:11 下午 */ public interface CouponActivityItemMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java index 256e78e4..3deeccac 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponActivityMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 优惠券活动 * @author Bulbasaur - * @date: 2021/5/20 6:11 下午 + * @since: 2021/5/20 6:11 下午 * */ public interface CouponActivityMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java index a3307375..553979eb 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/CouponMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 优惠券数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface CouponMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java index d74297c3..4a42e5b8 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/FullDiscountMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 满优惠数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface FullDiscountMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java index 27d2cc4b..6336ae09 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/MemberCouponMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 会员优惠券数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface MemberCouponMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java index b6345bc4..1e078347 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PintuanMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 拼团数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface PintuanMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java index c706e299..f73122dc 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsCategoryMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 积分商品分类数据处理层 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ public interface PointsGoodsCategoryMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java index 1566a47c..d0139293 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PointsGoodsMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 积分商品数据处理层 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ public interface PointsGoodsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java index c6ac77eb..fc675f91 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/PromotionGoodsMapper.java @@ -11,7 +11,7 @@ import java.util.Date; * 促销商品数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface PromotionGoodsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java index f3d0fa47..9fffad06 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillApplyMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 秒杀活动申请数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface SeckillApplyMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java index 5eeb4f2c..95cdeb0a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java +++ b/framework/src/main/java/cn/lili/modules/promotion/mapper/SeckillMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Update; * 秒杀活动数据处理层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface SeckillMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java index f85206dc..f790771b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityItemService.java @@ -10,7 +10,7 @@ import java.util.List; * 优惠券活动-优惠券业务层 * * @author Bulbasaur - * @date: 2021/5/20 6:10 下午 + * @since: 2021/5/20 6:10 下午 */ public interface CouponActivityItemService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java index b51f3ef0..bdb23f8c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponActivityService.java @@ -13,7 +13,7 @@ import java.util.List; * 优惠券活动业务层 * * @author Bulbasaur - * @date: 2021/5/20 6:10 下午 + * @since: 2021/5/20 6:10 下午 */ public interface CouponActivityService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java index 02b3d4b1..3b4a526d 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/CouponService.java @@ -14,7 +14,7 @@ import java.util.List; * 优惠券业务层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface CouponService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java b/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java index 03e3b3db..6f917d3c 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/FullDiscountService.java @@ -13,7 +13,7 @@ import java.util.List; * 满优惠业务层 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ public interface FullDiscountService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java b/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java index d7b471eb..dd330b5f 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/MemberAddressService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 收货地址业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface MemberAddressService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java index d2de9d52..524aa935 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/MemberCouponService.java @@ -13,7 +13,7 @@ import java.util.List; * 会员优惠券业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface MemberCouponService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java index e3162511..cc2cd853 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PintuanService.java @@ -16,7 +16,7 @@ import java.util.List; * 拼图活动业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface PintuanService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java index 7f0d7a89..2de42b43 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsCategoryService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 积分商品分类业务层 * * @author paulG - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 **/ public interface PointsGoodsCategoryService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java index 122d6142..5c8e26a7 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PointsGoodsService.java @@ -13,7 +13,7 @@ import java.util.List; * 积分商品业务层 * * @author paulG - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 **/ public interface PointsGoodsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java index de04aea4..284a332e 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionGoodsService.java @@ -17,7 +17,7 @@ import java.util.List; * 促销商品业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface PromotionGoodsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java index 0b934850..2e49eb59 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionPriceService.java @@ -10,7 +10,7 @@ import java.util.List; * 促销计算 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ public interface PromotionPriceService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java index 6698bbd2..f8886d53 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/PromotionService.java @@ -9,7 +9,7 @@ import java.util.Map; * 促销业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface PromotionService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java index 07e1c0cf..d83b0cbb 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillApplyService.java @@ -15,7 +15,7 @@ import java.util.List; * 秒杀申请业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface SeckillApplyService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java index 27fdc908..5b01da74 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java +++ b/framework/src/main/java/cn/lili/modules/promotion/service/SeckillService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 秒杀业务层 * * @author Chopper - * @date 2020/11/18 9:45 上午 + * @since 2020/11/18 9:45 上午 */ public interface SeckillService extends IService { @@ -44,8 +44,6 @@ public interface SeckillService extends IService { /** * 初始化秒杀活动，默认开启三十天的秒杀活动 - * - * @return 是否保存成功 */ void init(); /** @@ -103,7 +101,6 @@ public interface SeckillService extends IService { /** * 更新秒杀活动的商品数量 * @param seckillId 秒杀活动ID - * @return 更新结果 */ void updateSeckillGoodsNum(String seckillId); } \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java index caa7a589..68775595 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityItemServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; * 优惠券活动关联优惠券业务层实现 * * @author Bulbasaur - * @date: 2021/5/21 6:42 下午 + * @since: 2021/5/21 6:42 下午 */ @Service public class CouponActivityItemServiceImpl extends ServiceImpl implements CouponActivityItemService { diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java index 35f0556a..55e3ac5b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponActivityServiceImpl.java @@ -42,7 +42,7 @@ import java.util.*; * 优惠券活动业务层实现 * * @author Bulbasaur - * @date: 2021/5/20 6:10 下午 + * @since: 2021/5/20 6:10 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java index 666b7539..9bda0843 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java @@ -44,7 +44,7 @@ import java.util.stream.Collectors; * 优惠券活动业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java index b2b0a962..7385dbca 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java @@ -42,7 +42,7 @@ import java.util.List; * 满优惠业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java index 17c2a70a..8ad33bea 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberAddressServiceImpl.java @@ -22,7 +22,7 @@ import java.util.List; * 收货地址业务层实现 * * @author Chopper - * @date 2020/11/18 9:44 上午 + * @since 2020/11/18 9:44 上午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java index 18e5fbff..9c1a7a51 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/MemberCouponServiceImpl.java @@ -33,7 +33,7 @@ import java.util.List; * 会员优惠券业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java index a094fd7d..ed7d8d6b 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PintuanServiceImpl.java @@ -55,7 +55,7 @@ import java.util.stream.Collectors; * 拼团业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java index ee27e9ff..41b2ba20 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsCategoryServiceImpl.java @@ -19,7 +19,7 @@ import org.springframework.transaction.annotation.Transactional; * 积分商品分类业务层实现 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java index b3a10458..5694ef08 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PointsGoodsServiceImpl.java @@ -42,7 +42,7 @@ import java.util.List; * 积分商品业务层实现 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ @Service @Transactional(rollbackFor = Exception.class) 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 470dffb8..e79b38bf 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 @@ -53,7 +53,7 @@ import java.util.List; * 促销商品业务层实现 * * @author Chopper - * @date 2021/3/18 9:22 上午 + * @since 2021/3/18 9:22 上午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java index 9a894168..f9becac3 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionPriceServiceImpl.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; * 促销价格计算业务层实现 * * @author paulG - * @date 2020/8/21 + * @since 2020/8/21 **/ @Service @Slf4j diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java index d993797b..2f57e90a 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/PromotionServiceImpl.java @@ -35,7 +35,7 @@ import java.util.*; * 促销业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java index 5f3a916f..a5dfef28 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillApplyServiceImpl.java @@ -43,7 +43,7 @@ import java.util.stream.Collectors; * 秒杀申请业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java index 6787d5d3..9e8496f7 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/promotion/serviceimpl/SeckillServiceImpl.java @@ -54,7 +54,7 @@ import java.util.stream.Collectors; * 秒杀活动业务层实现 * * @author Chopper - * @date 2020/8/21 + * @since 2020/8/21 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java index b2a7a150..9b786759 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java +++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionCacheKeys.java @@ -5,7 +5,7 @@ import cn.lili.common.cache.CachePrefix; /** * 满额活动缓存Key * @author paulG - * @date 2020/10/12 + * @since 2020/10/12 **/ public class PromotionCacheKeys { diff --git a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java index 369a6e11..560b23ae 100644 --- a/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java +++ b/framework/src/main/java/cn/lili/modules/promotion/tools/PromotionTools.java @@ -22,7 +22,7 @@ import java.util.List; * 优惠活动通用验证类 * * @author paulG - * @date 2020/8/18 + * @since 2020/8/18 **/ public class PromotionTools { diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java index 0eac781d..2771d432 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/dos/PurchaseOrder.java @@ -15,7 +15,7 @@ import java.util.Date; * 供求单 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @Data @Entity 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 c0b5449e..4e47ae62 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 @@ -21,7 +21,7 @@ import java.util.Date; * 采购单子内容 * * @author Bulbasaur - * @date 2020/11/26 19:32 + * @since 2020/11/26 19:32 */ @Data @Entity @@ -39,7 +39,7 @@ public class PurchaseOrderItem { @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; 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 5bfb2331..71c18395 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 @@ -23,7 +23,7 @@ import java.util.Date; * 报价单 * * @author Chopper - * @date 2020/11/26 20:43 + * @since 2020/11/26 20:43 */ @Data @Entity @@ -41,7 +41,7 @@ public class PurchaseQuoted { @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; 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 16e85fcc..cccfe712 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 @@ -22,7 +22,7 @@ import java.util.Date; * 报价单字内容 * * @author Bulbasaur - * @date 2020/11/26 20:43 + * @since 2020/11/26 20:43 */ @Data @Entity @@ -40,7 +40,7 @@ public class PurchaseQuotedItem { @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; diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java b/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java index 0be43cd2..50446405 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/params/PurchaseOrderSearchParams.java @@ -8,7 +8,7 @@ import lombok.Data; * 供求单查询参数 * * @author Bulbasaur - * @date 2020/11/27 11:29 + * @since 2020/11/27 11:29 */ @Data public class PurchaseOrderSearchParams extends PageVO { diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java index 53e9f9f7..373b5bb5 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseOrderVO.java @@ -10,7 +10,7 @@ import java.util.List; * 采购单VO * * @author Bulbasaur - * @date 2020/11/26 19:54 + * @since 2020/11/26 19:54 */ @Data public class PurchaseOrderVO extends PurchaseOrder { diff --git a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java index e0524fbd..57d4964f 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java +++ b/framework/src/main/java/cn/lili/modules/purchase/entity/vos/PurchaseQuotedVO.java @@ -10,7 +10,7 @@ import java.util.List; * 报价单VO * * @author Bulbasaur - * @date 2020/11/26 19:54 + * @since 2020/11/26 19:54 */ @Data public class PurchaseQuotedVO extends PurchaseQuoted { diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java index 41547acc..cdd20032 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java +++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderItemMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 采购单子内容数据处理层 * * @author Bulbasaur - * @date 2020/11/26 16:11 + * @since 2020/11/26 16:11 */ public interface PurchaseOrderItemMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java index f7f6f1c1..7d508945 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java +++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseOrderMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 采购单数据处理层 * * @author Bulbasaur - * @date 2020/11/26 16:11 + * @since 2020/11/26 16:11 */ public interface PurchaseOrderMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java index 78ae523e..df857064 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java +++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedItemMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 采购单子内容数据处理层 * * @author Bulbasaur - * @date 2020/11/26 16:11 + * @since 2020/11/26 16:11 */ public interface PurchaseQuotedItemMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java index a6587903..0ca28701 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java +++ b/framework/src/main/java/cn/lili/modules/purchase/mapper/PurchaseQuotedMapper.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 采购报价数据处理层 * * @author Bulbasaur - * @date 2020/11/26 16:11 + * @since 2020/11/26 16:11 */ public interface PurchaseQuotedMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java index 2d289a1b..048845af 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java +++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderItemService.java @@ -10,7 +10,7 @@ import java.util.List; * 采购单子内容业务层 * * @author Bulbasaur - * @date 2020/11/26 16:12 + * @since 2020/11/26 16:12 */ public interface PurchaseOrderItemService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java index ba92322b..fc9780bb 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java +++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseOrderService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 采购单业务层 * * @author Bulbasaur - * @date 2020/11/26 16:12 + * @since 2020/11/26 16:12 */ public interface PurchaseOrderService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java index 7ee68777..7536a63b 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java +++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedItemService.java @@ -10,7 +10,7 @@ import java.util.List; * 采购单子内容业务层 * * @author Bulbasaur - * @date 2020/11/26 16:12 + * @since 2020/11/26 16:12 */ public interface PurchaseQuotedItemService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java index b4a0646a..523ea6a8 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java +++ b/framework/src/main/java/cn/lili/modules/purchase/service/PurchaseQuotedService.java @@ -11,7 +11,7 @@ import java.util.List; * 采购单报价业务层 * * @author Bulbasaur - * @date 2020/11/26 16:12 + * @since 2020/11/26 16:12 */ public interface PurchaseQuotedService extends IService { /** diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java index 7a2aecc7..50f75d78 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderItemServiceImpl.java @@ -16,7 +16,7 @@ import java.util.List; * 采购单子内容业务层实现 * * @author Bulbasaur - * @date 2020/11/26 16:13 + * @since 2020/11/26 16:13 */ @Service public class PurchaseOrderItemServiceImpl extends ServiceImpl implements PurchaseOrderItemService { diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java index c063855a..0728d28d 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseOrderServiceImpl.java @@ -24,7 +24,7 @@ import java.util.Map; * 采购单业务层实现 * * @author Bulbasaur - * @date 2020/11/26 16:13 + * @since 2020/11/26 16:13 */ @Service public class PurchaseOrderServiceImpl extends ServiceImpl implements PurchaseOrderService { diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java index d653dd94..868e53f1 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedItemServiceImpl.java @@ -14,7 +14,7 @@ import java.util.List; * 采购单子内容业务层实现 * * @author Bulbasaur - * @date 2020/11/26 16:13 + * @since 2020/11/26 16:13 */ @Service public class PurchaseQuotedItemServiceImpl extends ServiceImpl implements PurchaseQuotedItemService { diff --git a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java index 4a3e6e12..52b44d91 100644 --- a/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/purchase/serviceimpl/PurchaseQuotedServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; * 采购单报价业务层实现 * * @author Bulbasaur - * @date 2020/11/26 16:13 + * @since 2020/11/26 16:13 */ @Service public class PurchaseQuotedServiceImpl extends ServiceImpl implements PurchaseQuotedService { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java index c7908e43..fb744a1e 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/CustomWords.java @@ -15,7 +15,7 @@ import javax.validation.constraints.NotEmpty; * 自定义分词 * * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java index 5c153e9c..09254bae 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsAttribute.java @@ -10,7 +10,7 @@ import java.io.Serializable; /** * 商品属性索引 * @author paulG - * @date 2020/10/14 + * @since 2020/10/14 **/ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java index 89148a92..1be5bd9c 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsIndex.java @@ -24,7 +24,6 @@ import java.util.Map; * 商品索引 * * @author paulG - * @date 2020/10/13 **/ @Data @Document(indexName = "#{elasticsearchProperties.indexPrefix}_" + EsSuffix.GOODS_INDEX_NAME) diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java index d45a8be1..a6b56e60 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dos/EsGoodsRelatedInfo.java @@ -10,7 +10,7 @@ import java.util.List; * 搜索相关商品品牌名称，分类名称及属性 * * @author paulG - * @date 2020/10/20 + * @since 2020/10/20 **/ @Data public class EsGoodsRelatedInfo { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java index e2c4da78..a1df7a71 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoods.java @@ -6,7 +6,7 @@ import lombok.Data; * 商品搜索结果实体 * * @author paulG - * @date 2020/10/16 + * @since 2020/10/16 **/ @Data public class EsGoods { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java index 7451615f..c9f046bd 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/EsGoodsSearchDTO.java @@ -9,7 +9,7 @@ import java.util.Map; /** * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ @Data public class EsGoodsSearchDTO { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java index 141d1e54..d23f1944 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/ParamOptions.java @@ -8,7 +8,7 @@ import java.util.List; * 参数属性选择器 * * @author paulG - * @date 2020/10/20 + * @since 2020/10/20 **/ @Data public class ParamOptions { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java b/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java index 1264c9a7..e701b30f 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/dto/SelectorOptions.java @@ -6,7 +6,7 @@ import java.util.List; /** * @author paulG - * @date 2020/10/20 + * @since 2020/10/20 **/ @Data public class SelectorOptions { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java b/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java index 932e032a..1ccaf7e1 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/enums/HotWordsRedisKeyEnum.java @@ -2,7 +2,7 @@ package cn.lili.modules.search.entity.enums; /** * @author paulG - * @date 2021/1/20 + * @since 2021/1/20 **/ public enum HotWordsRedisKeyEnum { diff --git a/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java b/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java index 51899c0a..d6596b37 100644 --- a/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java +++ b/framework/src/main/java/cn/lili/modules/search/entity/vo/CustomWordsVO.java @@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode; /** * @author paulG - * @date 2020/12/7 + * @since 2020/12/7 **/ @EqualsAndHashCode(callSuper = true) @Data diff --git a/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java b/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java index 10c04a76..359cd238 100644 --- a/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java +++ b/framework/src/main/java/cn/lili/modules/search/mapper/CustomWordsMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 自定义分词数据处理层 * * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ public interface CustomWordsMapper extends BaseMapper { } diff --git a/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java b/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java index 3c5e9cf7..a2088b22 100644 --- a/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java +++ b/framework/src/main/java/cn/lili/modules/search/repository/EsGoodsIndexRepository.java @@ -5,7 +5,7 @@ import org.springframework.data.elasticsearch.repository.ElasticsearchRepository /** * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ public interface EsGoodsIndexRepository extends ElasticsearchRepository { diff --git a/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java b/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java index 6ca9f654..5193cdf1 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/CustomWordsService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 自定义分词业务层 * * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ public interface CustomWordsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java index 1d696cb2..c2c3b291 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsIndexService.java @@ -14,7 +14,7 @@ import java.util.Map; * 商品索引业务层 * * @author paulG - * @date 2020/10/14 + * @since 2020/10/14 **/ public interface EsGoodsIndexService { diff --git a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java index 2b33fc99..795b7e37 100644 --- a/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java +++ b/framework/src/main/java/cn/lili/modules/search/service/EsGoodsSearchService.java @@ -12,7 +12,7 @@ import java.util.List; * ES商品搜索业务层 * * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ public interface EsGoodsSearchService { diff --git a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java index 4797774e..6ac65b9c 100644 --- a/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/search/serviceimpl/CustomWordsServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; /** * 自定义分词业务层实现 * @author paulG - * @date 2020/10/15 + * @since 2020/10/15 **/ @Service public class CustomWordsServiceImpl extends ServiceImpl implements CustomWordsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java b/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java index 862528a9..73250a2a 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java +++ b/framework/src/main/java/cn/lili/modules/statistics/aop/PageViewPoint.java @@ -8,7 +8,7 @@ import java.lang.annotation.*; * 埋点统计 * * @author Bulbasaur - * @date: 2021/7/9 1:47 上午 + * @since: 2021/7/9 1:47 上午 */ @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java index c72d0a37..4931ffe2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java +++ b/framework/src/main/java/cn/lili/modules/statistics/aop/aspect/PageViewInterceptor.java @@ -26,7 +26,7 @@ import java.util.Map; * 页面浏览统计拦截 * * @author Chopper - * @date 2021-01-14 18:01 + * @since 2021-01-14 18:01 */ @Aspect @Configuration diff --git a/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java b/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java index fb89dd0f..e823bf72 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java +++ b/framework/src/main/java/cn/lili/modules/statistics/aop/enums/PageViewEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.statistics.aop.enums; * 统计页面类型 * * @author Chopper - * @date 2021-01-14 17:55 + * @since 2021-01-14 17:55 */ public enum PageViewEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java index 6601a78d..e06c36f2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/GoodsStatisticsDataMapper.java @@ -16,7 +16,7 @@ import java.util.List; * 商品统计数据处理层 * * @author Bulbasaur - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface GoodsStatisticsDataMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java index 435b1096..f0eb3ce1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/MemberStatisticsDataMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select; * 会员统计数据处理层 * * @author Bulbasaur - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface MemberStatisticsDataMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java index ed9561b9..7843c21f 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/OrderStatisticsDataMapper.java @@ -14,7 +14,7 @@ import java.util.List; * 订单统计数据处理层 * * @author Bulbasaur - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface OrderStatisticsDataMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java index 89185d8d..2efa59b9 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/PlatformViewDataMapper.java @@ -11,7 +11,7 @@ import org.apache.ibatis.annotations.Select; * 平台流量数据 * * @author Bulbasaur - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface PlatformViewDataMapper extends BaseMapper { /** diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java index 6495deda..11e3d76e 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/RefundOrderStatisticsDataMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 退款统计数据处理层 * * @author Bulbasaur - * @date 2020/12/10 11:22 + * @since 2020/12/10 11:22 */ public interface RefundOrderStatisticsDataMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java index 718fe86d..6521fee0 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java +++ b/framework/src/main/java/cn/lili/modules/statistics/mapper/StoreStatisticsDataMapper.java @@ -16,7 +16,7 @@ import java.util.List; * 店铺统计数据处理层 * * @author Bulbasaur - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ public interface StoreStatisticsDataMapper extends BaseMapper { 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 0d02c6a0..d9fd6d5e 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 @@ -17,7 +17,7 @@ import java.util.Date; /** * 会员统计 * @author Chopper - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ @Data @Entity 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 c82beed6..c6ceed09 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 @@ -17,7 +17,7 @@ import java.util.Date; * 平台pv统计 * * @author Chopper - * @date 2020-06-19 17:50 + * @since 2020-06-19 17:50 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java index 03c0190f..c898b278 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/dto/GoodsStatisticsQueryParam.java @@ -7,7 +7,7 @@ import lombok.Data; * 商品统计查询参数 * * @author Chopper - * @date 2020/11/17 7:34 下午 + * @since 2020/11/17 7:34 下午 */ @Data public class GoodsStatisticsQueryParam extends StatisticsQueryParam { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java b/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java index f0f57018..fec5ce06 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/dto/StatisticsQueryParam.java @@ -7,7 +7,7 @@ import lombok.Data; * 统计查询参数 * * @author Bulbasaur - * @date 2020/12/9 14:20 + * @since 2020/12/9 14:20 */ @Data public class StatisticsQueryParam { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java index b05c7745..5377e040 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/CategoryStatisticsDataVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 分类统计VO * * @author Bulbasaur - * @date 2020/12/10 15:42 + * @since 2020/12/10 15:42 */ @Data public class CategoryStatisticsDataVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java index 169d82e5..88082f48 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/GoodsStatisticsDataVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 商品统计VO * * @author Bulbasaur - * @date 2020/12/9 14:25 + * @since 2020/12/9 14:25 */ @Data public class GoodsStatisticsDataVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java index e9956bf7..e2a1e8c2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexNoticeVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 消息提示 * * @author Bulbasaur - * @date 2020/12/9 14:25 + * @since 2020/12/9 14:25 */ @Data public class IndexNoticeVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java index 4e279d93..a7a6b068 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/IndexStatisticsVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 首页统计内容 * * @author Bulbasaur - * @date 2020/12/22 14:23 + * @since 2020/12/22 14:23 */ @Data public class IndexStatisticsVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java index e91168e6..3ab00e7b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OnlineMemberVO.java @@ -10,7 +10,7 @@ import java.util.Date; * 在线会员 * * @author Chopper - * @date 2021-02-21 09:59 + * @since 2021-02-21 09:59 */ @Data @AllArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java index 70dda2b4..abe916d8 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderOverviewVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 订单统计概述 * * @author Chopper - * @date 2021-03-03 10:27 + * @since 2021-03-03 10:27 */ @Data public class OrderOverviewVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java index 01b2e4ca..27a627c1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/OrderStatisticsDataVO.java @@ -11,7 +11,7 @@ import java.util.Date; * 订单统计数据VO * * @author Bulbasaur - * @date 2020/12/9 17:13 + * @since 2020/12/9 17:13 */ @Data public class OrderStatisticsDataVO { @@ -26,7 +26,7 @@ public class OrderStatisticsDataVO { private Double price; @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; diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java index 64ba5320..bd1c92c5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/PlatformViewVO.java @@ -10,7 +10,7 @@ import java.util.Date; * 流量数据展示VO * * @author Chopper - * @date 2020-06-19 17:50 + * @since 2020-06-19 17:50 */ @Data public class PlatformViewVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java index 30512db4..5d620e59 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/RefundOrderStatisticsDataVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 退款统计VO * * @author Bulbasaur - * @date 2020/12/10 11:24 + * @since 2020/12/10 11:24 */ @Data public class RefundOrderStatisticsDataVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java index 1b9b025d..4d282829 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreIndexStatisticsVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 店铺首页数据 * * @author Chopper - * @date 2021/3/17 4:04 下午 + * @since 2021/3/17 4:04 下午 */ @Data public class StoreIndexStatisticsVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java index 14f6c306..8b90f6e0 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java +++ b/framework/src/main/java/cn/lili/modules/statistics/model/vo/StoreStatisticsDataVO.java @@ -7,7 +7,7 @@ import lombok.Data; * 商品统计VO * * @author Bulbasaur - * @date 2020/12/9 14:25 + * @since 2020/12/9 14:25 */ @Data public class StoreStatisticsDataVO { diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java index e45c6e33..48ba024c 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/GoodsStatisticsDataService.java @@ -12,7 +12,7 @@ import java.util.List; * 商品统计业务层 * * @author Bulbasaur - * @date 2020/12/9 11:06 + * @since 2020/12/9 11:06 */ public interface GoodsStatisticsDataService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java index a70fcf83..1a50bcd5 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/IndexStatisticsService.java @@ -10,7 +10,7 @@ import java.util.List; * 首页统计数据业务层 * * @author Bulbasaur - * @date 2020/12/15 17:57 + * @since 2020/12/15 17:57 */ public interface IndexStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java index 9d3e5011..8ec5fcb2 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/MemberStatisticsDataService.java @@ -11,7 +11,7 @@ import java.util.List; * 会员统计业务层 * * @author Bulbasaur - * @date 2020/12/9 11:06 + * @since 2020/12/9 11:06 */ public interface MemberStatisticsDataService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java index 4db9c32f..de9488b1 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/OrderStatisticsDataService.java @@ -13,7 +13,7 @@ import java.util.Map; * 订单统计业务层 * * @author Bulbasaur - * @date 2020/12/9 11:06 + * @since 2020/12/9 11:06 */ public interface OrderStatisticsDataService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java index a1403c3a..9f306eab 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/PlatformViewDataService.java @@ -13,7 +13,7 @@ import java.util.List; * 平台PV统计 * * @author Bulbasaur - * @date 2020/12/9 11:06 + * @since 2020/12/9 11:06 */ public interface PlatformViewDataService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java index c7dcf070..c41c1c1b 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java +++ b/framework/src/main/java/cn/lili/modules/statistics/service/RefundOrderStatisticsService.java @@ -11,7 +11,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 退款订单统计业务层 * * @author Bulbasaur - * @date 2020/12/9 11:06 + * @since 2020/12/9 11:06 */ public interface RefundOrderStatisticsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java index 9dedc7e3..68177182 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/GoodsStatisticsDataServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; * 商品统计业务层实现 * * @author Bulbasaur - * @date 2020/12/9 11:30 + * @since 2020/12/9 11:30 */ @Service public class GoodsStatisticsDataServiceImpl extends ServiceImpl implements GoodsStatisticsDataService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java index 753eda6c..a5ff21ec 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/IndexStatisticsServiceImpl.java @@ -40,7 +40,7 @@ import java.util.Map; * 首页统计数据业务层实现 * * @author Bulbasaur - * @date 2020/12/15 17:57 + * @since 2020/12/15 17:57 */ @Service public class IndexStatisticsServiceImpl implements IndexStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java index 20774471..145eb320 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/MemberStatisticsDataServiceImpl.java @@ -20,7 +20,7 @@ import java.util.List; * 会员统计业务层实现 * * @author Bulbasaur - * @date 2020/12/9 18:33 + * @since 2020/12/9 18:33 */ @Service public class MemberStatisticsDataServiceImpl extends ServiceImpl implements MemberStatisticsDataService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java index 6876984e..e8a90ecb 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/OrderStatisticsDataServiceImpl.java @@ -31,7 +31,7 @@ import java.util.*; * 订单统计业务层实现 * * @author Bulbasaur - * @date 2020/12/9 17:16 + * @since 2020/12/9 17:16 */ @Service public class OrderStatisticsDataServiceImpl extends ServiceImpl implements OrderStatisticsDataService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java index 7a2258c5..eed2d179 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/PlatformViewDataServiceImpl.java @@ -38,7 +38,6 @@ import java.util.List; * * @author Chopper * @version v1.0 - * @Description: * @since v7.0 * 2021/1/18 12:07 */ diff --git a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java index 346ba2e9..8b605d73 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/statistics/serviceimpl/RefundOrderStatisticsServiceImpl.java @@ -21,7 +21,7 @@ import org.springframework.stereotype.Service; * 退款订单统计业务层实现 * * @author Bulbasaur - * @date 2020/12/10 11:30 + * @since 2020/12/10 11:30 */ @Service public class RefundOrderStatisticsServiceImpl extends ServiceImpl implements RefundOrderStatisticsService { diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java index 76ed86e0..cd1bd333 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java +++ b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsDateUtil.java @@ -13,7 +13,7 @@ import java.util.Date; * 统计缓存后缀工具 * * @author Chopper - * @date 2021-01-15 15:30 + * @since 2021-01-15 15:30 */ public class StatisticsDateUtil { diff --git a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java index fcd9a232..f6826cd9 100644 --- a/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java +++ b/framework/src/main/java/cn/lili/modules/statistics/util/StatisticsSuffix.java @@ -6,7 +6,7 @@ import java.util.Calendar; * 统计缓存后缀工具 * * @author Chopper - * @date 2021-01-15 15:30 + * @since 2021-01-15 15:30 */ public class StatisticsSuffix { 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 8f0aaaf5..48a49ae1 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 @@ -21,7 +21,7 @@ import java.util.Date; * 结算单 * * @author Chopper - * @date 2020/11/17 4:27 下午 + * @since 2020/11/17 4:27 下午 */ @Data @Entity @@ -40,7 +40,7 @@ public class Bill { @CreatedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") - @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; @@ -71,7 +71,7 @@ public class Bill { @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 payTime; @ApiModelProperty(value = "银行开户名") diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java index ffdbc8b0..783feece 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplate.java @@ -15,7 +15,7 @@ import javax.validation.constraints.NotEmpty; * 运费模板 * * @author Chopper - * @date 2020/11/17 4:27 下午 + * @since 2020/11/17 4:27 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java index 8cbe4ef9..a167ea0c 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/FreightTemplateChild.java @@ -14,7 +14,7 @@ import javax.persistence.Table; * 运费模板子配置 * * @author Chopper - * @date 2020/11/17 4:27 下午 + * @since 2020/11/17 4:27 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java index 27c2c9be..2f8c5473 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/Store.java @@ -24,7 +24,7 @@ import java.util.Date; * 店铺 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @Entity @@ -46,7 +46,7 @@ public class Store extends BaseEntity { private String storeName; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "店铺关闭时间") private Date storeEndTime; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java index b2b91782..136856b2 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreAddress.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; * 店铺自提点 * * @author Bulbasaur - * @date 2020/12/7 15:09 + * @since 2020/12/7 15:09 */ @Data @Entity 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 c9af0c94..bc4f47c6 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 @@ -28,7 +28,7 @@ import java.util.Date; * 店铺详细 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @Entity @@ -153,7 +153,7 @@ public class StoreDetail { private String settlementCycle; @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 = "结算日", hidden = true) private Date settlementDay; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java index 25da3db9..a314ecbb 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreGoodsLabel.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; * 店铺商品分类 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java index 814ce4d5..b84af1e4 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dos/StoreLogistics.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull; * 店铺-物流公司设置 * * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java index dd95640c..8b9ac536 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/AdminStoreApplyDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.*; * 后台添加店铺信息DTO * * @author Bulbasaur - * @date 2020/12/12 11:35 + * @since 2020/12/12 11:35 */ @Data public class AdminStoreApplyDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java index 36e0c602..59690e4d 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillDTO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 结算单传输对象 * * @author Chopper - * @date 2020/11/17 4:26 下午 + * @since 2020/11/17 4:26 下午 */ @Data public class BillDTO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java index 3765f843..0a8533c9 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/BillSearchParams.java @@ -15,18 +15,18 @@ import org.springframework.format.annotation.DateTimeFormat; * 结算单搜索参数 * * @author Chopper - * @date 2021/3/17 6:08 下午 + * @since 2021/3/17 6:08 下午 */ @Data public class BillSearchParams extends PageVO { @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 String startDate; @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 String endDate; diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java index ae6bc9b1..81aeb8eb 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/FreightTemplateChildDTO.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; * 模版详细配置 * * @author pikachu - * @date 2018-08-22 15:10:51 + * @since 2018-08-22 15:10:51 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java index a6c48a8f..36e3c869 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreAfterSaleAddressDTO.java @@ -7,7 +7,7 @@ import lombok.Data; * 店铺售后收件地址 * * @author pikachu - * @date 2020-08-22 15:10:51 + * @since 2020-08-22 15:10:51 */ @Data public class StoreAfterSaleAddressDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java index ca1c5a32..2d03ec1d 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreBankDTO.java @@ -10,7 +10,7 @@ import javax.validation.constraints.Size; * 店铺-银行信息 * * @author Bulbasaur - * @date 2020/12/7 15:54 + * @since 2020/12/7 15:54 */ @Data public class StoreBankDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java index 56d7c0e5..022538bb 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreCompanyDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.*; * 店铺-公司信息 * * @author Bulbasaur - * @date 2020/12/7 15:50 + * @since 2020/12/7 15:50 */ @Data public class StoreCompanyDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java index 824bf81e..d91129fe 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreEditDTO.java @@ -19,7 +19,7 @@ import javax.validation.constraints.Size; * 店铺修改DTO * * @author pikachu - * @date 2020-08-22 15:10:51 + * @since 2020-08-22 15:10:51 */ @Data public class StoreEditDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java index db5e79cd..ab6caa35 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreOtherInfoDTO.java @@ -11,7 +11,7 @@ import javax.validation.constraints.Size; * 店铺入驻其他信息 * * @author Bulbasaur - * @date 2020/12/7 16:16 + * @since 2020/12/7 16:16 */ @Data public class StoreOtherInfoDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java index c24b13de..1bc28a93 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettingDTO.java @@ -9,7 +9,7 @@ import javax.validation.constraints.NotEmpty; * 店铺设置 * * @author Bulbasaur - * @date 2020/12/16 15:15 + * @since 2020/12/16 15:15 */ @Data public class StoreSettingDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java index eda6eba8..0302f69c 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/dto/StoreSettlementDay.java @@ -9,7 +9,7 @@ import java.util.Date; * 店铺结算日 * * @author Chopper - * @date 2021/2/20 3:24 下午 + * @since 2021/2/20 3:24 下午 */ @Data public class StoreSettlementDay { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java b/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java index 38566428..348b5c1b 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/enums/BillStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.store.entity.enums; * 结算单状态 * * @author Chopper - * @date 2020/11/17 4:27 下午 + * @since 2020/11/17 4:27 下午 */ public enum BillStatusEnum { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java b/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java index e1a1a404..6c14bd4c 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/enums/FreightTemplateEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.store.entity.enums; * 模版枚举 * * @author Chopper - * @date 2020/12/23 15:59 + * @since 2020/12/23 15:59 */ public enum FreightTemplateEnum { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java b/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java index c50aef58..7beb62f9 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/enums/StoreStatusEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.store.entity.enums; * 店铺状态枚举 * * @author pikachu - * @date 2020年3月07日 上午11:04:25 + * @since 2020年3月07日 上午11:04:25 */ public enum StoreStatusEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java index ab7d25f6..496d82ee 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/BillListVO.java @@ -11,7 +11,7 @@ import java.util.Date; * 结算单VO * * @author pikachu - * @date 2020年3月07日 上午11:04:25 + * @since 2020年3月07日 上午11:04:25 */ @Data public class BillListVO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java index fc9ab7a7..6b618ad9 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/FreightTemplateVO.java @@ -12,7 +12,7 @@ import java.util.List; * 店铺运费模板 * * @author Bulbasaur - * @date 2020/11/24 14:29 + * @since 2020/11/24 14:29 */ @Data public class FreightTemplateVO extends FreightTemplate { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java index f337722a..26b76abb 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreBasicInfoVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 店铺基本信息DTO * * @author Bulbasaur - * @date 2020/12/7 14:43 + * @since 2020/12/7 14:43 */ @Data public class StoreBasicInfoVO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java index 8fd392bd..d64fd3d7 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreDetailVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 店铺详细VO * * @author pikachu - * @date 2020-03-09 21:53:20 + * @since 2020-03-09 21:53:20 */ @Data public class StoreDetailVO extends StoreEditDTO { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java index 5ab532fe..fd627c4b 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreGoodsLabelVO.java @@ -11,7 +11,7 @@ import java.util.List; * 店铺商品分类VO * * @author Bulbasaur - * @date 2020/12/11 16:18 + * @since 2020/12/11 16:18 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java index 6d6aad3a..922d33d1 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreManagementCategoryVO.java @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; /** * 店铺经营范围 * @author Bulbasaur - * @date 2020/12/11 16:18 + * @since 2020/12/11 16:18 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java index 1933841e..617332b9 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreSearchParams.java @@ -13,7 +13,7 @@ import java.io.Serializable; * 店铺搜索参数VO * * @author pikachu - * @date 2020-03-07 17:02:05 + * @since 2020-03-07 17:02:05 */ @Data public class StoreSearchParams implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java index cf45db28..90980742 100644 --- a/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java +++ b/framework/src/main/java/cn/lili/modules/store/entity/vos/StoreVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 店铺VO * * @author pikachu - * @date 2020-03-07 17:02:05 + * @since 2020-03-07 17:02:05 */ @Data public class StoreVO extends Store { diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java index 9fdef23f..2d9aa1ea 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/BillMapper.java @@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Select; * 结算单数据处理层 * * @author Chopper - * @date 2020/11/17 4:27 下午 + * @since 2020/11/17 4:27 下午 */ public interface BillMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java index 6b1fba54..e4f939ae 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateChildMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 店铺配送子模板数据处理层 * * @author Bulbasaur - * @date 2020-03-07 09:18:56 + * @since 2020-03-07 09:18:56 */ public interface FreightTemplateChildMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java index 2b612969..459d1dc3 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/FreightTemplateMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 店铺配送模板数据处理层 * * @author Bulbasaur - * @date 2020-03-07 09:18:56 + * @since 2020-03-07 09:18:56 */ public interface FreightTemplateMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java index a0b7f31c..19b02bac 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreAddressMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 店铺地址(自提点）数据处理层 * * @author Bulbasaur - * @date 2020-03-07 09:18:56 + * @since 2020-03-07 09:18:56 */ public interface StoreAddressMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java index ba0d9cdd..39f827f9 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreDetailMapper.java @@ -16,7 +16,7 @@ import java.util.List; * 店铺详细数据处理层 * * @author pikachu - * @date 2020-03-07 09:18:56 + * @since 2020-03-07 09:18:56 */ public interface StoreDetailMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java index c59c46bc..addd2591 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreGoodsLabelMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 店铺商品分类数据处理层 * * @author pikachu - * @date 2020-03-07 09:18:56 + * @since 2020-03-07 09:18:56 */ public interface StoreGoodsLabelMapper extends BaseMapper { } diff --git a/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java b/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java index af894ec2..ab9594f0 100644 --- a/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java +++ b/framework/src/main/java/cn/lili/modules/store/mapper/StoreMapper.java @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Select; * 店铺数据处理层 * * @author pikachu - * @date2020-03-07 09:18:56 + * @since2020-03-07 09:18:56 */ public interface StoreMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/store/service/BillService.java b/framework/src/main/java/cn/lili/modules/store/service/BillService.java index e626c98e..afba9cc1 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/BillService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/BillService.java @@ -17,7 +17,7 @@ import java.util.Date; * 结算单业务层 * * @author Chopper - * @date 2020/11/17 4:28 下午 + * @since 2020/11/17 4:28 下午 */ @CacheConfig(cacheNames = "bill") public interface BillService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java index 18b0e81c..bb34cdf3 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateChildService.java @@ -9,7 +9,7 @@ import java.util.List; * 配送子模板业务层 * * @author Bulbasaur - * @date 2020-03-07 09:24:33 + * @since 2020-03-07 09:24:33 */ public interface FreightTemplateChildService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java index da6a020b..75225f99 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/FreightTemplateService.java @@ -12,7 +12,7 @@ import java.util.List; * 店铺地址（自提点）详细业务层 * * @author Bulbasaur - * @date 2020-03-07 09:24:33 + * @since 2020-03-07 09:24:33 */ public interface FreightTemplateService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java index e6dca6e4..2689a384 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/StoreAddressService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 店铺地址（自提点）详细业务层 * * @author Bulbasaur - * @date 2020-03-07 09:24:33 + * @since 2020-03-07 09:24:33 */ public interface StoreAddressService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java index dbc8b1af..dd2c518e 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/StoreDetailService.java @@ -13,7 +13,7 @@ import java.util.List; * 店铺详细业务层 * * @author pikachu - * @date 2020-03-07 09:24:33 + * @since 2020-03-07 09:24:33 */ public interface StoreDetailService extends IService { /** diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java index 2a886deb..6332fef0 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/StoreGoodsLabelService.java @@ -10,7 +10,7 @@ import java.util.List; * 店铺商品分类业务层 * * @author Bulbasaur - * @date 2020-03-07 09:24:33 + * @since 2020-03-07 09:24:33 */ public interface StoreGoodsLabelService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/store/service/StoreService.java b/framework/src/main/java/cn/lili/modules/store/service/StoreService.java index ca70226f..0fa2ab0b 100644 --- a/framework/src/main/java/cn/lili/modules/store/service/StoreService.java +++ b/framework/src/main/java/cn/lili/modules/store/service/StoreService.java @@ -12,7 +12,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 店铺业务层 * * @author pikachu - * @date 2020/11/18 11:45 上午 + * @since 2020/11/18 11:45 上午 */ public interface StoreService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java index e72d7729..025f03de 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/BillServiceImpl.java @@ -38,7 +38,7 @@ import java.util.Date; * 结算单业务层实现 * * @author Chopper - * @date 2020/11/17 4:28 下午 + * @since 2020/11/17 4:28 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java index e3ea52be..12a7c64b 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceChildImpl.java @@ -15,7 +15,7 @@ import java.util.List; * 配送子模板业务层实现 * * @author Bulbasaur - * @date 2020-03-07 09:24:33 + * @since 2020-03-07 09:24:33 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java index 509b0c81..3a68ae23 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/FreightTemplateServiceImpl.java @@ -31,7 +31,7 @@ import java.util.List; * 店铺运费模板业务层实现 * * @author Bulbasaur - * @date 2020/11/22 16:00 + * @since 2020/11/22 16:00 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java index 99f0c8a8..df968e8d 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreAddressServiceImpl.java @@ -18,7 +18,7 @@ import org.springframework.transaction.annotation.Transactional; * 店铺地址（自提点）业务层实现 * * @author Bulbasaur - * @date 2020/11/22 16:00 + * @since 2020/11/22 16:00 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java index 70b50c23..a8b54127 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreDetailServiceImpl.java @@ -30,7 +30,7 @@ import java.util.List; * 店铺详细业务层实现 * * @author pikachu - * @date 2020-03-07 16:18:56 + * @since 2020-03-07 16:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java index 95cb3090..6fae9ea4 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -24,7 +24,7 @@ import java.util.List; * 店铺商品分类业务层实现 * * @author Bulbasaur - * @date 2020-03-07 16:18:56 + * @since 2020-03-07 16:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java index 9240fe9d..35fa4bef 100644 --- a/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/store/serviceimpl/StoreServiceImpl.java @@ -44,7 +44,7 @@ import java.util.Optional; * 店铺业务层实现 * * @author pikachu - * @date 2020-03-07 16:18:56 + * @since 2020-03-07 16:18:56 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java b/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java index eb2d8769..cf9bbcdd 100644 --- a/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java +++ b/framework/src/main/java/cn/lili/modules/system/aspect/DemoSite.java @@ -6,7 +6,7 @@ import java.lang.annotation.*; * 演示站点注解 * * @author Bulbasaur - * @date: 2021/7/9 1:40 上午 + * @since: 2021/7/9 1:40 上午 */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) 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 b4619a59..4e183c98 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 @@ -23,7 +23,7 @@ import java.util.Date; * app历史版本维护 * * @author zh - * @date 2020-06-20 09:29:19 + * @since 2020-06-20 09:29:19 */ @Data @Entity @@ -43,7 +43,7 @@ public class AppVersion { @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; @@ -74,7 +74,7 @@ public class AppVersion { @ApiModelProperty(value = "类型") private String type; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(value = "版本更新时间") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") private Date versionUpdateDate; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java index 324aaf6d..ab73477b 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/InstantDelivery.java @@ -19,7 +19,7 @@ import javax.persistence.Table; * 即时配送 * * @author pikachu - * @date 2020/12/01 15:58 + * @since 2020/12/01 15:58 */ @Data @Entity 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 0eef125b..e06e996b 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 @@ -27,7 +27,7 @@ import java.util.Date; * 即时配送日志 * * @author pikachu - * @date 2020/12/01 15:58 + * @since 2020/12/01 15:58 */ @Data @@ -48,7 +48,7 @@ public class InstantDeliveryLog { @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; diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java index bdb99e35..5c691361 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Logistics.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotEmpty; * 物流公司设置 * * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java index 2b52d99e..592d8572 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Region.java @@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull; /** * 行政地区 * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java index 6bc02c3a..1c20cde2 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/ServiceNotice.java @@ -12,7 +12,7 @@ import javax.persistence.Table; /** * 服务订阅消息 * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java index d1d71421..426d961a 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/Setting.java @@ -13,7 +13,7 @@ import javax.persistence.Table; /** * 设置 * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java index 9acdfb9a..63e013cd 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dos/VerificationSource.java @@ -13,7 +13,7 @@ import javax.persistence.Table; /** * 验证码资源维护 * @author Chopper - * @date 2021/1/30 4:13 下午 + * @since 2021/1/30 4:13 下午 */ @Data @Entity diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java index 8f2a5026..98b8cacc 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/BaseSetting.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 基础设置 * * @author Chopper - * @date 2020/11/17 7:58 下午 + * @since 2020/11/17 7:58 下午 */ @Data public class BaseSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java index 289d1b84..3a8bcbf4 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/DistributionSetting.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 分销配置 * * @author Chopper - * @date 2020/12/23 18:35 + * @since 2020/12/23 18:35 */ @Data public class DistributionSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java index c7657318..3e969302 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/EmailSetting.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 邮箱设置 * * @author Chopper - * @date 2020/11/26 15:58 + * @since 2020/11/26 15:58 */ @Data public class EmailSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java index be6d0a72..69e5aa64 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/ExperienceSetting.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 经验值设置 * * @author Bulbasaur - * @date: 2021/5/16 11:10 下午 + * @since: 2021/5/16 11:10 下午 */ @Data public class ExperienceSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java index ed6c26d4..ba2c888a 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/GoodsSetting.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 商品设置 * * @author Chopper - * @date 2020/11/17 7:58 下午 + * @since 2020/11/17 7:58 下午 */ @Data public class GoodsSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java index 3b300b02..c06d5676 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/KuaidiSetting.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 快递设置 * * @author Chopper - * @date 2020-03-10 10:04 上午 + * @since 2020-03-10 10:04 上午 */ @Data public class KuaidiSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java index bc2d20c5..7187c2ba 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/OrderSetting.java @@ -9,7 +9,7 @@ import java.io.Serializable; * 订单设置 * * @author Chopper - * @date 2020/11/17 7:59 下午 + * @since 2020/11/17 7:59 下午 */ @Data public class OrderSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java index ef0414c0..04eb6a40 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/OssSetting.java @@ -8,7 +8,7 @@ import java.io.Serializable; * OSS设置 * * @author Chopper - * @date 2020/11/26 15:50 + * @since 2020/11/26 15:50 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java index 15d4c46b..0f32c8a1 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSetting.java @@ -11,7 +11,7 @@ import java.util.List; * 积分设置 * * @author Chopper - * @date 2020/11/17 7:59 下午 + * @since 2020/11/17 7:59 下午 */ @Data public class PointSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java index 5759d6e4..31a7b7da 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/PointSettingItem.java @@ -7,7 +7,7 @@ import lombok.Data; * 积分签到设置 * * @author Chopper - * @date 2021-02-26 11:48 + * @since 2021-02-26 11:48 */ @Data public class PointSettingItem implements Comparable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java index d5c0075e..df4082a4 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/SeckillSetting.java @@ -10,7 +10,7 @@ import java.io.Serializable; * 秒杀活动设置 * * @author Bulbasaur - * @date: 2021/5/24 3:27 下午 + * @since: 2021/5/24 3:27 下午 */ @Data public class SeckillSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java index ca5281a2..683a0663 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/SmsSetting.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 短信配置 * 这里在前台不做调整，方便客户直接把服务商的内容配置在我们平台 * @author Chopper - * @date 2020/11/30 15:23 + * @since 2020/11/30 15:23 */ @Data public class SmsSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java index baffc079..932bbab4 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/WithdrawalSetting.java @@ -8,7 +8,7 @@ import java.io.Serializable; * 提现配置 * * @author pikachu - * @date 2020/11/30 15:23 + * @since 2020/11/30 15:23 */ @Data public class WithdrawalSetting implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java index fb0ed185..ceafe10e 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/QQConnectSetting.java @@ -9,7 +9,7 @@ import java.util.List; * QQ联合登录设置 * * @author Chopper - * @date 2020/11/17 7:59 下午 + * @since 2020/11/17 7:59 下午 */ @Data public class QQConnectSetting { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java index 9d4ddb64..577f0a88 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/WechatConnectSetting.java @@ -9,7 +9,7 @@ import java.util.List; * 微信设置 * * @author Chopper - * @date 2020/11/17 8:00 下午 + * @since 2020/11/17 8:00 下午 */ @Data public class WechatConnectSetting { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java index 7a9da594..ecc0cd22 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/QQConnectSettingItem.java @@ -7,7 +7,7 @@ import lombok.Data; * QQ联合登录具体配置 * * @author Chopper - * @date 2020/11/17 7:59 下午 + * @since 2020/11/17 7:59 下午 */ @Data public class QQConnectSettingItem { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java index 9fdbc17f..68aff383 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/connect/dto/WechatConnectSettingItem.java @@ -6,7 +6,7 @@ import lombok.Data; * 微信设置 * * @author Chopper - * @date 2020/11/17 8:00 下午 + * @since 2020/11/17 8:00 下午 */ @Data public class WechatConnectSettingItem { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java index eeae1694..f3bfe460 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/AlipayPaymentSetting.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 支付宝支付设置 * * @author Chopper - * @date 2020-12-02 10:09 + * @since 2020-12-02 10:09 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java index ed86b3ee..2a5a3128 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/PaymentSupportSetting.java @@ -14,7 +14,7 @@ import java.util.List; * 支持的支付方式 * * @author Chopper - * @date 2021-01-26 15:52 + * @since 2021-01-26 15:52 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java index 380fce0f..b1aa7a39 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/dto/payment/WechatPaymentSetting.java @@ -7,7 +7,7 @@ import lombok.experimental.Accessors; * 微信支付设置 * * @author Chopper - * @date 2020-12-02 10:08 + * @since 2020-12-02 10:08 */ @Data @Accessors(chain = true) diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java index 86da8abe..7312be6f 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/AppType.java @@ -5,7 +5,7 @@ package cn.lili.modules.system.entity.enums; * app类型 安卓 IOS * * @author Chopper - * @date 2020/9/11 17:03 + * @since 2020/9/11 17:03 */ public enum AppType { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java index dbd5e25b..bee60f65 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/InstantDeliveryUrl.java @@ -8,7 +8,7 @@ import lombok.Setter; * 即时配送url接口地址 * * @author pikachu - * @date 2020/9/11 17:03 + * @since 2020/9/11 17:03 */ public enum InstantDeliveryUrl { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java index 23c8fbda..727f1a83 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/SettingEnum.java @@ -4,7 +4,7 @@ package cn.lili.modules.system.entity.enums; * 系统设置常量 * * @author Chopper - * @date 2020/9/11 17:03 + * @since 2020/9/11 17:03 */ public enum SettingEnum { //基础配置 diff --git a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java index a107cf7f..43617de3 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/enums/VerificationSourceEnum.java @@ -5,7 +5,7 @@ package cn.lili.modules.system.entity.enums; * 验证码资源枚举 * * @author Chopper - * @date 2021/1/26 15:55 + * @since 2021/1/26 15:55 */ public enum VerificationSourceEnum { /** diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java index 598035d7..c0659173 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/ConfigItem.java @@ -10,7 +10,6 @@ import java.util.List; * * @author pikachu * @version v4.0 - * @Description: * @since 2020/12/01 15:58 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java index 298ef77f..b0e048a5 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/InstantDeliveryPlugin.java @@ -14,7 +14,6 @@ import java.util.Map; * * @author pikachu * @version v1.0 - * @Description: * @since 2020/12/01 15:58 */ public interface InstantDeliveryPlugin { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java index a0d29e2b..cf24dc5c 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/DadaPlugin.java @@ -34,7 +34,6 @@ import java.util.Map; * * @author pikachu * @version v4.0 - * @Description: * @since 2020/12/01 15:58 */ @Slf4j diff --git a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java index 4ce90bb1..6bd9e9f5 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/plugin/InstantDelivery/dada/vo/DdOrderBackVO.java @@ -10,7 +10,7 @@ import lombok.ToString; /** * @author 86133 * @description: pikachu - * @date 2020/9/1215:35 + * @since 2020/9/1215:35 */ @ApiModel(description = "达达订单回调参数") @Data diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java index 07d45bbc..29c4bf2e 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/CityResult.java @@ -6,7 +6,7 @@ import lombok.Data; * 获取城市结果 * * @author pikachu - * @date 18/6/27 上午9:28 + * @since 18/6/27 上午9:28 */ @Data public class CityResult { diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java index 9b774068..b9542c24 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/InstantDeliveryResultVO.java @@ -8,7 +8,7 @@ import lombok.Data; * 达达返回值 * * @author Chopper - * @date 2020/9/12 14:05 + * @since 2020/9/12 14:05 */ @ApiModel @Data diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java index e2a60641..21870879 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/RegionVO.java @@ -12,7 +12,7 @@ import java.util.List; * 地区VO * * @author Chopper - * @date 2021-02-08 09:49 + * @since 2021-02-08 09:49 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java index 9ae3fd04..c843c287 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/StoreLogisticsVO.java @@ -9,7 +9,7 @@ import lombok.Data; * 物流公司设置 * * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ @Data diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java index 1052be21..99ea005e 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/Traces.java @@ -11,7 +11,7 @@ import java.util.Map; * 物流信息 * * @author Chopper - * @date 2021/1/18 3:28 下午 + * @since 2021/1/18 3:28 下午 */ @Data @NoArgsConstructor diff --git a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java index 02633434..a6b96721 100644 --- a/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java +++ b/framework/src/main/java/cn/lili/modules/system/entity/vo/VerificationVO.java @@ -10,7 +10,7 @@ import java.util.List; * 验证码资源缓存VO * * @author Chopper - * @date 2020/12/2 17:50 + * @since 2020/12/2 17:50 */ @Data public class VerificationVO implements Serializable { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java index 62dbad5d..a8a2be17 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/AppVersionMapper.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Select; * app版本控制数据处理层 * * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface AppVersionMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java index 979588be..05b7d3ab 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryLogMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 即时配送日志数据处理层 * * @author pikachu - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface InstantDeliveryLogMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java index 563c4d36..6c71025b 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/InstantDeliveryMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 即时配送数据处理层 * * @author pikachu - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface InstantDeliveryMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java index 677820ae..676bdf22 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/LogisticsMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 物流公司数据处理层 * * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface LogisticsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java index 809f8fae..25a1bb28 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/RegionMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 行政地区数据处理层 * * @author Chopper - * @date 2020/12/8 9:46 + * @since 2020/12/8 9:46 */ public interface RegionMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java index 94091bfb..f5307c45 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/SensitiveWordsMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 敏感词数据处理层 * @author Bulbasaur - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface SensitiveWordsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java index 433cf38e..a02491af 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/ServiceNoticeMapper.java @@ -6,7 +6,7 @@ import cn.lili.modules.system.entity.dos.ServiceNotice; /** * 服务订阅消息数据处理层 * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface ServiceNoticeMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java index e1c8bba5..40b966c7 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/SettingMapper.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * 配置数据处理层 * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface SettingMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java index 56afb49e..3c5e8a0a 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/StoreLogisticsMapper.java @@ -11,7 +11,7 @@ import java.util.List; * 物流公司数据处理层 * * @author Chopper - * @date 2020/11/17 8:01 下午 + * @since 2020/11/17 8:01 下午 */ public interface StoreLogisticsMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java index 13fa054f..f11b3bde 100644 --- a/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java +++ b/framework/src/main/java/cn/lili/modules/system/mapper/VerificationSourceMapper.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * 验证码资源维护数据处理层 * * @author Chopper - * @date 2021/1/30 4:17 下午 + * @since 2021/1/30 4:17 下午 */ public interface VerificationSourceMapper extends BaseMapper { diff --git a/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java b/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java index 4952123a..430eb6df 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/AppVersionService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * app版本业务层 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface AppVersionService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java index fd4e5ce1..45fd3c26 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryLogService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 即时配送日志业务层 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface InstantDeliveryLogService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java index 97f983f4..e0b5d9d9 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/InstantDeliveryService.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 即时配送业务层 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface InstantDeliveryService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java b/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java index ba46d90d..b3f1c16e 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/LogisticsService.java @@ -10,7 +10,7 @@ import java.util.List; * 物流公司业务层 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface LogisticsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/RegionService.java b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java index dc71e82e..53261699 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/RegionService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/RegionService.java @@ -14,7 +14,7 @@ import java.util.Map; * 行政地区业务层 * * @author Chopper - * @date 2020/12/2 14:14 + * @since 2020/12/2 14:14 */ @CacheConfig(cacheNames = "{regions}") public interface RegionService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java b/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java index 9ef46972..239fa94d 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/SensitiveWordsService.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 敏感词业务层 * * @author Bulbasaur - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface SensitiveWordsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java b/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java index f23d7753..c430433f 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/ServiceNoticeService.java @@ -7,7 +7,7 @@ import cn.lili.modules.system.entity.dos.ServiceNotice; * 服务订阅消息业务层 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface ServiceNoticeService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/SettingService.java b/framework/src/main/java/cn/lili/modules/system/service/SettingService.java index 50f33937..9e1fc0ea 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/SettingService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/SettingService.java @@ -10,7 +10,7 @@ import org.springframework.cache.annotation.Cacheable; * 配置业务层 * * @author Chopper - * @date 2020/11/17 3:46 下午 + * @since 2020/11/17 3:46 下午 */ @CacheConfig(cacheNames = "{setting}") public interface SettingService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java b/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java index 8d4e39be..5c637997 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/StoreLogisticsService.java @@ -10,7 +10,7 @@ import java.util.List; * 店铺-物流公司业务层 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ public interface StoreLogisticsService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java index 4dc5b478..0d6ecb70 100644 --- a/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java +++ b/framework/src/main/java/cn/lili/modules/system/service/VerificationSourceService.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService; * 验证码资源维护 业务层 * * @author Chopper - * @date 2020/11/17 3:44 下午 + * @since 2020/11/17 3:44 下午 */ public interface VerificationSourceService extends IService { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java index f4966910..98e79b7b 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/AppVersionServiceImpl.java @@ -16,7 +16,7 @@ import org.springframework.transaction.annotation.Transactional; * APP版本控制业务层实现 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java index 942f853b..3bf4ec01 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryLogServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; * 即时配送业务层实现 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Service public class InstantDeliveryLogServiceImpl extends ServiceImpl implements InstantDeliveryLogService { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java index 0939156c..c81d05db 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/InstantDeliveryServiceImpl.java @@ -27,7 +27,7 @@ import java.util.Map; * 即时配送业务层实现 * * @author pikachu - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java index 9d9e0f2f..80e52cfc 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java @@ -34,7 +34,7 @@ import java.util.Map; * 物流公司业务层实现 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Slf4j @Service diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java index 896f8489..30497974 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/RegionServiceImpl.java @@ -24,7 +24,7 @@ import java.util.*; * 行政地区业务层实现 * * @author Chopper - * @date 2020/12/2 11:11 + * @since 2020/12/2 11:11 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java index 875fa4c3..9a16a185 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SensitiveWordsServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; * 敏感词业务层实现 * * @author Bulbasaur - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Service public class SensitiveWordsServiceImpl extends ServiceImpl implements SensitiveWordsService { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java index 7123df2d..72f8677c 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/ServiceNoticeServiceImpl.java @@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional; /** * 服务订阅消息业务层实现 * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Service public class ServiceNoticeServiceImpl extends ServiceImpl implements ServiceNoticeService { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java index ca8517b8..bbe09e56 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/SettingServiceImpl.java @@ -13,7 +13,7 @@ import org.springframework.transaction.annotation.Transactional; * 配置业务层实现 * * @author Chopper - * @date 2020/11/17 3:52 下午 + * @since 2020/11/17 3:52 下午 */ @Service public class SettingServiceImpl extends ServiceImpl implements SettingService { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java index bc99bd52..f25ee47b 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/StoreLogisticsServiceImpl.java @@ -17,7 +17,7 @@ import java.util.List; * 物流公司业务层实现 * * @author Chopper - * @date 2020/11/17 8:02 下午 + * @since 2020/11/17 8:02 下午 */ @Service public class StoreLogisticsServiceImpl extends ServiceImpl implements StoreLogisticsService { diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java index dd7f0b39..31f7de20 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/VerificationSourceServiceImpl.java @@ -18,7 +18,7 @@ import java.util.List; * 验证码资源维护 业务层实现 * * @author Chopper - * @date 2020/11/17 3:48 下午 + * @since 2020/11/17 3:48 下午 */ @Service @Transactional(rollbackFor = Exception.class) diff --git a/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java b/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java index 95030afa..44749097 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/CharacterConstant.java @@ -2,7 +2,7 @@ package cn.lili.modules.system.utils; /** * - * @Description: 字符常量 + * 字符常量 * @author Bulbasaur * @version v1.0 * @since v1.0 diff --git a/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java b/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java index 9dc27a06..8f01aaf8 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/HttpUtils.java @@ -15,7 +15,7 @@ import java.util.Map; * Http工具 * * @author pikachu - * @date 2018/3/13 + * @since 2018/3/13 */ @Slf4j public final class HttpUtils { diff --git a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java index e1ea4d25..6e8cb8f0 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/SensitiveWordsFilter.java @@ -39,6 +39,7 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner { * 使用2个字符的hash定位。 */ protected static SensitiveWordsNode[] nodes; + @Autowired private SensitiveWordsService sensitiveWordsService; @@ -47,8 +48,8 @@ public class SensitiveWordsFilter implements Serializable, ApplicationRunner { * 增加一个敏感词，如果词的长度（trim后）小于2，则丢弃
* 此方法（构建）并不是主要的性能优化点。 * - * @param word - * @return + * @param word 敏感词 + * @return 操作结果 */ public static boolean put(String word) { diff --git a/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java b/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java index 001fdd2d..1f211a02 100644 --- a/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java +++ b/framework/src/main/java/cn/lili/modules/system/utils/StringPointer.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ public class StringPointer implements Serializable, CharSequence, Comparable{ diff --git a/manager-api/src/main/java/cn/lili/ManagerApiApplication.java b/manager-api/src/main/java/cn/lili/ManagerApiApplication.java index c9d22b70..d246b8ab 100644 --- a/manager-api/src/main/java/cn/lili/ManagerApiApplication.java +++ b/manager-api/src/main/java/cn/lili/ManagerApiApplication.java @@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; * 运营后台 API * * @author Chopper - * @date 2020/11/16 10:03 下午 + * @since 2020/11/16 10:03 下午 */ @SpringBootApplication @EnableCaching diff --git a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java index e70781d6..8580607e 100644 --- a/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/file/FileManagerController.java @@ -21,7 +21,7 @@ import java.util.List; * 管理端,文件管理管理接口 * * @author Chopper - * @date 2020/11/26 15:41 + * @since 2020/11/26 15:41 */ @RestController @Api(tags = "管理端,文件管理管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java index 6db36c2c..4b187583 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/BrandManagerController.java @@ -27,7 +27,7 @@ import java.util.List; * 管理端,品牌接口 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @RestController @Api(tags = "管理端,品牌接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java index 4bef3c3c..0256364c 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryBrandManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,分类品牌接口 * * @author pikachu - * @date 2020-02-27 15:18:56 + * @since 2020-02-27 15:18:56 */ @RestController @Api(tags = "管理端,分类品牌接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java index f20b9ab5..ec72c1f2 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryManagerController.java @@ -24,7 +24,7 @@ import java.util.List; * 管理端,商品分类接口 * * @author pikachu - * @date 2020-02-27 15:18:56 + * @since 2020-02-27 15:18:56 */ @RestController @Api(tags = "管理端,商品分类接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java index 4658ab88..af99cdd5 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupManagerController.java @@ -23,7 +23,7 @@ import java.util.List; * 管理端,分类绑定参数组接口 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @RestController @Api(tags = "管理端,分类绑定参数组接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java index 43993b99..bde97a6b 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/CategorySpecificationManagerController.java @@ -21,7 +21,7 @@ import java.util.List; * 管理端,商品分类规格接口 * * @author pikachu - * @date 2020-02-27 15:18:56 + * @since 2020-02-27 15:18:56 */ @RestController @Api(tags = "管理端,商品分类规格接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java index c0f5cc39..8004783c 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java @@ -28,7 +28,7 @@ import java.util.List; * 管理端,商品管理接口 * * @author pikachu - * @date 2020-02-23 15:18:56 + * @since 2020-02-23 15:18:56 */ @RestController @Api(tags = "管理端,商品管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java index e52178b2..5dbacac5 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsUnitManagerController.java @@ -23,7 +23,7 @@ import java.util.List; * 管理端,商品计量单位接口 * * @author Bulbasaur - * @date: 2020/11/26 16:15 + * @since: 2020/11/26 16:15 */ @RestController @Api(tags = "管理端,商品计量单位接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java index 78d7a0e5..0d7187e2 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/ParameterManagerController.java @@ -18,7 +18,7 @@ import javax.validation.Valid; * 管理端,分类绑定参数组管理接口 * * @author Bulbasaur - * @date: 2020/11/26 16:15 + * @since: 2020/11/26 16:15 */ @RestController @Api(tags = "管理端,分类绑定参数组管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java index 41b114d5..47daf67f 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/SpecificationManagerController.java @@ -23,7 +23,7 @@ import java.util.List; * 管理端,商品规格接口 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @RestController @Api(tags = "管理端,商品规格接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java index fbe2cfe9..c49ebdd5 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/ConnectConfigManagerController.java @@ -17,7 +17,7 @@ import java.util.List; * 管理端,联合登陆配置接口 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,联合登陆配置接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java index af20657b..77881b55 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/IpInfoManagerController.java @@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest; * 管理端,IP接口 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,IP接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java index 2bda4814..83acd865 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberAddressManagerController.java @@ -18,7 +18,7 @@ import javax.validation.Valid; * 管理端,会员地址API * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,会员地址API") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java index 1ef688f6..e1d3d241 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberEvaluationManagerController.java @@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull; * 管理端,会员商品评价接口 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,会员商品评价接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java index 95c7e5e0..3aba3808 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberGradeManagerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * 管理端,会员等级接口 * * @author Bulbasaur - * @date: 2021/5/16 11:29 下午 + * @since: 2021/5/16 11:29 下午 */ @RestController @Api(tags = "管理端,会员等级接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java index a42b9ea1..a2805fb9 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java @@ -24,7 +24,7 @@ import java.util.List; * 管理端,会员接口 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,会员接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java index 804ab7e3..dff5bccd 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberMessageManagerController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,会员消息消息管理接口 * * @author pikachu - * @date: 2020/12/6 16:09 + * @since: 2020/12/6 16:09 */ @RestController @Transactional(rollbackFor = Exception.class) diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java index a0f9ab49..804ae92d 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeLogManagerController.java @@ -18,7 +18,7 @@ import java.util.List; * 管理端,会员消息接口 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,会员消息接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java index 139120c4..62c0630d 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberNoticeSenterManagerController.java @@ -19,7 +19,7 @@ import java.util.List; * 管理端,会员消息接口 * * @author Chopper - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,会员消息接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java index 229064ac..1e6bac6b 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,会员积分历史接口 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "管理端,会员积分历史接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java index d63da28e..c79c0368 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWalletManagerController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,预存款接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "管理端,预存款接口") diff --git a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java index e796a0e7..8fa5cf2a 100644 --- a/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/member/MemberWithdrawApplyManagerController.java @@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,余额提现记录接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "管理端,余额提现记录接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java index 3d499455..a88142e6 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleCategoryManagerController.java @@ -19,7 +19,7 @@ import java.util.List; * 管理端,文章分类管理接口 * * @author pikachu - * @date 2020-05-5 15:10:16 + * @since 2020-05-5 15:10:16 */ @Slf4j @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java index 5fade9b3..aa9f7c8a 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/ArticleManagerController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; * 管理端,文章接口 * * @author pikachu - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ @RestController @Api(tags = "管理端,文章接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java index 61af5e6e..543cbb35 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/CustomWordsManagerController.java @@ -20,7 +20,7 @@ import javax.validation.constraints.NotNull; * 管理端,自定义分词接口 * * @author paulG - * @date 2020/10/16 + * @since 2020/10/16 **/ @RestController @Api(tags = "管理端,自定义分词接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java index 26ea97ae..688095dd 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/FeedbackManagerController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,意见反馈接口 * * @author Bulbasaur - * @date 2020-05-5 15:10:16 + * @since 2020-05-5 15:10:16 */ @RestController @Api(tags = "管理端,意见反馈接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java index 4deea20a..261c736f 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/MessageManagerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; * 管理端,消息发送管理接口 * * @author pikachu - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ @RestController @Api(tags = "管理端,消息发送管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java index b677a291..b5f1a897 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java @@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull; * 管理端,页面设置管理接口 * * @author paulGao - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ @RestController @Api(tags = "管理端,页面设置管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java index 315d47ec..9818cff7 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SensitiveWordsManagerController.java @@ -21,7 +21,7 @@ import java.util.List; * 管理端,敏感词管理接口 * * @author Bulbasaur - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ @RestController @Api(tags = "管理端,敏感词管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java index e5d34b39..3dda7b20 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/SpecialManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,专题活动接口 * * @author Bulbasaur - * @date: 2020/12/7 11:33 + * @since: 2020/12/7 11:33 */ @RestController @Api(tags = "管理端,专题活动接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java index 92f8a6ec..9cb6b9b2 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/VerificationSourceController.java @@ -21,7 +21,7 @@ import java.util.List; * 管理端,验证码资源维护接口 * * @author Chopper - * @date: 2020/12/7 11:33 + * @since: 2020/12/7 11:33 */ @RestController @Api(tags = "管理端,验证码资源维护接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java index 6b234cb3..e8c27ed8 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/CommodityManagerController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,直播间管理接口 * * @author Bulbasaur - * @date: 2021/5/28 11:56 上午 + * @since: 2021/5/28 11:56 上午 */ @RestController @Api(tags = "店铺端,直播商品接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java index b2957046..6f33569f 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/broadcast/StudioManagerController.java @@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull; * 管理端,直播间接口 * * @author Bulbasaur - * @date: 2021/5/28 11:56 上午 + * @since: 2021/5/28 11:56 上午 */ @RestController @Api(tags = "店铺端,直播间接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java index eafa7f26..67838270 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionCashManagerController.java @@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull; * 管理端,分销佣金管理接口 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @RestController @Api(tags = "管理端,分销佣金管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java index 51f86c4e..59968852 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsManagerController.java @@ -18,7 +18,7 @@ import java.util.List; * 管理端,分销商品管理接口 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @RestController @Api(tags = "管理端,分销商品管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java index 9966328e..bbb98c1b 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionManagerController.java @@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull; * 管理端,分销员管理接口 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @RestController @Api(tags = "管理端,分销员管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java index a1c52471..ae1c3d8f 100644 --- a/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderManagerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,分销订单管理接口 * * @author pikachu - * @date 2020-03-14 23:04:56 + * @since 2020-03-14 23:04:56 */ @RestController @Api(tags = "管理端,分销订单管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java index ba69cb2c..ae116231 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java @@ -21,7 +21,7 @@ import java.util.List; * 管理端,菜单管理接口 * * @author Chopper - * @date 2020/11/20 12:07 + * @since 2020/11/20 12:07 */ @Slf4j @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java index 07edd0d9..b53903ab 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,角色管理接口 * * @author Chopper - * @date 2020/11/20 18:50 + * @since 2020/11/20 18:50 */ @RestController @Api(tags = "管理端,角色管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java index 58633dc7..63b57355 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/RoleMenuManagerController.java @@ -17,7 +17,7 @@ import java.util.List; * 管理端,角色菜单接口 * * @author Chopper - * @date 2020/11/22 11:40 + * @since 2020/11/22 11:40 */ @RestController @Api(tags = "管理端,角色菜单接口") diff --git a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java index 1cad5d54..b04971cb 100644 --- a/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/permission/UserRoleManagerController.java @@ -17,7 +17,7 @@ import java.util.List; * 管理端,管理员角色接口 * * @author Chopper - * @date 2020/11/22 11:53 + * @since 2020/11/22 11:53 */ @RestController @Api(tags = "管理端,管理员角色接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java index 5609a3e8..8e6f7c74 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponActivityManagerController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; * 优惠券活动 * * @author Bulbasaur - * @date: 2021/5/21 7:11 下午 + * @since: 2021/5/21 7:11 下午 */ @RestController @Api(tags = "管理端,优惠券活动接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java index 69ac05ba..90482c2b 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/CouponManagerController.java @@ -29,7 +29,7 @@ import java.util.List; * 管理端,优惠券接口 * * @author paulG - * @date 2020/10/9 + * @since 2020/10/9 **/ @RestController @Api(tags = "管理端,优惠券接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java index 8036f8e0..789f4eff 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/FullDiscountManagerController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,满额活动接口 * * @author paulG - * @date 2021/1/12 + * @since 2021/1/12 **/ @RestController @Api(tags = "管理端,满额活动接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java index 1f177fe0..dacc69ad 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PintuanManagerController.java @@ -25,7 +25,7 @@ import java.util.Date; * 管理端,平台拼团接口 * * @author paulG - * @date 2020/10/9 + * @since 2020/10/9 **/ @RestController @Api(tags = "管理端,平台拼团接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java index d5429c81..5cdebfc1 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsCategoryManagerController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; * 管理端,积分商品分类接口 * * @author paulG - * @date 2021/1/14 + * @since 2021/1/14 **/ @RestController @Api(tags = "管理端,积分商品分类接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java index acfe4ca5..e31e9d0a 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PointsGoodsManagerController.java @@ -24,7 +24,7 @@ import java.util.List; * 管理端,积分商品接口 * * @author paulG - * @date 2021/1/14 + * @since 2021/1/14 **/ @RestController @Api(tags = "管理端,积分商品接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java index 901e33dd..fea4cb30 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/PromotionManagerController.java @@ -21,7 +21,7 @@ import java.util.Map; * 管理端,促销接口 * * @author paulG - * @date 2021/2/2 + * @since 2021/2/2 **/ @RestController @Api(tags = "管理端,促销接口") diff --git a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java index 91210d44..2877aa14 100644 --- a/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/promotion/SeckillManagerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * 管理端,秒杀活动接口 * * @author paulG - * @date 2020/8/20 + * @since 2020/8/20 **/ @RestController @Api(tags = "管理端,秒杀活动接口") diff --git a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java index 258cea23..e69648aa 100644 --- a/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/purchase/PurchaseManagerController.java @@ -23,7 +23,7 @@ import java.util.List; * 管理端,采购接口 * * @author Chopper - * @date: 2020/11/16 10:06 下午 + * @since: 2020/11/16 10:06 下午 */ @Api(tags = "管理端,采购接口") @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java index 51d180b2..7281fc80 100755 --- a/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/AppVersionManagerController.java @@ -24,7 +24,7 @@ import javax.validation.Valid; * 管理端,app版本控制器 * * @author Chopper - * @date 2018-07-04 21:50:52 + * @since 2018-07-04 21:50:52 */ @RestController @Api("管理端,app版本控制器") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java index 6fc50543..681dee9e 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/InstantDeliveryManagerController.java @@ -24,7 +24,7 @@ import java.util.List; * 管理端,即时配送接口 * * @author pikachu - * @date: 2020/11/17 7:56 下午 + * @since: 2020/11/17 7:56 下午 */ @RestController @Api(tags = "管理端,即时配送接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java index 846bff2c..b0891ebc 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogManagerController.java @@ -19,7 +19,7 @@ import java.util.List; * 管理端,日志管理接口 * * @author Chopper - * @date: 2020/11/17 7:56 下午 + * @since: 2020/11/17 7:56 下午 */ @Slf4j @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java index c836ebae..bcee576f 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/LogisticsManagerController.java @@ -21,7 +21,7 @@ import javax.validation.constraints.NotNull; * 管理端,物流公司接口 * * @author Chopper - * @date: 2020/11/17 7:56 下午 + * @since: 2020/11/17 7:56 下午 */ @RestController @Api(tags = "管理端,物流公司接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java index 9816d7a1..f9b87a57 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/MemberNoticeManagerController.java @@ -22,7 +22,7 @@ import java.util.List; * 管理端,会员站内信管理接口 * * @author Chopper - * @date: 2020/11/17 4:31 下午 + * @since: 2020/11/17 4:31 下午 */ @RestController @Api(tags = "管理端,会员站内信管理API") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java index 8eeac205..00e3e4e4 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/NoticeMessageManagerController.java @@ -30,7 +30,7 @@ import java.util.List; * 管理端,会员站内信管理接口 * * @author Chopper - * @date: 2020/11/17 4:31 下午 + * @since: 2020/11/17 4:31 下午 */ @Slf4j @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java index dca3995d..4bac14ba 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,行政地区管理接口 * * @author Chopper - * @date 2020/12/2 10:40 + * @since 2020/12/2 10:40 */ @RestController @Api(tags = "管理端,行政地区管理接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java index 491c3002..38ba2c87 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/ServiceNoticeManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,服务订阅消息接口 * * @author Chopper - * @date: 2020/11/17 4:33 下午 + * @since: 2020/11/17 4:33 下午 */ @RestController @Api(tags = "管理端,服务订阅消息接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java index 5021c6d9..a1679096 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingManagerController.java @@ -28,7 +28,7 @@ import java.util.Collections; * 管理端,系统设置接口 * * @author Chopper - * @date 2020/11/26 15:53 + * @since 2020/11/26 15:53 */ @RestController @Api(tags = "管理端,系统设置接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java index 8a336f2d..a5caa8bb 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SettingXManagerController.java @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController; * 对一些系统设置的支持，例如动态表单等 * * @author Chopper - * @date 2020/11/26 15:53 + * @since 2020/11/26 15:53 */ @RestController @Api(tags = "管理端,系统设置扩展接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java index 5f72622e..61560bbd 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,短信接口 * * @author Bulbasaur - * @date: 2021/1/30 4:09 下午 + * @since: 2021/1/30 4:09 下午 */ @RestController @Api(tags = "管理端,短信接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java index c9e0a858..bc9da37b 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsSignManagerController.java @@ -19,7 +19,7 @@ import javax.validation.Valid; * 管理端,短信签名接口 * * @author Chopper - * @date: 2021/1/30 4:09 下午 + * @since: 2021/1/30 4:09 下午 */ @RestController @Api(tags = "管理端,短信签名接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java index 44a99f9f..a90c344a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/SmsTemplateManagerController.java @@ -19,7 +19,7 @@ import javax.validation.Valid; * 管理端,短信模板接口 * * @author Bulbasaur - * @date: 2021/1/30 4:09 下午 + * @since: 2021/1/30 4:09 下午 */ @RestController @Api(tags = "管理端,短信模板接口") diff --git a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java index 1460e90f..28cf174a 100644 --- a/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java +++ b/manager-api/src/main/java/cn/lili/controller/setting/WechatMessageManageController.java @@ -19,7 +19,7 @@ import java.util.List; * 管理端,微信消息接口 * * @author Chopper - * @date 2020/12/2 10:40 + * @since 2020/12/2 10:40 */ @RestController @Api(tags = "管理端,微信消息接口") diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java index de2b59d4..58487a6d 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsManagerController.java @@ -19,7 +19,7 @@ import java.util.List; * 管理端,商品统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Api(tags = "管理端,商品统计接口") @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java index 669d9e30..5774e0e9 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsManagerController.java @@ -24,7 +24,7 @@ import java.util.List; * 管理端,首页统计数据接口 * * @author Bulbasaur - * @date: 2020/12/15 17:53 + * @since: 2020/12/15 17:53 */ @Slf4j @Api(tags = "管理端,首页统计数据接口") diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java index 9c364405..7bccf0e7 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/MemberStatisticsManagerController.java @@ -18,7 +18,7 @@ import java.util.List; * 管理端,会员统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Api(tags = "管理端,会员统计接口") @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java index 2094c62f..0ef29a00 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsManagerController.java @@ -26,7 +26,7 @@ import java.util.List; * 管理端,订单统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Slf4j @Api(tags = "管理端,订单统计接口") diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java index ec77d92f..e555732e 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsManagerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,退款统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Api(tags = "管理端,退款统计接口") @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java index df3406ff..78e09198 100644 --- a/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsManagerController.java @@ -20,7 +20,7 @@ import java.util.List; * 管理端,流量统计接口 * * @author Chopper - * @date 2021/2/9 11:19 + * @since 2021/2/9 11:19 */ @Api(tags = "管理端,流量统计接口") @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java index f82068ea..7933b125 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/BillManagerController.java @@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull; * 管理端,商家结算单接口 * * @author Chopper - * @date: 2020/11/17 7:23 下午 + * @since: 2020/11/17 7:23 下午 */ @RestController @Api(tags = "管理端,商家结算单接口") diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java index 37c02320..23fe97ee 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java @@ -29,7 +29,7 @@ import java.util.List; * 管理端,店铺管理接口 * * @author Bulbasaur - * @date: 2020/12/6 16:09 + * @since: 2020/12/6 16:09 */ @Api(tags = "管理端,店铺管理接口") @RestController diff --git a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java index aa0bacf7..6c9f9e18 100644 --- a/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/store/StoreMessageManagerController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,店铺消息消息管理接口 * * @author pikachu - * @date: 2020/12/6 16:09 + * @since: 2020/12/6 16:09 */ @RestController @Transactional(rollbackFor = Exception.class) diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java index 8ae8f5f0..a711ba6f 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleManagerController.java @@ -22,7 +22,7 @@ import java.util.List; * 管理端,售后接口 * * @author Bulbasaur - * @date: 2021/1/6 14:11 + * @since: 2021/1/6 14:11 */ @RestController @RequestMapping("/manager/afterSale") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java index c4afdb76..025fe3a4 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/AfterSaleReasonManagerController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; * 管理端,售后原因接口 * * @author Bulbasaur - * @date: 2021/1/6 14:11 + * @since: 2021/1/6 14:11 */ @RestController @RequestMapping("/manager/afterSaleReason") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java index fbb2c68c..f74d40d3 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderComplaintManagerController.java @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.*; * 管理端,交易投诉接口 * * @author paulG - * @date: 2020/12/5 + * @since: 2020/12/5 */ @RestController @Api(tags = "管理端,交易投诉接口") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java index 80b1cbbf..e0d7cea6 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderLogManagerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,订单日志管理接口 * * @author Chopper - * @date 2020/11/17 4:34 下午 + * @since 2020/11/17 4:34 下午 */ @RestController @Transactional(rollbackFor = Exception.class) diff --git a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java index a88b4813..55aa9753 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/OrderManagerController.java @@ -27,7 +27,7 @@ import java.util.List; * 管理端,订单API * * @author Chopper - * @date 2020/11/17 4:34 下午 + * @since 2020/11/17 4:34 下午 */ @RestController @RequestMapping("/manager/orders") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java index 7c16c31b..362159a4 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/PaymentLogManagerController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,收款日志接口 * * @author Chopper - * @date 2020/11/17 4:34 下午 + * @since 2020/11/17 4:34 下午 */ @RestController @Api(tags = "管理端,收款日志接口") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java index d5b5d859..984ad00c 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/ReceiptManagerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,发票记录接口 * * @author paulG - * @date 2020/11/17 4:34 下午 + * @since 2020/11/17 4:34 下午 **/ @RestController @Api(tags = "管理端,发票记录接口") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java index bd3cd0fb..81079760 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RechargeManagerController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*; * 管理端,预存款充值记录接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "管理端,预存款充值记录接口") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java index 37aff972..1774f35c 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/RefundLogManagerController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,退款日志接口 * * @author Chopper - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "管理端,退款日志接口") diff --git a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java index 2818bdde..ad664eab 100644 --- a/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/trade/WalletLogManagerController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 管理端,预存款充值记录接口 * * @author pikachu - * @date: 2020/11/16 10:07 下午 + * @since: 2020/11/16 10:07 下午 */ @RestController @Api(tags = "管理端,预存款充值记录接口") diff --git a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java index 809105a5..cb406c47 100644 --- a/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java +++ b/manager-api/src/main/java/cn/lili/security/ManagerSecurityConfig.java @@ -17,7 +17,7 @@ import org.springframework.web.cors.CorsConfigurationSource; * spring Security 核心配置类 Manager安全配置中心 * * @author Chopper - * @date 2020/11/14 16:20 + * @since 2020/11/14 16:20 */ @Slf4j @Configuration diff --git a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java index d0ed486a..185349a2 100644 --- a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java +++ b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java @@ -18,7 +18,6 @@ import java.util.Set; /** * @author Chopper * @version v1.0 - * @Description: * @since v7.0 * 2021/1/15 16:25 */ diff --git a/seller-api/src/main/java/cn/lili/StoreApiApplication.java b/seller-api/src/main/java/cn/lili/StoreApiApplication.java index 26ced53e..58869a2d 100644 --- a/seller-api/src/main/java/cn/lili/StoreApiApplication.java +++ b/seller-api/src/main/java/cn/lili/StoreApiApplication.java @@ -14,7 +14,7 @@ import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; * 商家后台 API * * @author Chopper - * @date 2020/11/16 10:03 下午 + * @since 2020/11/16 10:03 下午 */ @SpringBootApplication @EnableJpaAuditing diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java index 9b1d761e..e4fe6bb9 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryParameterGroupStoreController.java @@ -21,7 +21,7 @@ import java.util.List; * 店铺端,分类绑定参数组管理接口 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @RestController @Api(tags = "店铺端,分类绑定参数组管理接口") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java index e4aaebe9..656efb43 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategorySpecificationStoreController.java @@ -18,7 +18,7 @@ import java.util.List; * 店铺端,商品分类规格接口 * * @author pikachu - * @date 2020-02-27 15:18:56 + * @since 2020-02-27 15:18:56 */ @RestController @Api(tags = "店铺端,商品分类规格接口") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java index b2530cb1..9386ceb0 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/CategoryStoreController.java @@ -26,7 +26,7 @@ import java.util.List; * 店铺端,商品分类接口 * * @author Chopper - * @date 2021/2/20 2:26 下午 + * @since 2021/2/20 2:26 下午 */ @RestController @Api(tags = "店铺端,商品分类接口") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java index 2b2e04b4..91a08db4 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/DraftGoodsStoreController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,草稿商品接口 * * @author paulG - * @date 2021/2/20 2:26 下午 + * @since 2021/2/20 2:26 下午 * */ @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java index a5b8e52c..003daab4 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsGalleryController.java @@ -19,7 +19,7 @@ import java.util.List; * 店铺端,商品相册接口 * * @author pikachu - * @date 2020-03-13 11:18:56 + * @since 2020-03-13 11:18:56 */ @RestController @Api(tags = "店铺端,商品相册接口") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java index 9830dbfa..6d893887 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsLabelStoreController.java @@ -20,7 +20,7 @@ import java.util.List; * 店铺端,店铺分类接口 * * @author Bulbasaur - * @date 2020/11/17 2:32 下午 + * @since 2020/11/17 2:32 下午 */ @Api(tags = "店铺端,店铺分类接口") @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java index a9661473..7870eebd 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsStoreController.java @@ -32,7 +32,7 @@ import java.util.List; * 店铺端,商品接口 * * @author pikachu - * @date 2020-02-23 15:18:56 + * @since 2020-02-23 15:18:56 */ @RestController @Api(tags = "店铺端,商品接口") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java index f6e00d27..894fd8a5 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/GoodsUnitStoreController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 店铺端,商品计量单位接口 * * @author Bulbasaur - * @date 2020/11/26 16:15 + * @since 2020/11/26 16:15 */ @RestController @Api(tags = "店铺端,商品计量单位接口") diff --git a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java index 1bdb6968..2d944079 100644 --- a/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/goods/SpecificationStoreController.java @@ -18,7 +18,7 @@ import java.util.List; * 店铺端,规格管理接口 * * @author pikachu - * @date 2020-02-18 15:18:56 + * @since 2020-02-18 15:18:56 */ @RestController @Api(tags = "店铺端,规格接口") diff --git a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java index 0846a3ad..8a6778f8 100644 --- a/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java +++ b/seller-api/src/main/java/cn/lili/controller/member/StoreUserController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 店铺端,管理员接口 * * @author Chopper - * @date 2020/11/16 10:57 + * @since 2020/11/16 10:57 */ @RestController @Api(tags = "店铺端,管理员接口") diff --git a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java index 28e3784f..73bd5b38 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/article/ArticleStoreController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.RestController; * 店铺端,文章接口 * * @author pikachu - * @date 2020-05-06 15:18:56 + * @since 2020-05-06 15:18:56 */ @RestController @Api(tags = "店铺端,文章接口") diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java index caea7622..eef1afab 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/CommodityStoreController.java @@ -22,7 +22,7 @@ import java.util.List; * 店铺端,直播商品接口 * * @author Bulbasaur - * @date: 2021/5/17 2:05 下午 + * @since: 2021/5/17 2:05 下午 */ @RestController @Api(tags = "店铺端,直播商品接口") diff --git a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java index 3049975e..bb35cbda 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/broadcast/StudioStoreController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,直播间接口 * * @author Bulbasaur - * @date: 2021/5/17 2:05 下午 + * @since: 2021/5/17 2:05 下午 */ @RestController @Api(tags = "店铺端,直播间接口") diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java index eb6b6576..3bd675a4 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionGoodsStoreController.java @@ -23,7 +23,7 @@ import javax.validation.constraints.NotNull; * 店铺端,分销商品接口 * * @author Bulbasaur - * @date 2020/11/16 10:06 下午 + * @since 2020/11/16 10:06 下午 */ @RestController @Api(tags = "店铺端,分销商品接口") diff --git a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java index 5f844431..b5b9f0e9 100644 --- a/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/other/distribution/DistributionOrderStoreController.java @@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * 店铺端,分销订单接口 * * @author Bulbasaur - * @date 2020/11/16 10:06 下午 + * @since 2020/11/16 10:06 下午 */ @RestController @Api(tags = "店铺端,分销订单接口") diff --git a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java index d9c97762..e796293f 100644 --- a/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java +++ b/seller-api/src/main/java/cn/lili/controller/passport/StorePassportController.java @@ -22,7 +22,7 @@ import javax.validation.constraints.NotNull; * 店铺端,商家登录接口 * * @author Chopper - * @date 2020/12/22 15:02 + * @since 2020/12/22 15:02 */ @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java index 8ab6aa5d..06ba79dd 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/CouponStoreController.java @@ -25,7 +25,7 @@ import java.util.List; * 店铺端,优惠券接口 * * @author paulG - * @date 2020/8/28 + * @since 2020/8/28 **/ @RestController @Api(tags = "店铺端,优惠券接口") diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java index fafdb403..da2210d9 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/FullDiscountStoreController.java @@ -21,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,满额活动接口 * * @author paulG - * @date 2020/8/19 + * @since 2020/8/19 **/ @RestController @Api(tags = "店铺端,满额活动接口") diff --git a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java index c620777d..010ae363 100644 --- a/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/promotion/SeckillStoreController.java @@ -25,7 +25,7 @@ import java.util.List; * 店铺端,秒杀活动接口 * * @author paulG - * @date 2020/8/26 + * @since 2020/8/26 **/ @RestController @Api(tags = "店铺端,秒杀活动接口") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java index c0a2ef1f..ef544589 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/FreightTemplateStoreController.java @@ -18,7 +18,7 @@ import java.util.List; * 店铺端,运费模板接口 * * @author paulG - * @date 2020/8/26 + * @since 2020/8/26 **/ @RestController @Api(tags = "店铺端,运费模板接口") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java index 414e916f..a5c296bc 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogStoreController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController; * 店铺端,日志管理接口 * * @author Chopper - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @RestController @Transactional(rollbackFor = Exception.class) diff --git a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java index 26b6d955..721b5651 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/LogisticsStoreController.java @@ -19,7 +19,7 @@ import java.util.List; * 店铺端,物流公司接口 * * @author Bulbasaur - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @RestController @Api(tags = "店铺端,物流公司接口") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java index 94793f54..b6575e9b 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreAddressController.java @@ -21,7 +21,7 @@ import javax.validation.Valid; * 店铺端,商家地址（自提点）接口 * * @author Bulbasaur - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @RestController @Api(tags = "店铺端,商家地址（自提点）接口") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java index 9214e1a0..4d76923e 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreMessageController.java @@ -23,7 +23,7 @@ import java.util.Map; * 店铺端,消息接口 * * @author Bulbasaur - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @RestController @Api(tags = "店铺端,消息接口") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java index f8758ad0..9bb45b07 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StorePageDataController.java @@ -23,7 +23,7 @@ import javax.validation.Valid; * 店铺端,页面接口 * * @author paulGao - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @RestController @Api(tags = "店铺端,页面接口") diff --git a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java index 6a3b001b..3a9a5f11 100644 --- a/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java +++ b/seller-api/src/main/java/cn/lili/controller/settings/StoreSettingsController.java @@ -24,7 +24,7 @@ import javax.validation.Valid; * 店铺端,店铺设置接口 * * @author Bulbasaur - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @RestController @Api(tags = "店铺端,店铺设置接口") diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java index 7cae959f..e2ed4f3f 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/GoodsStatisticsStoreController.java @@ -19,7 +19,7 @@ import java.util.List; * 店铺端,商品统计接口 * * @author Bulbasaur - * @date: 2020/11/22 14:23 + * @since: 2020/11/22 14:23 */ @Api(tags = "店铺端,商品统计接口") @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java index 6146ebda..baa29a3d 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/IndexStatisticsStoreController.java @@ -21,7 +21,7 @@ import java.util.List; * 店铺端,首页统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Api(tags = "店铺端,首页统计接口") @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java index 4a17cdef..1a0e6639 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/OrderStatisticsStoreController.java @@ -27,7 +27,7 @@ import java.util.List; * 店铺端,订单统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Slf4j @Api(tags = "店铺端,订单统计接口") diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java index f0146d49..c31161c5 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/RefundOrderStatisticsStoreController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.RestController; * 店铺端,退款统计接口 * * @author Bulbasaur - * @date: 2020/12/9 19:04 + * @since: 2020/12/9 19:04 */ @Api(tags = "店铺端,退款统计接口") @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java index d4f97455..7bb78546 100644 --- a/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/statistics/ViewStatisticsStoreController.java @@ -19,7 +19,7 @@ import java.util.List; * 店铺端,流量统计接口 * * @author Chopper - * @date 2021/2/9 11:19 + * @since 2021/2/9 11:19 */ @Api(tags = "店铺端,流量统计接口") @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java index 214f63b6..e12e9c4d 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/AfterSaleStoreController.java @@ -22,7 +22,7 @@ import java.util.List; * 店铺端,售后管理接口 * * @author Chopper - * @date 2020/11/17 4:29 下午 + * @since 2020/11/17 4:29 下午 */ @RestController @Api(tags = "店铺端,售后管理接口") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java index f967539c..8e18e1f4 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/BillStoreController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,结算单接口 * * @author Chopper - * @date 2020/11/17 4:29 下午 + * @since 2020/11/17 4:29 下午 */ @RestController @Api(tags = "店铺端,结算单接口") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java index 79279fc3..805d8c04 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/MemberEvaluationStoreController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,商品评价管理接口 * * @author Bulbasaur - * @date 2020-02-25 14:10:16 + * @since 2020-02-25 14:10:16 */ @RestController @Api(tags = "店铺端,商品评价管理接口") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java index 77e46b75..06857b21 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderComplaintStoreController.java @@ -22,7 +22,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,交易投诉接口 * * @author paulG - * @date 2020/12/5 + * @since 2020/12/5 **/ @RestController @Api(tags = "店铺端,交易投诉接口") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java index 274c0eed..3cb8c185 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderLogStoreController.java @@ -19,7 +19,7 @@ import java.util.List; * 店铺端,订单日志接口 * * @author Chopper - * @date 2020/12/5 + * @since 2020/12/5 **/ @RestController @Api(tags = "店铺端,订单日志接口") diff --git a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java index 1290ded1..8e95caea 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/OrderStoreController.java @@ -38,7 +38,7 @@ import java.util.List; * 店铺端,订单接口 * * @author Chopper - * @date 2020/11/17 4:35 下午 + * @since 2020/11/17 4:35 下午 **/ @Slf4j @RestController diff --git a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java index a25d7d6f..9486452c 100644 --- a/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java +++ b/seller-api/src/main/java/cn/lili/controller/trade/ReceiptStoreController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * 店铺端,发票接口 * * @author Bulbasaur - * @date 2020/11/28 14:09 + * @since 2020/11/28 14:09 **/ @RestController @Api(tags = "店铺端,发票接口") diff --git a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java index d06df79d..f71abd3a 100644 --- a/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java +++ b/seller-api/src/main/java/cn/lili/security/StoreSecurityConfig.java @@ -18,7 +18,7 @@ import org.springframework.web.cors.CorsConfigurationSource; * spring Security 核心配置类 Store安全配置中心 * * @author Chopper - * @date 2020/11/14 16:20 + * @since 2020/11/14 16:20 */ @Slf4j @Configuration