Chopper
|
50911137cb
|
购物车逻辑相关处理
|
2021-06-21 11:55:08 +08:00 |
|
Chopper
|
9546807031
|
流量限制设定更合理
|
2021-06-21 10:53:04 +08:00 |
|
lifenlong
|
24be8f342d
|
解决冲突
|
2021-06-18 10:12:15 +08:00 |
|
lifenlong
|
bfc76f7ceb
|
同步master
|
2021-06-18 10:03:34 +08:00 |
|
Chopper
|
cbcadc21a2
|
xss还原
|
2021-06-17 16:43:37 +08:00 |
|
Chopper
|
e01c279cfe
|
支付宝支付h5 无法支付成功，检查时回调参数格式问题，现重新整理上线
|
2021-06-17 16:31:40 +08:00 |
|
Chopper
|
897600335e
|
支付title 字符串过滤
|
2021-06-17 15:06:24 +08:00 |
|
Chopper
|
383dbb2d4e
|
测试环境短信问题处理 ，默认6个1发送
|
2021-06-17 15:05:50 +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 |
|
lifenlong
|
34e5488b9d
|
创建虚拟订单
由前台处理待发货订单导出
|
2021-06-10 16:25:40 +08:00 |
|
Chopper
|
89f4b71301
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-06-10 09:16:36 +08:00 |
|
Chopper
|
fc66db2d13
|
修改注释
|
2021-06-10 09:15:31 +08:00 |
|
lifenlong
|
7c8c692e87
|
去除xss空格过滤
|
2021-06-09 18:21:11 +08:00 |
|
Chopper
|
f7201342d9
|
代码规范度问题处理，注释补充。
|
2021-06-09 16:29:49 +08:00 |
|
Chopper
|
da1863850a
|
主要完善延时任务相关，缺失的注释信息，log记录的信息完善。目录结构优化。
sql数据过大，展示sql默认为false，需要打开手动打开就好。
|
2021-06-08 18:40:32 +08:00 |
|
Chopper
|
c2367f763f
|
订单支付金额为0时问题解决。
|
2021-06-07 17:36:48 +08:00 |
|
lifenlong
|
a51e86fd98
|
去除e.printStackTrace();使用slf4j实现
|
2021-06-07 16:49:59 +08:00 |
|
Chopper
|
6d7e9e7fdd
|
阿里sms默认短信验证码配置问题处理
|
2021-06-07 16:12:07 +08:00 |
|
lifenlong
|
86360cf5f8
|
Merge branch 'master' into Bulbasaur
|
2021-06-07 15:08:36 +08:00 |
|
Chopper
|
f9f8cce13e
|
xss防御相关更改策略，调整代码
|
2021-06-07 15:00:36 +08:00 |
|
lifenlong
|
4849e7d57e
|
同步 master
|
2021-06-07 10:02:23 +08:00 |
|
Chopper
|
9fedc25f3f
|
安全问题
|
2021-06-04 10:55:35 +08:00 |
|
lifenlong
|
f802810330
|
添加直播间状态变化延时任务
|
2021-06-01 17:23:32 +08:00 |
|
lifenlong
|
99b9e8cf91
|
导出订单发货Excel，上传Excel订单批量发货
|
2021-05-26 17:09:55 +08:00 |
|
lifenlong
|
116a52ea14
|
合并
|
2021-05-25 08:10:41 +08:00 |
|
paulGao
|
43ea8cd005
|
修复优惠券价格分摊不对问题
|
2021-05-24 20:03:17 +08:00 |
|
lifenlong
|
16cc989cdf
|
设置秒杀活动为自动开启
|
2021-05-24 18:18:24 +08:00 |
|
lifenlong
|
16498a6850
|
Merge branch 'master' into Bulbasaur
|
2021-05-21 17:25:15 +08:00 |
|
lifenlong
|
ae69d8a11b
|
检测APP版本是否可以添加
|
2021-05-21 17:24:09 +08:00 |
|
Chopper
|
3b21fede61
|
系统设置使用缓存代理，不再直接读取数据库
|
2021-05-21 11:11:41 +08:00 |
|
Chopper
|
1c95a56f44
|
短信发送模版问题优化
|
2021-05-21 11:11:27 +08:00 |
|
Chopper
|
1f1e57645c
|
短信发送
|
2021-05-21 10:44:33 +08:00 |
|
lifenlong
|
64add7e63f
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2021-05-21 10:43:51 +08:00 |
|
lifenlong
|
1b5a715695
|
修改readme框架列表展示
|
2021-05-21 10:43:29 +08:00 |
|
Chopper
|
f119416a7b
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-05-21 09:52:21 +08:00 |
|
Chopper
|
5c01e131d9
|
库存确认部分异常问题
|
2021-05-21 09:52:18 +08:00 |
|
OceansDeep
|
c729726dd6
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-05-20 20:00:38 +08:00 |
|
paulGao
|
eaf3aa2b2f
|
修复优惠券价格计算分摊问题
|
2021-05-20 19:59:10 +08:00 |
|
paulGao
|
aa024c87b2
|
修复延时任务无效问题
|
2021-05-20 17:03:08 +08:00 |
|
lifenlong
|
a15d5d7c36
|
Merge branch 'master' into Bulbasaur
|
2021-05-20 16:42:06 +08:00 |
|
Chopper
|
0f0f480b24
|
订单中的商品数量累加问题处理。
延时任务日志增加
|
2021-05-20 15:55:12 +08:00 |
|
lifenlong
|
2326a5963f
|
Merge branch 'master' into Bulbasaur
|
2021-05-20 11:36:09 +08:00 |
|
Chopper
|
2fc9f5bbfb
|
无引用代码删除，代码格式化
|
2021-05-20 10:57:10 +08:00 |
|
Chopper
|
b839bd7b77
|
抛出的错误吗规范
|
2021-05-19 20:21:59 +08:00 |
|
lifenlong
|
273d0abbc7
|
解决冲突
|
2021-05-19 19:38:17 +08:00 |
|
lifenlong
|
250fffab77
|
merge master
|
2021-05-19 19:29:51 +08:00 |
|
Chopper
|
97defc8a12
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
# manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
|
2021-05-19 16:36:35 +08:00 |
|