213 Commits

Author SHA1 Message Date
lele0521
071f15347e feat: 新增会员绑定手机号功能 2023-12-04 16:05:17 +08:00
misworga831
dfe6085432 fix: buyer端增加获取sku接口 2023-10-23 18:13:54 +08:00
misworga831
8b61d40ff8 fix: 优化部分优惠券初始化及搜索条件 2023-10-16 18:34:55 +08:00
misworga831
9189a6d433 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg 2023-08-25 14:06:07 +08:00
misworga831
51c4161f68 fix: 简单优化扫码登录,创建多个线程池导致的性能问题 2023-08-24 18:54:10 +08:00
pikachu1995@126.com
7d8a31c55a APP端第三方登录 2023-08-04 18:23:03 +08:00
Chopper711
7b6a150bd2 fix: 用户被禁用、店铺被禁用、管理员被禁用,token未被清除问题处理。 2023-04-19 12:08:47 +08:00
misworga831
efe9a1a6e4 fix: 修复管理员修改会员收货地址无效问题 2023-04-07 16:45:50 +08:00
misworga831
b07fc790e5 fix: 优化es商品搜索返回结果。减少重复返回结果 2023-03-31 16:49:42 +08:00
17600048398
f7e6789e23 会员收藏功能拆分 2023-03-10 17:42:48 +08:00
pikachu1995@126.com
674e585eff 去除错误打印内容 2023-03-10 07:45:56 +08:00
pikachu1995@126.com
f506fa86cc APP第三方信任登录通过unionid进行登录 2023-03-09 15:39:50 +08:00
pikachu1995@126.com
8d8cffca71 第三方登录集成unionID 2023-03-02 10:45:43 +08:00
pikachu1995@126.com
74972eaa37 合并master,解决冲突 2023-03-01 11:50:54 +08:00
pikachu1995@126.com
5ee07ec34d 用户提现-第三方支付提现,功能完善 2023-03-01 10:59:27 +08:00
Chopper711
61104b9cd3 fixbug:提现申请充值业务问题处理 2023-03-01 10:37:08 +08:00
pikachu1995@126.com
98907b33aa 存储新增:腾讯云、华为云
短信新增:腾讯云、华为云
物流新增:快递100
物流查询方式新增:快递查询地图轨迹
2023-02-16 18:16:37 +08:00
misworga831
cb7e1cc03e fix: 优化代码结构 2023-02-08 00:56:08 +08:00
17600048398
2df8df1a0d im功能拆分 2023-01-13 17:10:15 +08:00
Chopper711
cc12cecc2a merge 自提、IM功能 2023-01-09 18:00:40 +08:00
chc
73aa36fc69 IM消息功能 2022-12-27 18:14:47 +08:00
Chopper711
8543a228fd '优惠券功能改版' 2022-12-23 14:51:06 +08:00
chc
54e04be768 im 2022-11-24 18:13:30 +08:00
chc
cfd292ef18 自提 2022-11-22 17:20:17 +08:00
chc
706346338b 获取店铺首页 2022-10-25 19:13:03 +08:00
chc
e8e2e8e315 v4.2.5 2022-10-21 11:27:28 +08:00
chc
5a1c6b9e7f v4.2.5 2022-10-21 11:26:55 +08:00
chc
cb7814cbd6 买家端专题 2022-10-11 17:13:12 +08:00
paulGao
3549b216b0 fix: 优化扫描登录相关代码 2022-09-19 09:23:56 +08:00
fengtianyangyang
26dd8ed13a Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into fengtianyangyang_clerk
 Conflicts:
	DB/version4.2.3toMASTER.sql
	common-api/src/main/java/cn/lili/controller/common/SiteController.java
	common-api/src/main/java/cn/lili/controller/common/UploadController.java
	config/application.yml
	framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java
	framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java
	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
	framework/src/main/java/cn/lili/modules/page/serviceimpl/PageDataServiceImpl.java
2022-08-09 18:54:19 +08:00
xiaochangbai
7e596d47a6 fix: 修复相关bug 2022-08-08 11:11:28 +08:00
xiaochangbai
15adbf489e feat: app扫码登录 2022-08-07 21:35:27 +08:00
paulGao
727ddd3198 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-07-04 18:31:49 +08:00
paulGao
7b535434ae 代码优化,修复订单投诉问题 2022-07-04 18:31:36 +08:00
zypy333
d189f55de1
修正方法命名 2022-07-01 03:18:20 +00:00
paulGao
d14763d52c 优化代码,增加buyer启动时检测es索引存在,如不存在则自动创建 2022-06-09 15:32:24 +08:00
Chopper
a22ccbdda5 兼容MINIO 2022-06-07 09:35:58 +08:00
Chopper
57cf3b94e0 足迹分页相关问题处理 2022-05-13 11:19:02 +08:00
Chopper
a6d734bacf Merge branch 'hotwords'
热词功能,管理端权限存在的问题处理
# Conflicts:
#	framework/src/main/java/cn/lili/modules/order/order/serviceimpl/StoreFlowServiceImpl.java
#	framework/src/main/java/cn/lili/modules/search/serviceimpl/EsGoodsSearchServiceImpl.java
#	manager-api/src/main/java/cn/lili/controller/hotwords/HotWordsManagerController.java
2022-04-25 18:32:46 +08:00
Chopper
947a82eac5 热词统计,热词功能改版 2022-04-19 09:28:26 +08:00
paulGao
37c5ce541b 优化楼层装修 2022-04-17 21:46:34 +08:00
fengtianyangyang
4cdb461c22 配置文件修改及sql 2022-04-07 17:35:22 +08:00
Chopper
cf01011504 注销功能接口提供完善 2022-03-31 16:49:12 +08:00
Chopper
9ee76b5328 取消一个无实际作用的限流注解
订单买家端可以查询到别人的订单问题处理
2022-03-10 15:31:23 +08:00
Chopper
c715422814 会员签到接口限制问题 2022-03-08 20:37:12 +08:00
Chopper
ee5355668d 创建时间字段自动插入问题处理,签到增加访问限制 2022-03-08 11:57:48 +08:00
fengtianyangyang
6bef12b91b '合并' 2022-03-03 18:36:42 +08:00
fengtianyangyang
5b4113be4d Merge branch 'clerk' of https://gitee.com/beijing_hongye_huicheng/lilishop
 Conflicts:
	config/application.yml
2022-03-03 18:05:32 +08:00
fengtianyangyang
4d551366ed Merge branches 'clerk' and 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop into clerk 2022-03-03 17:44:53 +08:00
fengtianyangyang
441cb6ddcb '代码合并' 2022-03-03 17:22:13 +08:00