paulGao
|
2e80478203
|
upgrade spring boot 2.3 to 2.4
|
2021-09-01 19:03:36 +08:00 |
|
Chopper
|
f8c1e9d8b8
|
去除jpa依赖，部分不相关的代码去除。
|
2021-08-30 14:32:49 +08:00 |
|
Chopper
|
cdfdf483d6
|
管理员删除时，管理员角色没有同步删除问题处理
|
2021-08-27 16:25:37 +08:00 |
|
Chopper
|
3a14e96c5d
|
优化一段代码，去除无效的逻辑，增加一个秒杀活动错误码
|
2021-08-26 15:58:42 +08:00 |
|
Chopper
|
a971066909
|
满减优惠问题相关处理，秒杀商品打开页面异常问题处理
|
2021-08-25 20:58:09 +08:00 |
|
Chopper
|
ef0eeda469
|
验证码模块完善，增加配置项：
#验证码设置
verification-code:
#图形验证码有效时间 秒 包含滑块验证码有效时间， 以及验证通过之后，缓存中存储的验证结果有效时间
effectiveTime: 300
#水印
watermark: LILI-SHOP
#干扰项数量 最大2 默认0
interfereNum: 1
#允许误差像素
faultTolerant: 3
|
2021-08-23 17:45:25 +08:00 |
|
Chopper
|
e141d22504
|
促销相关代码批量提交
|
2021-08-20 15:47:54 +08:00 |
|
OceansDeep
|
dbc5305ea7
|
!20 add elasticsearch progress
Merge pull request !20 from OceansDeep/feature/pg
|
2021-08-11 18:18:15 +00:00 |
|
paulGao
|
48146edee9
|
add elasticsearch progress
|
2021-08-12 02:16:20 +08:00 |
|
Chopper
|
9e3eb1f74e
|
订单申诉完成是，无需进行撤销申诉操作
|
2021-08-12 00:28:46 +08:00 |
|
Chopper
|
f12c8a1aec
|
活动时间校验问题处理
|
2021-08-11 20:12:17 +08:00 |
|
Chopper
|
74cc360900
|
促销活动创建，时间错误问题处理
|
2021-08-11 19:13:45 +08:00 |
|
Chopper
|
b0b9420a8e
|
店铺分类维护信息错误问题处理。
|
2021-08-04 17:59:40 +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
|
f00386c81d
|
继续优化代码，调整依赖关系，缩减无效代码
|
2021-07-28 11:19:33 +08:00 |
|
lifenlong
|
02f3bde2b4
|
积分订单、用户下单积分数值判断
|
2021-07-27 15:33:11 +08:00 |
|
lifenlong
|
5a7440c5bf
|
同步master，解决冲突
|
2021-07-27 10:00:34 +08:00 |
|
pikachu
|
094212e6a2
|
提现审核
|
2021-07-24 17:39:49 +08:00 |
|
lifenlong
|
abdc74c773
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2021-07-23 19:45:21 +08:00 |
|
lifenlong
|
2c8ac59628
|
优化商品显示逻辑
售后价格判断
|
2021-07-23 19:44:46 +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
|
37348335b2
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
修正优惠券提示语
|
2021-07-20 19:41:40 +08:00 |
|
Chopper
|
8f351fdb8b
|
对消息增加默认状态码
|
2021-07-20 19:38:21 +08:00 |
|
lifenlong
|
d6d0afa23a
|
String 类型转换使用hutool
|
2021-07-20 17:29:08 +08:00 |
|
Chopper
|
fe021f8a11
|
暂时备份一下代码，准备切换master
|
2021-07-20 15:44:09 +08:00 |
|
Chopper
|
4b7ab94ba4
|
批量调整目录结构
|
2021-07-19 16:07:02 +08:00 |
|
Chopper
|
06212c073d
|
调整目录结构
|
2021-07-19 15:01:51 +08:00 |
|
lifenlong
|
451d683c4f
|
Merge branch 'master' into qiuqiu
|
2021-07-18 13:43:45 +08:00 |
|
Chopper
|
a9c79eedd4
|
代码结构优化，缩减。一个多次判定问题处理
|
2021-07-16 10:40:44 +08:00 |
|
Chopper
|
ac5d04ddc2
|
调整代码结构
|
2021-07-16 09:55:38 +08:00 |
|
lifenlong
|
0f8a5aba05
|
1.完善砍价商品加入购物车。
2.完善砍价帮砍
3.完善砍价价格计算。
|
2021-07-14 08:47:13 +08:00 |
|
pikachu
|
656e2a9307
|
合并
|
2021-07-12 23:41:23 +08:00 |
|
pikachu
|
7f08124afc
|
砍价活动第一版本
|
2021-07-12 23:38:32 +08:00 |
|
Chopper
|
b6a5630021
|
获取用户问题处理
|
2021-07-12 12:30:22 +08:00 |
|
Chopper
|
8302ca2e3a
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
|
2021-07-09 14:46:12 +08:00 |
|
Chopper
|
17b977ef94
|
对索引生成判定进行处理
|
2021-07-09 14:46:03 +08:00 |
|
lifenlong
|
512a298cc9
|
Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop
|
2021-07-09 11:56:19 +08:00 |
|
lifenlong
|
86625e9e9d
|
增加订单申请售后失效、订单投诉申请失效天数。
|
2021-07-09 11:55:43 +08:00 |
|
Chopper
|
a599fb9d01
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
# framework/src/main/java/cn/lili/common/security/context/UserContext.java
# framework/src/main/java/cn/lili/common/security/context/UserContextInit.java
|
2021-07-09 11:17:08 +08:00 |
|
Chopper
|
89b057dfca
|
去除无效代码，规范代码
|
2021-07-09 11:16:11 +08:00 |
|
lifenlong
|
3e73257922
|
采用阿里代码规约，对代码进行优化
|
2021-07-09 01:56:24 +08:00 |
|
pikachu
|
0e7a4ee06c
|
Merge branch 'master' into qiuqiu
|
2021-07-06 18:36:01 +08:00 |
|
pikachu
|
531ca13555
|
砍价商品
|
2021-07-06 18:35:40 +08:00 |
|
lifenlong
|
6235faba96
|
优化颠婆分类
|
2021-07-06 10:43:16 +08:00 |
|
lifenlong
|
177cd86366
|
支持添加重复名称的商品分类
|
2021-07-05 11:14:15 +08:00 |
|
lifenlong
|
931276f72b
|
添加ResultCode
|
2021-07-01 11:17:18 +08:00 |
|
lifenlong
|
f6706d6394
|
1.使用hutool进行Object to Int格式转换
2.添加部分resultCode
|
2021-07-01 08:33:19 +08:00 |
|