22 Commits

Author SHA1 Message Date
paulGao
d3e1de5620 fix XSS and BAC, improve code style 2021-09-09 16:47:14 +08:00
paulGao
5fcdbe8df9 fix settlement seckill promotion is not punctuality 2021-09-07 02:04:31 +08:00
Chopper
fdb55bc426 Merge branch 'backup'
# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/DraftGoodsServiceImpl.java
#	framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/TradeServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/FullDiscountServiceImpl.java
2021-07-22 12:07:22 +08:00
Chopper
bd3aceaeac 完善方法注释 2021-07-21 17:46:46 +08:00
Chopper
bc6abdbf1a 初步调整结构完成 2021-07-21 15:23:47 +08:00
Chopper
fe021f8a11 暂时备份一下代码,准备切换master 2021-07-20 15:44:09 +08:00
Chopper
4b7ab94ba4 批量调整目录结构 2021-07-19 16:07:02 +08:00
Chopper
a9c79eedd4 代码结构优化,缩减。一个多次判定问题处理 2021-07-16 10:40:44 +08:00
lifenlong
18d2379a19 采用阿里代码规约,对代码进行优化 2021-07-09 08:42:16 +08:00
lifenlong
3e73257922 采用阿里代码规约,对代码进行优化 2021-07-09 01:56:24 +08:00
Chopper
c7e4af6175 注释规范 2021-06-21 14:14:07 +08:00
Chopper
841903d2a6 优惠券活动问题处理 2021-06-15 18:10:25 +08:00
Chopper
5f403ec675 合并master业务代码 2021-06-15 16:21:03 +08:00
Chopper
a97b698d8e Merge branch 'master' into Bulbasaur
# Conflicts:
#	consumer/src/main/java/cn/lili/timetask/handler/impl/promotion/PromotionEverydayExecute.java
#	consumer/src/main/java/cn/lili/trigger/executor/PromotionTimeTriggerExecutor.java
#	framework/src/main/java/cn/lili/common/trigger/delay/AbstractDelayQueueMachineFactory.java
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
#	framework/src/main/java/cn/lili/modules/promotion/serviceimpl/CouponServiceImpl.java
2021-06-15 15:50:54 +08:00
lifenlong
5a4f8e2a72 同步 2021-06-13 09:03:16 +08:00
Chopper
ebebbcac69 延时任务规范,任务调度机制,修改为consumer执行,不再被每个进程监控。 2021-06-11 11:59:21 +08:00
Chopper
da1863850a 主要完善延时任务相关,缺失的注释信息,log记录的信息完善。目录结构优化。
sql数据过大,展示sql默认为false,需要打开手动打开就好。
2021-06-08 18:40:32 +08:00
lifenlong
f802810330 添加直播间状态变化延时任务 2021-06-01 17:23:32 +08:00
lifenlong
777226dc95 优惠券活动发送/触发 2021-05-24 11:09:21 +08:00
Chopper
4cea9038eb 增加注释 2021-05-17 10:42:06 +08:00
lifenlong
a10c38f3c1 去除final使用@Autowired 2021-05-13 15:07:03 +08:00
Chopper
3785bdb3bb commit message 2021-05-13 10:41:46 +08:00