caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,596 Commits 1 Branch 0 Tags
Commit Graph

182 Commits

Author SHA1 Message Date
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
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
lifenlong
ae0c4aea12 展示店铺设置 2022-03-02 18:42:56 +08:00
itheinjury@163.com
a52b672e9b 更新,BUG修改 2022-03-02 15:17:06 +08:00
paulGao
631600ab3f 优化rocketmq日志到logback 2022-02-21 12:03:07 +08:00
itheinjury@163.com
1600f7cdab 更新 2022-02-18 10:52:03 +08:00
itheinjury@163.com
b0858429fb 更新 2022-02-17 13:58:46 +08:00
itheinjury@163.com
2f3e2a5ae8 更新 2022-02-17 13:58:16 +08:00
itheinjury@163.com
5b1b75cbbe 更新 2022-02-15 15:30:33 +08:00
paulGao
0940d9aec8 增加刷新token白名单 2022-02-15 15:29:32 +08:00
paulGao
f8d2ab5e17 适配修改的api 2022-02-14 18:32:28 +08:00
paulGao
1f1b534b13 适配优化的api地址 2022-02-12 15:05:42 +08:00
itheinjury@163.com
bf8f8d9382 初始化代码 2022-02-11前 最新版本 2022-02-11 19:30:50 +08:00
paulGao
5c78711d8e merge conflict origin/master 2022-02-11 15:33:28 +08:00
paulGao
acb88a6b2a 优化redisson配置 2022-02-11 14:54:56 +08:00
zhenghao
fd003eff8b 店员 2022-02-10 20:18:05 +08:00
zhenghao
4d1dfebacd 店员 2022-02-10 20:05:00 +08:00
paulGao
6639ec8971 优化代码，增加redisson配置 2022-02-10 11:27:20 +08:00
paulGao
9aa7a6dcf3 优化代码，增加redisson配置 2022-02-10 11:26:10 +08:00
Chopper
3972e0231c api端防重复提交 2022-01-25 10:22:45 +08:00
Chopper
936397c59f 自动好评存在一个全线判定问题处理 2022-01-24 18:11:10 +08:00
Chopper
ca1851570b 还原下单接口代码，这里存在规范问题日后与前端一起协调修改 2022-01-19 10:02:22 +08:00
Chopper
575458afb3 1、去除非必要事务 
2、对分布式多节点并发时可能存在生成相同的雪花算法id问题进行处理
3、其他问题优化
 2022-01-18 09:50:26 +08:00
Chopper
05818baf7a 优化一些配置项，优化部分路基 2022-01-11 17:34:48 +08:00
fengtianyangyang
87f637099c '合并master' 2022-01-11 14:50:06 +08:00
Chopper
9bed8e57df 代码处理 2022-01-10 18:34:23 +08:00
Chopper
37393bb7f8 修改api下单时的提交参数类型 2022-01-10 16:55:06 +08:00
OceansDeep
20436653af !104 优化代码，修复bug 
Merge pull request !104 from OceansDeep/feature/pg
 2021-12-30 09:02:56 +00:00
paulGao
814533a2c2 修复分销商品佣金提现参数校验无效问题 2021-12-30 17:01:32 +08:00
Chopper
fa443a091f 短信验证码验证结果未生效问题处理 2021-12-30 16:44:50 +08:00
paulGao
6465dc2b73 适配优化更新索引促销方式的结算。 2021-12-30 09:52:54 +08:00
paulGao
c3221a6fff 优化代码结构。优化促销更新。 2021-12-29 11:53:46 +08:00
paulGao
f9a8675942 修复优化促销 2021-12-25 18:35:44 +08:00