lifenlong
|
bfc76f7ceb
|
同步master
|
2021-06-18 10:03:34 +08:00 |
|
pikachu
|
0cfb196918
|
Merge branch 'master' into qiuqiu
|
2021-06-18 07:55:53 +08:00 |
|
pikachu
|
975550374a
|
新增会员站内信消息
|
2021-06-18 07:55:25 +08:00 |
|
lifenlong
|
67e31bff07
|
同步master
|
2021-06-17 11:15:56 +08:00 |
|
Chopper
|
0995a3b75f
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-06-17 10:38:07 +08:00 |
|
Chopper
|
7ce5b517fc
|
商品评价场景，查询业务重构，代码复用增强，前端可以查看到后端设置隐藏的评价内容问题解决
|
2021-06-17 10:37:11 +08:00 |
|
paulGao
|
c69cd0c22d
|
修复拼团商品下单问题和添加商品是否需要索引
|
2021-06-17 09:11:16 +08:00 |
|
lifenlong
|
fbcd5b7470
|
app版本修改，过滤当前版本
|
2021-06-17 00:28:36 +08:00 |
|
Chopper
|
00182f5cfb
|
限制官网地区同步功能
|
2021-06-16 10:49:17 +08:00 |
|
Chopper
|
841903d2a6
|
优惠券活动问题处理
|
2021-06-15 18:10:25 +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 |
|
Chopper
|
24bb6a4169
|
代码同步
|
2021-06-15 15:28:33 +08:00 |
|
lifenlong
|
10dbed04b6
|
初始化秒杀活动
|
2021-06-13 16:27:40 +08:00 |
|
lifenlong
|
5a4f8e2a72
|
同步
|
2021-06-13 09:03:16 +08:00 |
|
lifenlong
|
332e287675
|
修改虚拟订单类型
|
2021-06-10 20:13:21 +08:00 |
|
Chopper
|
9195292aa9
|
演示站点部分权限控制
|
2021-06-10 17:40:53 +08:00 |
|
Chopper
|
da1863850a
|
主要完善延时任务相关，缺失的注释信息，log记录的信息完善。目录结构优化。
sql数据过大，展示sql默认为false，需要打开手动打开就好。
|
2021-06-08 18:40:32 +08:00 |
|
lifenlong
|
a51e86fd98
|
去除e.printStackTrace();使用slf4j实现
|
2021-06-07 16:49:59 +08:00 |
|
Chopper
|
f949896685
|
地区数据初始化之后，数据无法访问，因为缓存没有更新。现在更新为初始化完成，即清空与地区相关的缓存
|
2021-06-07 15:27:48 +08:00 |
|
lifenlong
|
bbe01e9e67
|
用户经验值设置
|
2021-06-05 17:13:04 +08:00 |
|
lifenlong
|
e379a2eb34
|
导出售后单
|
2021-06-05 14:48:16 +08:00 |
|
lifenlong
|
b7e439e177
|
店铺导出订单列表
|
2021-06-05 14:04:56 +08:00 |
|
lifenlong
|
73002148d4
|
1.展示店铺的商品数量、收藏数量
2.动态时间优惠券进行状态判断。
3.导出订单API
|
2021-06-04 15:42:35 +08:00 |
|
lifenlong
|
9db40c197d
|
延时任务修改直播间状态
|
2021-06-03 10:54:48 +08:00 |
|
lifenlong
|
07b9e413d6
|
添加秒杀活动设置
|
2021-06-02 17:30:32 +08:00 |
|
Chopper
|
83c86ab1da
|
优化管理端首页数据统计
|
2021-06-02 15:42:54 +08:00 |
|
lifenlong
|
6fb7322e3e
|
Merge branch 'master' into Bulbasaur
|
2021-06-01 15:51:50 +08:00 |
|
lifenlong
|
b70da68761
|
Merge branch 'Bulbasaur' of https://gitee.com/beijing_hongye_huicheng/lilishop into Bulbasaur
|
2021-06-01 15:51:30 +08:00 |
|
lifenlong
|
0324951d9a
|
微信小程序优化
|
2021-06-01 15:51:19 +08:00 |
|
Chopper
|
78aee87b45
|
Merge branch 'Bulbasaur' of gitee.com:beijing_hongye_huicheng/lilishop into Bulbasaur
|
2021-05-31 11:34:47 +08:00 |
|
Chopper
|
e09747c410
|
支持elk
|
2021-05-31 11:34:43 +08:00 |
|
lifenlong
|
814d118d77
|
运营后台可设置推荐直播间
|
2021-05-28 12:10:33 +08:00 |
|
Chopper
|
b855cfb5f8
|
积分商品店铺名称问题处理
|
2021-05-26 09:27:27 +08:00 |
|
lifenlong
|
d9ccc4a7b7
|
添加秒杀活动设置
|
2021-05-25 08:29:07 +08:00 |
|
lifenlong
|
e7e29da455
|
秒杀活动增加活动商品数量
|
2021-05-25 08:02:31 +08:00 |
|
lifenlong
|
16cc989cdf
|
设置秒杀活动为自动开启
|
2021-05-24 18:18:24 +08:00 |
|
lifenlong
|
777226dc95
|
优惠券活动发送/触发
|
2021-05-24 11:09:21 +08:00 |
|
lifenlong
|
8924981556
|
创建优惠券活动
|
2021-05-21 19:54:25 +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 |
|
lifenlong
|
4c200595a5
|
设置 app版本白名单
|
2021-05-21 14:18:07 +08:00 |
|
lifenlong
|
4b1205c3d3
|
APP版本升级
|
2021-05-21 11:59:31 +08:00 |
|
lifenlong
|
a15d5d7c36
|
Merge branch 'master' into Bulbasaur
|
2021-05-20 16:42:06 +08:00 |
|
lifenlong
|
e73d189022
|
解决分销绑定问题
|
2021-05-20 16:20:18 +08:00 |
|
lifenlong
|
b427daab02
|
添加平台审核售后单功能
|
2021-05-20 15:38:22 +08:00 |
|
lifenlong
|
273d0abbc7
|
解决冲突
|
2021-05-19 19:38:17 +08:00 |
|
lifenlong
|
250fffab77
|
merge master
|
2021-05-19 19:29:51 +08:00 |
|
lifenlong
|
120189ef99
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2021-05-19 19:13:53 +08:00 |
|
lifenlong
|
64c095f20e
|
分销订单
|
2021-05-19 19:11:57 +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 |
|