Chopper
|
fe8523ca3f
|
Merge branch 'backup'
# Conflicts:
# manager-api/src/main/java/cn/lili/controller/member/MemberManagerController.java
# manager-api/src/main/java/cn/lili/controller/other/PageDataManagerController.java
# manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java
# manager-api/src/main/java/cn/lili/controller/permission/MenuManagerController.java
# manager-api/src/main/java/cn/lili/controller/setting/RegionManagerController.java
# manager-api/src/main/java/cn/lili/controller/store/StoreManagerController.java
|
2021-07-25 17:51:05 +08:00 |
|
Chopper
|
0514bec994
|
管理端权限模块校验完善
|
2021-07-25 17:46:24 +08:00 |
|
Chopper
|
e99aeeede5
|
热词功能处理，提供redis自定义增加权重值的方法
|
2021-07-25 17:45:46 +08:00 |
|
lifenlong
|
1ee60c02d3
|
添加引用
|
2021-07-23 19:58:32 +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
|
280c5dec39
|
注解包调整
|
2021-07-22 17:33:57 +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 |
|
Chopper
|
bc6abdbf1a
|
初步调整结构完成
|
2021-07-21 15:23:47 +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 |
|
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
|
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 |
|
lifenlong
|
4718ce292d
|
修改砍价活动
|
2021-07-13 16:17:53 +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 |
|
lifenlong
|
18d2379a19
|
采用阿里代码规约，对代码进行优化
|
2021-07-09 08:42:16 +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
|
177cd86366
|
支持添加重复名称的商品分类
|
2021-07-05 11:14:15 +08:00 |
|
lifenlong
|
c10b698aed
|
支持文章传图
|
2021-07-03 13:40:18 +08:00 |
|
lifenlong
|
931276f72b
|
添加ResultCode
|
2021-07-01 11:17:18 +08:00 |
|
Chopper
|
079437100d
|
版本好升级
|
2021-06-30 19:59:36 +08:00 |
|
Chopper
|
23388eff6b
|
升级项目版本号
|
2021-06-30 14:53:26 +08:00 |
|
Chopper
|
d96d5edcd5
|
会员提现api注解问题处理
|
2021-06-29 10:13:18 +08:00 |
|
Chopper
|
ac68acda50
|
兼容性问题处理
|
2021-06-25 10:37:31 +08:00 |
|
Chopper
|
d99a4d2d50
|
商品参数编辑问题处理
|
2021-06-25 10:35:22 +08:00 |
|
Chopper
|
02d23dc217
|
1、主要解决商品参数后端存储格式问题，结构问题等
2、配送商品超出配送区域提出警告，但是依然可以下单问题处理
|
2021-06-25 09:46:38 +08:00 |
|
paulGao
|
0121c546f4
|
修复分类参数修改索引属性后没有同步到商品参数问题
|
2021-06-24 09:20:13 +08:00 |
|
Chopper
|
8d5d902550
|
管理端验证码登录校验
|
2021-06-23 16:47:16 +08:00 |
|
Chopper
|
7851e8af39
|
规格代码相关改版
|
2021-06-23 16:46:52 +08:00 |
|
Chopper
|
a5fa7cadcd
|
规格搜索以规格id为准
|
2021-06-23 09:44:53 +08:00 |
|
Chopper
|
911df97422
|
商品规格相关问题处理
|
2021-06-22 18:58:55 +08:00 |
|
OceansDeep
|
54408db0f0
|
Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg
|
2021-06-21 16:10:06 +00:00 |
|
paulGao
|
41a86ff7dc
|
修复商品索引参数问题
|
2021-06-22 00:07:33 +08:00 |
|
chopper711
|
eb1b6fac5c
|
!7 会员站内信功能相关合并
Merge pull request !7 from chopper711/qiuqiu
|
2021-06-21 14:16:44 +08:00 |
|