fengtianyangyang
|
87f637099c
|
'合并master'
|
2022-01-11 14:50:06 +08:00 |
|
paulGao
|
c3221a6fff
|
优化代码结构。优化促销更新。
|
2021-12-29 11:53:46 +08:00 |
|
paulGao
|
f9a8675942
|
修复优化促销
|
2021-12-25 18:35:44 +08:00 |
|
paulGao
|
3ba4d24041
|
优化促销。移除结算时促销的依赖。规范部分isxxx字段命名
|
2021-12-21 18:54:11 +08:00 |
|
paulGao
|
7dcdb43acf
|
优化促销相关代码,修复bug
|
2021-12-16 15:02:06 +08:00 |
|
fengtianyangyang
|
efc4b37782
|
'RequestMapping请求路径统一处理'
|
2021-12-15 18:32:59 +08:00 |
|
paulGao
|
c3fbad7dbf
|
移除mongo,将系统日志存储在es。修复拼团商品的正常购买价格为拼团价格问题
|
2021-12-13 18:15:37 +08:00 |
|
paulGao
|
d9d19f8cbd
|
重构优化促销模块。移除促销相关的mongo
|
2021-12-10 20:15:03 +08:00 |
|
paulGao
|
f99b65b2e6
|
fix coupon get error
|
2021-09-10 10:57:34 +08:00 |
|
paulGao
|
0bbefb516d
|
fix seckill get error
|
2021-09-10 10:49:27 +08:00 |
|
paulGao
|
d3e1de5620
|
fix XSS and BAC, improve code style
|
2021-09-09 16:47:14 +08:00 |
|
Chopper
|
e9075a94f3
|
秒杀活动自动创建调整为7天
|
2021-08-31 17:42:27 +08:00 |
|
lifenlong
|
64e45c10b1
|
增加店铺企业信息接口
增加删除商品
修复:修改订单金额售后金额不正确
|
2021-08-11 20:14:56 +08:00 |
|
lifenlong
|
02f3bde2b4
|
积分订单、用户下单积分数值判断
|
2021-07-27 15:33:11 +08:00 |
|
lifenlong
|
5a7440c5bf
|
同步master,解决冲突
|
2021-07-27 10:00:34 +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
|
0ccdc94644
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-21 17:46:58 +08:00 |
|
Chopper
|
bd3aceaeac
|
完善方法注释
|
2021-07-21 17:46:46 +08:00 |
|
lifenlong
|
dd491e38e5
|
进行中的满减活动可以关闭
|
2021-07-21 15:13:50 +08:00 |
|
lifenlong
|
6607506929
|
砍价订单实现
|
2021-07-20 16:18:54 +08:00 |
|
Chopper
|
fe021f8a11
|
暂时备份一下代码,准备切换master
|
2021-07-20 15:44:09 +08:00 |
|
lifenlong
|
5d211c241d
|
砍价活动商品购买
|
2021-07-17 14:02:34 +08:00 |
|
lifenlong
|
4718ce292d
|
修改砍价活动
|
2021-07-13 16:17:53 +08:00 |
|
pikachu
|
7f08124afc
|
砍价活动第一版本
|
2021-07-12 23:38:32 +08:00 |
|
pikachu
|
531ca13555
|
砍价商品
|
2021-07-06 18:35:40 +08:00 |
|
lifenlong
|
931276f72b
|
添加ResultCode
|
2021-07-01 11:17:18 +08:00 |
|
Chopper
|
e5b9280b7e
|
关闭券活动
|
2021-06-18 16:36:53 +08:00 |
|
Chopper
|
c787b4762b
|
优惠券问题粗粝
|
2021-06-18 16:20:00 +08:00 |
|
Chopper
|
7113914ccd
|
交互对象调整
|
2021-06-18 14:23:51 +08:00 |
|
Chopper
|
841903d2a6
|
优惠券活动问题处理
|
2021-06-15 18:10:25 +08:00 |
|
Chopper
|
24bb6a4169
|
代码同步
|
2021-06-15 15:28:33 +08:00 |
|
lifenlong
|
10dbed04b6
|
初始化秒杀活动
|
2021-06-13 16:27:40 +08:00 |
|
lifenlong
|
bbe01e9e67
|
用户经验值设置
|
2021-06-05 17:13:04 +08:00 |
|
lifenlong
|
b7e439e177
|
店铺导出订单列表
|
2021-06-05 14:04:56 +08:00 |
|
lifenlong
|
07b9e413d6
|
添加秒杀活动设置
|
2021-06-02 17:30:32 +08:00 |
|
lifenlong
|
6fb7322e3e
|
Merge branch 'master' into Bulbasaur
|
2021-06-01 15:51:50 +08:00 |
|
Chopper
|
b855cfb5f8
|
积分商品店铺名称问题处理
|
2021-05-26 09:27:27 +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 |
|
Chopper
|
a10110e1f0
|
调整异常机制
|
2021-05-19 14:11:12 +08:00 |
|
Chopper
|
0528a1e1ca
|
错误消息机制问题重新处理
|
2021-05-18 15:40:26 +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 |
|