paulGao
|
d3e1de5620
|
fix XSS and BAC, improve code style
|
2021-09-09 16:47:14 +08:00 |
|
paulGao
|
cf6b1a60f4
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-09-07 02:05:14 +08:00 |
|
paulGao
|
5fcdbe8df9
|
fix settlement seckill promotion is not punctuality
|
2021-09-07 02:04:31 +08:00 |
|
paulGao
|
4063c8b063
|
improve esGoods parameter selector buckets(not get category and brand from db, add EsGoodsIndex Field BrandName,BrandUrl,CategoryNamePath)
|
2021-09-07 01:55:58 +08:00 |
|
Chopper
|
d84f3b547b
|
订单取消会员积分返回判定问题处理
|
2021-09-06 15:11:39 +08:00 |
|
Chopper
|
82d7ab1440
|
代码错误补充
|
2021-09-02 15:05:45 +08:00 |
|
OceansDeep
|
7ac15d1abe
|
!21 升级spring boot 版本，完善Elasticsearch搜索
Merge pull request !21 from OceansDeep/feature/pg
|
2021-09-02 03:44:14 +00:00 |
|
paulGao
|
8f10b6b2a6
|
improvement generator goods index to asynchronization
|
2021-09-02 11:40:26 +08:00 |
|
Chopper
|
a9f0eac6f7
|
默认收货地址代码优化。
积分商品/砍价商品库存问题处理
|
2021-09-02 10:00:57 +08:00 |
|
paulGao
|
fe675d6ac4
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-09-02 09:07:07 +08:00 |
|
Chopper
|
fb006e13a0
|
拼团活动同一店铺同一时间限制一个活动取消。
积分订单库存扣减，积分返还处理。
其他促销相关优化
|
2021-09-01 19:10:16 +08:00 |
|
paulGao
|
2e80478203
|
upgrade spring boot 2.3 to 2.4
|
2021-09-01 19:03:36 +08:00 |
|
Chopper
|
3c9c3c2c17
|
店铺商品数量变更问题处理。
|
2021-09-01 10:42:47 +08:00 |
|
Chopper
|
e9075a94f3
|
秒杀活动自动创建调整为7天
|
2021-08-31 17:42:27 +08:00 |
|
Chopper
|
d7e4948447
|
解决几个阿里规约相关的代码问题
|
2021-08-30 18:00:41 +08:00 |
|
Chopper
|
f8c1e9d8b8
|
去除jpa依赖，部分不相关的代码去除。
|
2021-08-30 14:32:49 +08:00 |
|
lifenlong
|
74f92506d0
|
修改砍价、积分商品活动库存
|
2021-08-28 07:56:55 +08:00 |
|
Chopper
|
3d158125f9
|
满优惠notice调整，满优惠信息写入购物车时机调整。
|
2021-08-26 11:05:05 +08:00 |
|
Chopper
|
fbb750927f
|
赠品支付状态显示待支付问题处理
|
2021-08-26 09:23:12 +08:00 |
|
Chopper
|
a971066909
|
满减优惠问题相关处理，秒杀商品打开页面异常问题处理
|
2021-08-25 20:58:09 +08:00 |
|
Chopper
|
1424eaa90f
|
积分兑换，结算页面积分支付展示问题处理。
店铺商品变更店铺商品数量展示同步。
|
2021-08-20 16:12:29 +08:00 |
|
Chopper
|
e141d22504
|
促销相关代码批量提交
|
2021-08-20 15:47:54 +08:00 |
|
lifenlong
|
7276824a18
|
秒杀活动启动修改mongo
修改部分代码规范
|
2021-08-20 09:40:06 +08:00 |
|
lifenlong
|
7941b74efb
|
积分订单取消回退积分
|
2021-08-13 10:36:15 +08:00 |
|
lifenlong
|
ebeec5e8a4
|
订单退单扣除积分错误
|
2021-08-12 21:11:12 +08:00 |
|
lifenlong
|
100d5d3317
|
解决分销佣金冻结错误
|
2021-08-12 00:35:39 +08:00 |
|
pikachu
|
28cde4817a
|
充值订单超时取消功能
|
2021-08-11 19:49:22 +08:00 |
|
pikachu
|
3648929ed3
|
积分类型修改
|
2021-08-06 19:17:16 +08:00 |
|
Chopper
|
829472c6a3
|
Merge remote-tracking branch 'origin/qiuqiu'
合并砍价/积分相关
# Conflicts:
# consumer/src/main/java/cn/lili/event/impl/MemberPointExecute.java
# update-sql/version4.2to4.3.sql
|
2021-07-30 15:50:36 +08:00 |
|
Chopper
|
02327402a8
|
代码接口，异常规范问题处理。
|
2021-07-29 17:00:15 +08:00 |
|
Chopper
|
f8ae17b360
|
去除无效代码
|
2021-07-29 15:26:48 +08:00 |
|
Chopper
|
8e30ae435f
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-28 11:19:38 +08:00 |
|
Chopper
|
f00386c81d
|
继续优化代码，调整依赖关系，缩减无效代码
|
2021-07-28 11:19:33 +08:00 |
|
pikachu
|
0dd8488e19
|
Merge branch 'master' into pipi
|
2021-07-27 19:44:36 +08:00 |
|
pikachu
|
a7f26ff19e
|
站内信消息完善
|
2021-07-27 19:43:16 +08:00 |
|
lifenlong
|
1b60079481
|
取消订单，恢复积分
|
2021-07-27 16:58:38 +08:00 |
|
Chopper
|
e99aeeede5
|
热词功能处理，提供redis自定义增加权重值的方法
|
2021-07-25 17:45:46 +08:00 |
|
Chopper
|
d6b59c23af
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-22 12:17:15 +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 |
|
lifenlong
|
66e9a4f4cc
|
解决店铺-商品列表页面库存与Sku库存不对应问题
|
2021-07-22 10:47:42 +08:00 |
|
pikachu
|
41835aaece
|
站内信消息优化
|
2021-07-21 19:38:59 +08:00 |
|
pikachu
|
9f3a4dbf68
|
去掉无用代码以及对站内信模版等进行了优化
|
2021-07-21 19:36:04 +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 |
|
Chopper
|
bc6abdbf1a
|
初步调整结构完成
|
2021-07-21 15:23:47 +08:00 |
|
lifenlong
|
44fb0601a6
|
解决商品购买但是商品页面的库存显示不正确的问题
|
2021-07-20 20:25:57 +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 |
|
Chopper
|
86f010b87e
|
maven 规范
|
2021-07-12 16:33:32 +08:00 |
|