2276 Commits

Author SHA1 Message Date
lifenlong
9bd1e6344a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-05-20 10:14:13 +08:00
lifenlong
683e47425c 会员评价更改商品索引中的数量 2021-05-20 10:14:02 +08:00
Chopper
5c41b06381 订单日志中,名称展示问题处理 2021-05-20 10:09:12 +08:00
Chopper
4873d4bda3 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
商品参数问题merge
2021-05-20 09:51:33 +08:00
Chopper
1eee2eb5b1 商品数量增加已删除过滤 2021-05-20 09:50:29 +08:00
lifenlong
cd60eba7a4 微信媒体工具类(临时图片上传) 2021-05-20 09:00:46 +08:00
pikachu
bb2a28aae0 去掉参数类型 2021-05-20 08:32:02 +08:00
paulGao
d3fdeef0c3 修复商品搜索多选问题和定时任务取消过期促销活动时,没有删除es索引中的过期信息问题 2021-05-19 22:16:05 +08:00
Chopper
b839bd7b77 抛出的错误吗规范 2021-05-19 20:21:59 +08:00
lifenlong
273d0abbc7 解决冲突 2021-05-19 19:38:17 +08:00
lifenlong
250fffab77 merge master 2021-05-19 19:29:51 +08:00
lifenlong
120189ef99 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-05-19 19:13:53 +08:00
lifenlong
64c095f20e 分销订单 2021-05-19 19:11:57 +08:00
Chopper
97defc8a12 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop
# Conflicts:
#	manager-api/src/main/java/cn/lili/controller/member/MemberPointsHistoryManagerController.java
2021-05-19 16:36:35 +08:00
Chopper
5ab2865f0d 购物车物流规则匹配问题处理 2021-05-19 16:35:27 +08:00
Chopper
edfd75d31b 商品es问题处理 2021-05-19 16:35:14 +08:00
Chopper
3a6ce0b22c 如果商品开启审核,并且商品设置为立即上架,则将商品的上架状态修改为已上架 2021-05-19 14:47:17 +08:00
lifenlong
48f24b675b merge master 2021-05-19 14:26:35 +08:00
Chopper
a10110e1f0 调整异常机制 2021-05-19 14:11:12 +08:00
lifenlong
4b7be309b2 运营后台首页,展示的待审核商品数量不正确 2021-05-19 09:33:14 +08:00
lifenlong
8d156f01e6 会员积分历史 2021-05-19 09:07:56 +08:00
lifenlong
37a6455e56 会员积分历史 2021-05-19 09:05:44 +08:00
lifenlong
02827a2f8b 微信小程序直播V0.2 2021-05-18 23:34:05 +08:00
lifenlong
0173ba814e Merge branch 'master' into Bulbasaur 2021-05-18 17:35:48 +08:00
lifenlong
3925422b3e 批量发送短信任务 2021-05-18 17:27:43 +08:00
Chopper
0528a1e1ca 错误消息机制问题重新处理 2021-05-18 15:40:26 +08:00
Chopper
09cb489dc9 修改买家端店铺申请参数 2021-05-18 15:21:54 +08:00
Chopper
ea203d69a4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-05-18 14:21:34 +08:00
Chopper
e9f02cfe94 商品索引初始化没办法根据属性查询问题处理 2021-05-18 14:19:34 +08:00
lifenlong
0b1fce5803 调整移动端效果展示图尺寸 2021-05-18 10:38:01 +08:00
lifenlong
48293299e0 调整移动端效果展示图尺寸 2021-05-18 10:22:55 +08:00
lifenlong
90d03a05a2 增加店铺入驻文章类型。添加修改文章状态方法 2021-05-18 08:57:43 +08:00
lifenlong
0c3a1928ff merge master 2021-05-18 08:17:14 +08:00
lifenlong
a1924b609c Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 2021-05-17 18:19:34 +08:00
lifenlong
f824164139 开启短信功能 2021-05-17 18:19:28 +08:00
Chopper
9f63d5a164 调整店铺与会员关系问题 2021-05-17 17:21:45 +08:00
Chopper
089bf02144 增加star入口 2021-05-17 17:21:22 +08:00
lifenlong
910b665d8a 微信小程序直播V0.2 2021-05-17 17:03:28 +08:00
Chopper
9a7d5b62b1 会员是否有店铺字段处理 2021-05-17 16:36:32 +08:00
lifenlong
c049552fc7 去除冗余代码 2021-05-17 12:55:40 +08:00
lifenlong
b0f46a78a6 微信小程序直播间创建、微信小程序直播商品添加、删除、查询状态 2021-05-17 12:00:45 +08:00
Chopper
0465fb48d8 readme移动端图片宽度问题处理 2021-05-17 12:00:35 +08:00
Chopper
e89d201559 格式问题处理 2021-05-17 11:56:34 +08:00
Chopper
5297cbd09a readme更新 2021-05-17 11:54:47 +08:00
Chopper
d0d827ccfe 调整readme 2021-05-17 11:50:29 +08:00
Chopper
ff4de96f2a 去除一个无效的项目 2021-05-17 10:46:38 +08:00
Chopper
4cea9038eb 增加注释 2021-05-17 10:42:06 +08:00
lifenlong
591ce04e42 会员经验值设置 2021-05-17 09:24:58 +08:00
lifenlong
c8a43573fd 会员积分设置,会员下单赠送积分(非积分订单),订单售后扣除积分 2021-05-17 09:04:10 +08:00
lifenlong
9fae7ac565 Merge branch 'master' into Bulbasaur 2021-05-17 08:18:58 +08:00