561 Commits

Author SHA1 Message Date
lifenlong
44fb0601a6 解决商品购买但是商品页面的库存显示不正确的问题 2021-07-20 20:25:57 +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
f35ae5b1ee Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-07-20 19:27:48 +08:00
lifenlong
6a13351bc3 满折优惠活动+满折优惠券价格计算不正确。 2021-07-20 19:27:37 +08:00
Chopper
ecfe856fa7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-07-20 17:59:10 +08:00
Chopper
0c1d3236e8 商品读取缓存 2021-07-20 17:57:49 +08:00
lifenlong
d6d0afa23a String 类型转换使用hutool 2021-07-20 17:29:08 +08:00
lifenlong
6607506929 砍价订单实现 2021-07-20 16:18:54 +08:00
Chopper
fe021f8a11 暂时备份一下代码,准备切换master 2021-07-20 15:44:09 +08:00
Chopper
4b7ab94ba4 批量调整目录结构 2021-07-19 16:07:02 +08:00
Chopper
15ab6bfda4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-07-19 15:01:55 +08:00
Chopper
06212c073d 调整目录结构 2021-07-19 15:01:51 +08:00
lifenlong
eef270ff9c 砍价商品添加原价 2021-07-19 11:15:00 +08:00
lifenlong
3c27cd09ff Merge branch 'master' into qiuqiu 2021-07-18 18:32:35 +08:00
lifenlong
eda1e841bb Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-07-18 18:32:22 +08:00
lifenlong
dd213e7e33 砍价、积分商品订单价格计算 2021-07-18 18:30:37 +08:00
pikachu
9de55088ea 新增站内消息通知模版 2021-07-18 17:12:27 +08:00
lifenlong
451d683c4f Merge branch 'master' into qiuqiu 2021-07-18 13:43:45 +08:00
lifenlong
d4642d85dd Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-07-18 13:43:34 +08:00
lifenlong
5d211c241d 砍价活动商品购买 2021-07-17 14:02:34 +08:00
Chopper
a9c79eedd4 代码结构优化,缩减。一个多次判定问题处理 2021-07-16 10:40:44 +08:00
Chopper
ac5d04ddc2 调整代码结构 2021-07-16 09:55:38 +08:00
Chopper
caacb9e201 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-07-15 14:17:58 +08:00
Chopper
844bff971f 无效代码去除 2021-07-15 14:17:53 +08:00
lifenlong
0f8a5aba05 1.完善砍价商品加入购物车。
2.完善砍价帮砍
3.完善砍价价格计算。
2021-07-14 08:47:13 +08:00
pikachu
9ee5b4515a 修改积分参数命名规范 2021-07-13 19:55:42 +08:00
pikachu
2246b498d9 解决如果是扣减积分 积分变化错误 2021-07-13 19:43:49 +08:00
pikachu
93e4998b87 修改积分类型字段类型 2021-07-13 18:48:22 +08:00
lifenlong
4718ce292d 修改砍价活动 2021-07-13 16:17:53 +08:00
Chopper
a360fd2eda maven规范补充 2021-07-13 10:39:27 +08:00
lifenlong
e0ca366431 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-07-13 10:28:48 +08:00
lifenlong
3d3be0b283 查看店铺经营范围 2021-07-13 10:28:04 +08:00
pikachu
656e2a9307 合并 2021-07-12 23:41:23 +08:00
pikachu
7f08124afc 砍价活动第一版本 2021-07-12 23:38:32 +08:00
Chopper
86f010b87e maven 规范 2021-07-12 16:33:32 +08:00
Chopper
d29d166ce0 banner 统一 2021-07-12 14:44:11 +08:00
Chopper
3c78a06008 订单取消时,如未支付,则不需要进行退款处理 2021-07-12 12:41:00 +08:00
Chopper
b6a5630021 获取用户问题处理 2021-07-12 12:30:22 +08:00
Chopper
560ab5f102 调整readme 2021-07-10 14:13:53 +08:00
Chopper
da1b2c3aa8 精简readme 2021-07-10 14:08:56 +08:00
Chopper
7db5690a26 更新readme 2021-07-10 14:01:55 +08:00
Chopper
a1fcadf8b2 修改readme 2021-07-09 18:42:00 +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
18d2379a19 采用阿里代码规约,对代码进行优化 2021-07-09 08:42:16 +08:00