1958 Commits

Author SHA1 Message Date
Chopper711
4f8d4f7a74 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2023-05-11 11:21:34 +08:00
Chopper711
a0619abfc4 补充参考配置文档 2023-05-11 11:21:27 +08:00
OceansDeep
5e950b9766
!285 fix & improve
Merge pull request !285 from OceansDeep/pg
2023-05-10 06:53:45 +00:00
misworga831
1f02818692 fix: 优化购物车商品促销价格特殊情况处理 2023-05-10 14:50:19 +08:00
Chopper711
c0a370ad47 fix:交易投诉,交易售后,兼容设置中描述的内容:设置为0则表示不限制 2023-05-10 14:44:55 +08:00
Chopper711
a502420c5f refactor: 去除两个无效引用 2023-05-10 14:07:30 +08:00
Chopper711
b4aef1461c fix: 订单定时任务可能存在极端情况,影响其他业务流程,做一下兼容处理,以免部分数据导致订单定时任务无法处理 2023-05-10 14:03:16 +08:00
OceansDeep
54b40c35f4
!284 fix & improve
Merge pull request !284 from OceansDeep/pg
2023-05-09 06:01:31 +00:00
misworga831
a33e053bc7 fix: 特殊情况处理,如参与多个促销活动,部分商品在其他促销计算后的金额不足以满足与当前参与的促销活动的优惠金额 2023-05-09 13:59:55 +08:00
misworga831
ae93661763 fix: 优化es搜索,增加如搜索超过10000条信息的处理 2023-05-09 13:59:23 +08:00
OceansDeep
349bee7405
!283 fix & improve
Merge pull request !283 from OceansDeep/pg
2023-05-08 10:50:06 +00:00
misworga831
c286d05ad8 fix: 促销状态更新和满减活动范围商品判定 2023-05-08 18:49:37 +08:00
chc
49b2c2f7a3 fix: 导入商品增加填写验证 2023-05-08 18:35:57 +08:00
chc
b469fcfee3 Merge remote-tracking branch 'origin/master' 2023-05-08 17:59:09 +08:00
chc
5e6fde594b fix: 店铺设置是自提、楼层为空导致无法保存 2023-05-08 17:59:01 +08:00
OceansDeep
5d598d9034
!282 优化es生成索引sku取分可能为复数问题
Merge pull request !282 from OceansDeep/pg
2023-05-08 09:38:19 +00:00
misworga831
8181f2602a fix: 优化es生成索引sku取分可能为复数问题 2023-05-08 17:37:29 +08:00
misworga831
3e74697215 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg 2023-05-08 16:51:01 +08:00
Chopper711
fac10debd5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2023-05-06 16:32:48 +08:00
Chopper711
74941f7243 feat: 兼容提现失败场景,对失败消息持久化 2023-05-06 16:32:42 +08:00
chc
621b2e322c fix: 快递鸟抛出异常 2023-05-05 13:40:38 +08:00
pikachu1995@126.com
948b67558a 微信小程序/公众号发送消息。 2023-05-05 07:12:39 +08:00
pikachu1995@126.com
dcf48db2ac fix:用户后期通过小程序登录,保存用户手机号 2023-04-28 08:47:09 +08:00
pikachu1995@126.com
072d31e8df fix:微信小程序登录记录手机号信息 2023-04-26 05:58:56 +08:00
pikachu1995@126.com
25240f445d fix:阿里登录没有传source 2023-04-25 18:40:39 +08:00
pikachu1995@126.com
279b473793 使用手机号为唯一身份进行登录 2023-04-25 17:59:42 +08:00
pikachu1995@126.com
959e24f51b fix:使用用户openID错误 2023-04-25 14:16:36 +08:00
pikachu1995@126.com
c720d53389 fix:合并代码错误,解决小程序无法登录问题。 2023-04-25 14:01:49 +08:00
17600048398
335d3f7ff1 1.修改商品分类同步分类名称 2.修改店铺名称同步对应店铺名称场景 2023-04-25 11:31:54 +08:00
Chopper711
16608d4950 fix:售后日志注解异常抛出问题 2023-04-19 16:16:01 +08:00
Chopper711
7b6a150bd2 fix: 用户被禁用、店铺被禁用、管理员被禁用,token未被清除问题处理。 2023-04-19 12:08:47 +08:00
17600048398
1f21d80dc0 用户签到为空时 无法签到问题 2023-04-18 10:57:41 +08:00
misworga831
08933ad92f fix: 优化足迹搜索 2023-04-18 10:35:56 +08:00
OceansDeep
05c3c8a80c
!279 fix: 优化足迹搜索
Merge pull request !279 from OceansDeep/pg
2023-04-17 07:38:52 +00:00
misworga831
41796774dc fix: 优化足迹搜索 2023-04-17 15:37:05 +08:00
Chopper711
4594752470 签到代码问题回滚 2023-04-14 18:29:51 +08:00
chc
d818b396c4 fix: 腾讯云COS问题处理 2023-04-14 11:20:54 +08:00
OceansDeep
cf7b333662
!278 fix & improve
Merge pull request !278 from OceansDeep/pg
2023-04-13 07:45:50 +00:00
misworga831
7cc0a90acf fix: 修复签到条件判定错误问题 2023-04-13 15:44:40 +08:00
misworga831
f9eed2f2ab Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg 2023-04-13 15:38:02 +08:00
chc
f8ff163aee fix: 审核商铺后删除缓存 2023-04-13 15:04:32 +08:00
misworga831
38ad5bb394 fix: 优化更新促销状态流程,增加促销检查 2023-04-12 16:13:29 +08:00
misworga831
b2fb415ab5 fix: 优化足迹搜索 2023-04-12 16:12:53 +08:00
最菜的蔡
4c03676a3e
!269 存在问题
Merge pull request !269 from zhaoyang0415/N/A
2023-04-11 09:03:38 +00:00
Chopper711
efce977bd6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2023-04-10 18:26:43 +08:00
Chopper711
071974c74b fix:足迹保留100条 2023-04-10 18:26:39 +08:00
OceansDeep
7f202506b5
!277 fix & improve
Merge pull request !277 from OceansDeep/pg
2023-04-10 10:13:06 +00:00
misworga831
a9c9886210 fix: 优化购物车对于更新商品的检查验证 2023-04-10 14:43:47 +08:00
misworga831
e18b62da6e fix: 优化促销相关流程,修复部分促销相关bug。 2023-04-10 14:43:04 +08:00
Chopper711
59c6dedd35 merge master 2023-04-10 10:06:34 +08:00