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

1070 Commits

Author SHA1 Message Date
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
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
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
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
paulGao
1f7dff38fc unescape to goods get the intro 2021-09-17 14:27:20 +08:00
paulGao
6ef7a98d81 improved Broken Access Control check of goods 2021-09-16 17:02:20 +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
paulGao
471b128f22 fix xss filter parse array error 2021-09-14 18:26:12 +08:00
Chopper
2bc381dad5 楼层装修转译导致无法正常展示问题处理 2021-09-14 10:03:34 +08: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
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
Chopper
7c2234b1a9 售后注解问题； 
微信支付退款错误日志记录。
 2021-09-10 15:54:26 +08:00
paulGao
47620a61ef Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-10 10:37:49 +08:00
paulGao
f44e787f72 fix seckill abnormal open 2021-09-10 10:36:27 +08:00
lifenlong
ae745ef518 手机号敏感信息过滤 2021-09-09 17:01:26 +08:00
OceansDeep
11baa30a9a !23 fix XSS and BAC, improve code style 
Merge pull request !23 from OceansDeep/feature/pg
 2021-09-09 08:50:37 +00:00
paulGao
9b7be69c6c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-09 16:47:43 +08:00
paulGao
d3e1de5620 fix XSS and BAC, improve code style 2021-09-09 16:47:14 +08:00
Chopper
8784da3449 h5 微信登录后支付问题。 2021-09-09 14:01:42 +08:00
Chopper
006218e15a 活动判定问题，暂时注释处理 2021-09-08 15:15:25 +08:00
paulGao
d470192ac6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-08 11:29:19 +08:00
OceansDeep
97cac9916d !22 improve and fix 
Merge pull request !22 from OceansDeep/feature/pg
 2021-09-06 18:06:36 +00:00
paulGao
cf6b1a60f4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg 2021-09-07 02:05:14 +08:00
paulGao
5fcdbe8df9 fix settlement seckill promotion is not punctuality 2021-09-07 02:04:31 +08:00
paulGao
4063c8b063 improve esGoods parameter selector buckets(not get category and brand from db, add EsGoodsIndex Field BrandName,BrandUrl,CategoryNamePath) 2021-09-07 01:55:58 +08:00
Chopper
d84f3b547b 订单取消会员积分返回判定问题处理 2021-09-06 15:11:39 +08:00
Chopper
315ab4d132 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop 2021-09-02 14:47:47 +08:00
Chopper
a08373d6a8 使用绑定满减活动的优惠券无法正常使用问题处理 2021-09-02 14:38:16 +08:00
OceansDeep
7ac15d1abe !21 升级spring boot 版本，完善Elasticsearch搜索 
Merge pull request !21 from OceansDeep/feature/pg
 2021-09-02 03:44:14 +00:00
paulGao
8f10b6b2a6 improvement generator goods index to asynchronization 2021-09-02 11:40:26 +08:00