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

1572 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
paulGao
c8b2e87570 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-26 17:13:54 +08:00
paulGao
81ce0f4682 修复支付宝支付回调转义问题；修复限时抢购时，结束时间为空的问题 2021-09-26 17:13:50 +08:00
Chopper
87e5404aa8 文章分类参数校验问题 2021-09-26 16:12:59 +08:00
Chopper
2f31946a17 增加字段，标识客服，提供im服务 2021-09-26 15:44:36 +08:00
Chopper
a23b8ac642 商品发布，参数校验调整，分类校验调整 2021-09-26 14:40:22 +08:00
Chopper
071f8c9d56 优惠券查询接口替换为lambda 2021-09-26 10:19:45 +08:00
Chopper
76fcf84043 Merge branch 'liushuai' 
解决积分商品购买问题，部分参数校验问题，等各种问题优化

# Conflicts:
#	framework/src/main/java/cn/lili/modules/goods/entity/dto/GoodsOperationDTO.java
 2021-09-24 18:17:59 +08:00
Chopper
d9b1d78c61 积分赠送以及返还问题处理。 
积分购买时预校验，以免下单后取消订单，积分返还无效操作
额外的一些代码完善问题处理
 2021-09-24 18:15:29 +08:00
OceansDeep
c8de423e7c !34 DraftGoods get intro and mobileIntro method by HTML unescape 
Merge pull request !34 from OceansDeep/feature/pg
 2021-09-24 08:20:58 +00:00
paulGao
a4648ac40f DraftGoods get intro and mobileIntro method by HTML unescape 2021-09-24 16:20:01 +08:00
pikachu
af5c0a4641 商品添加校验完善 2021-09-23 23:38:11 +08:00
Chopper
ff24c95d02 连续签到积分无法正常获取问题。 2021-09-23 11:42:03 +08:00
Chopper
ac936caf17 sql状态判定处理 2021-09-23 09:34:19 +08:00
Chopper
be1c9772ad 参数校验问题处理 2021-09-23 09:27:22 +08:00
Chopper
50b52f07c6 分类绑定品牌规范问题处理 2021-09-22 12:13:04 +08:00
Chopper
57a5c5a0f1 分类绑定品牌问题处理 2021-09-22 11:19:28 +08:00
Chopper
4f4704ab50 分类与各个参数绑定后，删除关系未清理干净问题处理。 
品牌删除时，与分类发生绑定，则返回分类信息，协助解除绑定。
 2021-09-22 11:10:34 +08:00
Chopper
505366d9bc Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-09-22 09:56:47 +08:00
Chopper
c5e8afd841 时间查询问题处理 2021-09-22 09:56:14 +08:00
OceansDeep
1de4dea1fb !33 修复文章获取内容转义，限时抢购无参加商品不开启，商品搜索报错 
Merge pull request !33 from OceansDeep/feature/pg
 2021-09-22 01:51:12 +00:00
paulGao
6fb9afd411 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-22 09:50:42 +08:00
Chopper
a2d896c9b2 移动端无法展示优惠券问题处理 2021-09-22 09:46:43 +08:00
paulGao
e5e809ed72 fix es goods search category name length does not match category path length 2021-09-22 09:45:51 +08:00
paulGao
d4c9b0f147 fix promotion seckill for no join goods is not autostart 2021-09-22 09:43:11 +08:00
paulGao
ac60f27814 Article get content method by HTML unescape 2021-09-22 09:40:05 +08:00
Chopper
42ce0814ae Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-09-22 09:19:14 +08:00
Chopper
f3f3d3f936 分类API接口代码完善 2021-09-22 09:17:59 +08:00
OceansDeep
8c3bc6e06e !31 fix member wallet insert db duplication 
Merge pull request !31 from OceansDeep/feature/pg
 2021-09-18 07:05:20 +00:00
paulGao
6dfde467b4 fix member wallet insert db duplication 
add store goods label order by field sort
 2021-09-18 11:43:00 +08:00
Chopper
e0e5106eed Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-09-17 14:47:27 +08:00
Chopper
9cee1093f4 IM完善 2021-09-17 14:47:25 +08:00
OceansDeep
a3d73bf7ad !30 unescape to goods get the intro 
Merge pull request !30 from OceansDeep/feature/pg
 2021-09-17 06:28:25 +00:00
paulGao
1f7dff38fc unescape to goods get the intro 2021-09-17 14:27:20 +08:00
OceansDeep
f7fc9a1299 !29 improved Broken Access Control check of goods 
Merge pull request !29 from OceansDeep/feature/pg
 2021-09-16 09:19:38 +00:00
paulGao
6ef7a98d81 improved Broken Access Control check of goods 2021-09-16 17:02:20 +08:00
paulGao
31a16b77df Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-16 16:54:02 +08:00
Chopper
3459169885 IM 相关配置提交 2021-09-16 15:32:09 +08:00
paulGao
8ae04e7ee6 fix manager api calling updateGoodsMarketAble error 
fix manager api es generator get progress error info
 2021-09-16 11:55:58 +08:00
Chopper
a3564c746c 镜像配置相关提交 2021-09-15 17:20:01 +08:00
OceansDeep
b0dc4db48a !28 fix xss filter parse array error 
Merge pull request !28 from OceansDeep/feature/pg
 2021-09-14 10:27:42 +00:00
paulGao
471b128f22 fix xss filter parse array error 2021-09-14 18:26:12 +08:00
Chopper
7727c1a45b 调整验证码模块，对演示站点做权限处理 2021-09-14 16:43:48 +08:00
Chopper
2bc381dad5 楼层装修转译导致无法正常展示问题处理 2021-09-14 10:03:34 +08:00
OceansDeep
13c5ceea96 !27 fix seckill error 
Merge pull request !27 from OceansDeep/feature/pg
 2021-09-13 07:24:49 +00:00
paulGao
5ce5384230 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-13 15:22:59 +08:00
paulGao
36528ae416 fix seckill error 2021-09-13 15:22:38 +08:00
Chopper
327926adb9 脱敏配置注释补充。 2021-09-13 10:32:30 +08:00
Chopper
a210565387 增加脱敏配置。 
lili:
  system:
    sensitiveLevel: 2
 2021-09-13 10:30:56 +08:00
Chopper
d1d91b78fc 手机号脱敏处理暂时还原，找其他方式解决 2021-09-10 16:15:51 +08:00
Chopper
6006c3eeff Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-09-10 15:54:36 +08:00