1463 Commits

Author SHA1 Message Date
Chopper
761982474c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-04-13 11:49:32 +08:00
Chopper
d13b0404fb 增加一下短信验证码在info级别的日志打印 2022-04-13 11:49:23 +08:00
fengtianyangyang
6966376f91 文章增加文章类型修改及文章类型删除 2022-04-13 11:06:51 +08:00
Chopper
2720f5c0bb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-04-11 14:18:42 +08:00
paulGao
881f039e44 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-04-11 14:18:39 +08:00
Chopper
81c7a72b9c 解决优惠券在购物车中缓存会出现的一些极端bug 2022-04-11 14:18:37 +08:00
fengtianyangyang
c0391e3fc1 微信同步消息时删除模板问题 2022-04-11 11:23:02 +08:00
paulGao
7e542750f6 增加每次获取优惠券信息时,检查优惠券是否过期 2022-04-08 16:59:12 +08:00
OceansDeep
3439b7aee5
!146 修复秒杀活动相同商品参与时,删除其他活动商品信息问题
Merge pull request !146 from OceansDeep/feature/pg
2022-04-07 08:31:23 +00:00
paulGao
63b23fbe76 修复秒杀活动相同商品参与时,删除其他活动商品信息问题 2022-04-07 16:06:23 +08:00
paulGao
63fff2398e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-04-07 14:32:12 +08:00
chopper711
db8796df99
update README.md. 2022-04-07 04:07:23 +00:00
Chopper
4095481411 会员促销运算时,优惠券会被缓存,可能导致无效数据返回。 2022-04-07 10:19:19 +08:00
paulGao
8e30defa0e 优化es商品搜索,全分词匹配改为2分词匹配 2022-04-06 10:39:51 +08:00
paulGao
06ee6d6359 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-04-06 09:29:38 +08:00
paulGao
a988dedfbf 增加根据名称获取地址信息 2022-04-02 18:42:03 +08:00
fengtianyangyang
f90c6fb27d 注释 2022-04-01 21:59:44 +08:00
OceansDeep
5292d6ef90
!145 fix bugs and improve code
Merge pull request !145 from OceansDeep/feature/pg
2022-04-01 07:25:20 +00:00
paulGao
e760af7216 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-04-01 15:21:55 +08:00
paulGao
e4889d82f2 替换弃用的hutool的SSLSocketFactoryBuilder 2022-04-01 15:21:28 +08:00
paulGao
9d170ecc30 修复获取店铺分类缓存key错误问题 2022-04-01 15:18:35 +08:00
Chopper
cf01011504 注销功能接口提供完善 2022-03-31 16:49:12 +08:00
Chopper
b1291d3c43 文件内容错误,恢复内容 2022-03-31 14:04:56 +08:00
Chopper
82546eed06 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-03-31 09:21:23 +08:00
Chopper
bf667e2aa6 签到问题处理 2022-03-31 09:21:18 +08:00
OceansDeep
5b6f208f53
!144 修复更新商品索引促销时,更新的促销信息不正确问题
Merge pull request !144 from OceansDeep/feature/pg
2022-03-30 09:24:23 +00:00
paulGao
210d56447c 优化更新全部商品索引时的性能 2022-03-30 17:21:57 +08:00
paulGao
c093261369 修复更新商品索引促销时,更新的促销信息不正确问题 2022-03-30 17:17:09 +08:00
paulGao
ee4f87d12d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2022-03-30 14:27:29 +08:00
paulGao
74b0a5b081 修复一个搜索es商品时可能会发生的date格式转换问题 2022-03-30 14:27:12 +08:00
Chopper
f51774c077 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-03-30 11:54:58 +08:00
Chopper
bd9f7b8b9f 收款单创建时间字段问题处理 2022-03-30 11:54:56 +08:00
chopper711
dc55bd63f5
!141 ResultCode虚拟商品无需配送模板提示更正 from @Assure
Merge pull request !141 from Assure/master
2022-03-29 09:05:26 +00:00
chopper711
07ce947f78
!142 优化CommonUtil.getRandomNum() 提升随机数性能。 from @原批王
Merge pull request !142 from 原批王/master
2022-03-29 09:02:36 +00:00
OceansDeep
0f6cc70f66
!143 修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code
Merge pull request !143 from OceansDeep/feature/pg
2022-03-29 06:16:14 +00:00
paulGao
6d014a01bc 修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code 2022-03-29 10:04:36 +08:00
***
de5e97ac3a 优化cn.lili.common.utils.CommonUtil.getRandomNum方法逻辑 2022-03-27 07:41:34 +08:00
胡程
40e866aadd fix:修复配虚拟商品送模板提示 2022-03-25 18:12:40 +08:00
Chopper
36ce7593a9 由于铭感信息过滤手机号,导致管理端无法修改会员问题处理 2022-03-18 17:41:05 +08:00
Chopper
a2a28af41d 微信消息删除调用时,微信返回参数无法解析,尝试解决此问题。 2022-03-15 17:16:24 +08:00
Chopper
203a30a236 商品评价问题处理 2022-03-14 15:50:55 +08:00
Chopper
b7d418b5b7 修复虚拟订单核销校验问题 2022-03-14 10:44:06 +08:00
Chopper
1625f7ca76 自动关闭售后字段读取错误,修正 2022-03-10 15:52:12 +08:00
Chopper
8a67b905fc Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-03-10 15:31:39 +08:00
Chopper
9ee76b5328 取消一个无实际作用的限流注解
订单买家端可以查询到别人的订单问题处理
2022-03-10 15:31:23 +08:00
paulGao
df9dd7f435 merge conflict origin/master 2022-03-09 18:39:48 +08:00
paulGao
9d0d318d66 优化更新es商品促销流程 2022-03-09 18:39:04 +08:00
Chopper
ee1723a76b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2022-03-08 20:37:17 +08:00
Chopper
c715422814 会员签到接口限制问题 2022-03-08 20:37:12 +08:00
fengtianyangyang
72e7941230 '权限修改' 2022-03-08 14:19:22 +08:00