caojiahao/dev_caojiahao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e289cf29fe
         !151 优化合并 Merge pull request !151 from OceansDeep/feature/pg OceansDeep 2022-04-26 03:40:22 +00:00
  • 1cd74cc26a Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-26 11:37:53 +08:00
  • 27112e35b3 优化搜索关键字不能为空格。优化管理端商品上下架时没有清空goods缓存问题 paulGao 2022-04-26 11:37:48 +08:00
  • b2a8578f43 增加异常重试机制。（目前作用于es批量更新删除时，有时会出现的内容版本冲突问题） paulGao 2022-04-26 11:36:28 +08:00
  • 0e0a8b039d 管理员用户权限不再放在永久缓存，而是放在临时缓存（5分钟），由于访问频率较低，在加上涉及的业务太复杂，所以去除了之前对权限的永久缓存以及模糊删除用户权限缓存相关代码 Chopper 2022-04-26 09:33:54 +08:00
  • cbd201c43b 还原配置 Chopper 2022-04-25 18:58:01 +08:00
  • 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 Chopper 2022-04-25 18:32:46 +08:00
  • 8dc86e0482 热词功能完善 Chopper 2022-04-25 18:08:06 +08:00
  • d0226611d7 增加初始化生成索引日志 paulGao 2022-04-25 17:34:24 +08:00
  • 2b21c3cd09
         !150 优化生成索引mapping日志 Merge pull request !150 from OceansDeep/feature/pg OceansDeep 2022-04-25 09:23:34 +00:00
  • b1bdd9b8a5 优化生成索引mapping日志 paulGao 2022-04-25 17:22:52 +08:00
  • bb50510ecb 解决管理员权限相关问题 Chopper 2022-04-25 10:31:39 +08:00
  • aa185c8bd2 优化consumer生成商品索引。改为批量生成 paulGao 2022-04-25 10:26:51 +08:00
  • 99e3b234c9 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop fengtianyangyang 2022-04-22 18:47:10 +08:00
  • 5168d8d08d 配置文件还原 fengtianyangyang 2022-04-22 18:45:43 +08:00
  • 230a8810ef 积分商品,砍价商品结算单错误问题 fengtianyangyang 2022-04-22 18:44:32 +08:00
  • e8e8c1abcc
         !149 修复结算时，无有效商品，造成空订单问题 Merge pull request !149 from OceansDeep/feature/pg OceansDeep 2022-04-22 08:50:52 +00:00
  • 0354d6dc3e 修复结算时，无有效商品，造成空订单问题 paulGao 2022-04-22 16:27:13 +08:00
  • 47ad388f7d 售后申请数量错误 fengtianyangyang 2022-04-22 11:10:42 +08:00
  • 2d57483805 结算单优惠券退款异常 fengtianyangyang 2022-04-22 11:02:23 +08:00
  • 363dbd3a7f
         !148 修复项目启动时可能会造成es client must not be null的问题 Merge pull request !148 from OceansDeep/feature/pg OceansDeep 2022-04-22 01:13:07 +00:00
  • 5b5863c899 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-22 09:12:11 +08:00
  • 4c1ae8c3cc 修复一个项目启动时可能会造成es client must not be null的问题 paulGao 2022-04-22 09:11:51 +08:00
  • 29ed211519
         !147 优化 Merge pull request !147 from OceansDeep/feature/pg OceansDeep 2022-04-21 08:28:26 +00:00
  • 9f965c4e56 修复主订单取消后赠品订单不会取消问题。优化热词 paulGao 2022-04-21 16:25:43 +08:00
  • 0148868129 分类递归错误的参数传递问题解决 Chopper 2022-04-21 15:49:53 +08:00
  • d46863b5b5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-21 15:12:27 +08:00
  • 1917aa13d5 店铺结算空指针问题 fengtianyangyang 2022-04-21 10:51:12 +08:00
  • 2994131048 当结算周期只有一天时，无法结算问题处理 Chopper 2022-04-21 10:11:21 +08:00
  • f0d6938127 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-20 17:54:21 +08:00
  • 0203630d6a 增加店铺商品索引操作 paulGao 2022-04-20 09:39:03 +08:00
  • 89c5c2dd83 评价数量展示异常问题处理 Chopper 2022-04-19 10:18:25 +08:00
  • ce1954e7d3 消费者一个错误处理 Chopper 2022-04-19 09:39:33 +08:00
  • 947a82eac5 热词统计，热词功能改版 Chopper 2022-04-19 09:28:26 +08:00
  • 9dc01f6057 店铺结算单结算问题 fengtianyangyang 2022-04-18 19:09:05 +08:00
  • 37c5ce541b 优化楼层装修 paulGao 2022-04-17 21:46:34 +08:00
  • 726eb06714 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-17 21:45:49 +08:00
  • df505e0e17 店铺结算单金额问题 fengtianyangyang 2022-04-15 19:05:27 +08:00
  • 06fffac835 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-14 09:09:25 +08:00
  • 264a423444 remove invalid class paulGao 2022-04-14 09:09:22 +08:00
  • 6ae9692358 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-13 16:58:23 +08:00
  • 7270564b10 由于代码调用顺序错误，导致总是输出一段错误的日志内容。 Chopper 2022-04-13 16:58:19 +08:00
  • a485a29868 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-13 14:30:40 +08:00
  • ec04c3221f 移除文章类型删除 fengtianyangyang 2022-04-13 12:00:40 +08:00
  • 761982474c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-13 11:49:32 +08:00
  • d13b0404fb 增加一下短信验证码在info级别的日志打印 Chopper 2022-04-13 11:49:23 +08:00
  • 6966376f91 文章增加文章类型修改及文章类型删除 fengtianyangyang 2022-04-13 11:06:51 +08:00
  • 2720f5c0bb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-11 14:18:42 +08:00
  • 881f039e44 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-11 14:18:39 +08:00
  • 81c7a72b9c 解决优惠券在购物车中缓存会出现的一些极端bug Chopper 2022-04-11 14:18:37 +08:00
  • c0391e3fc1 微信同步消息时删除模板问题 fengtianyangyang 2022-04-11 11:23:02 +08:00
  • 7e542750f6 增加每次获取优惠券信息时，检查优惠券是否过期 paulGao 2022-04-08 16:59:12 +08:00
  • 7cbf638822 配置文件修改 fengtianyangyang 2022-04-07 17:37:59 +08:00
  • 4cdb461c22 配置文件修改及sql fengtianyangyang 2022-04-07 17:35:22 +08:00
  • ba57f19ee7 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/shengxing into clerk fengtianyangyang 2022-04-07 17:13:04 +08:00
  • 9ba2693698 店员错误 fengtianyangyang 2022-04-07 17:09:25 +08:00
  • 3439b7aee5
         !146 修复秒杀活动相同商品参与时，删除其他活动商品信息问题 Merge pull request !146 from OceansDeep/feature/pg OceansDeep 2022-04-07 08:31:23 +00:00
  • 63b23fbe76 修复秒杀活动相同商品参与时，删除其他活动商品信息问题 paulGao 2022-04-07 16:06:23 +08:00
  • 63fff2398e Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-07 14:32:12 +08:00
  • db8796df99
         update README.md. chopper711 2022-04-07 04:07:23 +00:00
  • 4095481411 会员促销运算时，优惠券会被缓存，可能导致无效数据返回。 Chopper 2022-04-07 10:19:19 +08:00
  • 8e30defa0e 优化es商品搜索，全分词匹配改为2分词匹配 paulGao 2022-04-06 10:39:51 +08:00
  • 06ee6d6359 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-06 09:29:38 +08:00
  • a988dedfbf 增加根据名称获取地址信息 paulGao 2022-04-02 18:42:03 +08:00
  • f90c6fb27d 注释 fengtianyangyang 2022-04-01 21:59:44 +08:00
  • 5292d6ef90
         !145 fix bugs and improve code Merge pull request !145 from OceansDeep/feature/pg OceansDeep 2022-04-01 07:25:20 +00:00
  • e760af7216 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-01 15:21:55 +08:00
  • e4889d82f2 替换弃用的hutool的SSLSocketFactoryBuilder paulGao 2022-04-01 15:21:28 +08:00
  • 9d170ecc30 修复获取店铺分类缓存key错误问题 paulGao 2022-04-01 15:18:35 +08:00
  • cf01011504 注销功能接口提供完善 Chopper 2022-03-31 16:49:12 +08:00
  • b1291d3c43 文件内容错误，恢复内容 Chopper 2022-03-31 14:04:56 +08:00
  • 82546eed06 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-31 09:21:23 +08:00
  • bf667e2aa6 签到问题处理 Chopper 2022-03-31 09:21:18 +08:00
  • 5b6f208f53
         !144 修复更新商品索引促销时，更新的促销信息不正确问题 Merge pull request !144 from OceansDeep/feature/pg OceansDeep 2022-03-30 09:24:23 +00:00
  • 210d56447c 优化更新全部商品索引时的性能 paulGao 2022-03-30 17:21:57 +08:00
  • c093261369 修复更新商品索引促销时，更新的促销信息不正确问题 paulGao 2022-03-30 17:17:09 +08:00
  • ee4f87d12d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-03-30 14:27:29 +08:00
  • 74b0a5b081 修复一个搜索es商品时可能会发生的date格式转换问题 paulGao 2022-03-30 14:27:12 +08:00
  • f51774c077 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-30 11:54:58 +08:00
  • bd9f7b8b9f 收款单创建时间字段问题处理 Chopper 2022-03-30 11:54:56 +08:00
  • dc55bd63f5
         !141 ResultCode虚拟商品无需配送模板提示更正 from @Assure Merge pull request !141 from Assure/master chopper711 2022-03-29 09:05:26 +00:00
  • 07ce947f78
         !142 优化CommonUtil.getRandomNum() 提升随机数性能。 from @原批王 Merge pull request !142 from 原批王/master chopper711 2022-03-29 09:02:36 +00:00
  • 0f6cc70f66
         !143 修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code Merge pull request !143 from OceansDeep/feature/pg OceansDeep 2022-03-29 06:16:14 +00:00
  • 6d014a01bc 修复秒杀活动时间段为一个时。不显示问题。修复可能会出现的es代码编译问题。improve code paulGao 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
  • 36ce7593a9 由于铭感信息过滤手机号，导致管理端无法修改会员问题处理 Chopper 2022-03-18 17:41:05 +08:00
  • a2a28af41d 微信消息删除调用时，微信返回参数无法解析，尝试解决此问题。 Chopper 2022-03-15 17:16:24 +08:00
  • 203a30a236 商品评价问题处理 Chopper 2022-03-14 15:50:55 +08:00
  • b7d418b5b7 修复虚拟订单核销校验问题 Chopper 2022-03-14 10:44:06 +08:00
  • 1625f7ca76 自动关闭售后字段读取错误，修正 Chopper 2022-03-10 15:52:12 +08:00
  • 8a67b905fc Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-10 15:31:39 +08:00
  • 9ee76b5328 取消一个无实际作用的限流注解 订单买家端可以查询到别人的订单问题处理 Chopper 2022-03-10 15:31:23 +08:00
  • df9dd7f435 merge conflict origin/master paulGao 2022-03-09 18:39:48 +08:00
  • 9d0d318d66 优化更新es商品促销流程 paulGao 2022-03-09 18:39:04 +08:00
  • ee1723a76b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-03-08 20:37:17 +08:00
  • c715422814 会员签到接口限制问题 Chopper 2022-03-08 20:37:12 +08:00
  • 72e7941230 '权限修改' fengtianyangyang 2022-03-08 14:19:22 +08:00
  • ac475ca456 增加促销活动更新日志 paulGao 2022-03-08 12:08:12 +08:00
  • ee5355668d 创建时间字段自动插入问题处理，签到增加访问限制 Chopper 2022-03-08 11:57:48 +08:00