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

Commit Graph

  • 1a0515361e Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop 17600048398 2023-01-13 17:10:27 +08:00
  • 2df8df1a0d im功能拆分 17600048398 2023-01-13 17:10:15 +08:00
  • 96a9a32079 fix: 增加获取购物车商品日志，修复可能出现的获取购物车空指针问题 misworga831 2023-01-13 14:37:13 +08:00
  • 5d6b475e09 fix: 增加获取购物车商品日志，修复可能出现的获取购物车空指针问题 misworga831 2023-01-13 14:22:44 +08:00
  • cb3eca29d8 店铺更新店铺信息，缓存未同步问题处理 Chopper711 2023-01-13 10:07:57 +08:00
  • bdb62de868 im问题部分处理 Chopper711 2023-01-12 15:44:44 +08:00
  • b416e56b98
         Merge pull request #75 misworga831 2023-01-11 11:38:47 +08:00
  • 1728be9c36 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-01-11 11:38:12 +08:00
  • ea85710c05 优惠券活动领取周期问题 Chopper711 2023-01-11 11:38:01 +08:00
  • e1af67beb3
         !256 resolve issue Merge pull request !256 from OceansDeep/feature/pg OceansDeep 2023-01-11 03:36:50 +00:00
  • d9de601e8a 售后数量问题梳理解决 Chopper711 2023-01-11 11:34:54 +08:00
  • 3c568a7d42 fix: 修复商品索引初始化时，店铺全品类优惠券和平台全品类优惠券没有区分问题 paulGao 2023-01-11 11:32:27 +08:00
  • 5080cf65c7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2023-01-10 14:34:52 +08:00
  • eefca656c6 fix: 优化会员优惠券搜索 paulGao 2023-01-10 14:34:48 +08:00
  • 3a63f87807 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-01-10 09:25:24 +08:00
  • d71628adfe 多websocket掉线问题处理 Chopper711 2023-01-10 09:25:18 +08:00
  • 585fc96bca 历史足迹sql chc 2023-01-10 09:11:37 +08:00
  • 28b1820bfa 历史足迹sql chc 2023-01-10 09:11:13 +08:00
  • 85e74014b1 im和自提的SQL chc 2023-01-09 18:33:53 +08:00
  • cc12cecc2a merge 自提、IM功能 Chopper711 2023-01-09 18:00:40 +08:00
  • 197a7bcc43 '秒杀活动额外适配' Chopper711 2023-01-09 11:21:46 +08:00
  • 613f397c33 '优惠券领取改良完成' Chopper711 2023-01-05 18:02:40 +08:00
  • a3bd0f2c0b Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2023-01-05 15:31:22 +08:00
  • bda297b90d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2023-01-05 14:39:33 +08:00
  • 8ddba831f0 feat: 增加根据促销活动搜索商品索引。增加获取优惠券领取记录。增加优惠券关闭后同时作废所有会员领取的优惠券。 paulGao 2023-01-05 14:39:23 +08:00
  • 5218702005 '商品索引空处理' Chopper711 2023-01-03 11:52:30 +08:00
  • fbabd2f340 '快递鸟报错兼容问题' Chopper711 2023-01-03 11:52:02 +08:00
  • a38bc6b534 IM功能 chc 2023-01-03 09:30:43 +08:00
  • 73aa36fc69 IM消息功能 chc 2022-12-27 18:14:47 +08:00
  • d627fca7d6 分销员 分销佣金添加默认值 pikachu1995@126.com 2022-12-27 16:35:07 +08:00
  • 06325a7ce1 '促销详情完善' Chopper711 2022-12-26 19:00:13 +08:00
  • 903b779ebe '价格记录详细处理' Chopper711 2022-12-26 10:55:37 +08:00
  • 0e3d582d13 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2022-12-23 15:13:08 +08:00
  • cd17f3d755 '构建促销详情模型' Chopper711 2022-12-23 15:13:05 +08:00
  • 8543a228fd '优惠券功能改版' Chopper711 2022-12-23 14:51:06 +08:00
  • b97c8e7fda 商品价格修改后同步到购物车 chc 2022-12-22 18:19:52 +08:00
  • 1346614a30 站点图标与logo分开添加与展示 chc 2022-12-22 15:17:54 +08:00
  • 0eec40673f Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-12-07 15:17:12 +08:00
  • 602678e2b9 '搜索商品功能过滤关键字以及特殊字符' Chopper711 2022-12-07 15:14:25 +08:00
  • d6393e39f7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2022-12-07 09:49:15 +08:00
  • b3f22866b5 '店铺申请流程规范化，防止恶意攻击' Chopper711 2022-12-07 09:38:10 +08:00
  • 51d2880392 '增加优惠券关闭作废优惠券' Chopper711 2022-12-07 09:37:50 +08:00
  • ede7a37e37 fix: 修复修改商品库存时，促销商品库存没有同步修改问题 paulGao 2022-12-05 17:17:05 +08:00
  • 8373303651 储存OrderVO的订单货物列表错误。 pikachu1995@126.com 2022-12-05 11:30:32 +08:00
  • f3ccabe253
         !255 fix: 优化es价格搜索，设置超出限制，则默认搜索最大值 Merge pull request !255 from OceansDeep/feature/pg OceansDeep 2022-11-29 07:04:32 +00:00
  • ba6bb56e81 fix: 优化es价格搜索，设置超出限制，则默认搜索最大值 paulGao 2022-11-29 15:03:16 +08:00
  • 73124f016d
         !254 fix: 优化批发商品，没有匹配规则时，显示异常，不在默认为第一个规则 Merge pull request !254 from OceansDeep/feature/pg OceansDeep 2022-11-28 10:30:35 +00:00
  • 32ca2e4298 fix: 优化批发商品，没有匹配规则时，提示的错误信息 paulGao 2022-11-28 15:47:41 +08:00
  • 1cc7486b0a fix: 优化批发商品，没有匹配规则时，显示异常，不在默认为第一个规则 paulGao 2022-11-28 10:52:34 +08:00
  • 26b58442c5 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-11-28 10:44:33 +08:00
  • 20de17bef1 重复签到 lilili 2022-11-27 20:13:15 +08:00
  • 54e04be768 im chc 2022-11-24 18:13:30 +08:00
  • 49b517f1ab im chc 2022-11-23 18:44:54 +08:00
  • fc71d2d1ca Merge branch 'lili_self' of https://gitee.com/beijing_hongye_huicheng/lilishop into lili_self chc 2022-11-22 17:32:20 +08:00
  • 340b5b7248 im chc 2022-11-22 17:31:45 +08:00
  • cfd292ef18 自提 chc 2022-11-22 17:20:17 +08:00
  • f7ea17a9cf Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-11-22 15:29:27 +08:00
  • 096ab34ae8 fix: 优化文件上传，删除冗余文件 paulGao 2022-11-22 15:29:22 +08:00
  • e72b35c7eb
         update LICENSE. Chopper711 2022-11-21 03:21:52 +00:00
  • 9141f21cf8
         LICENSE Chopper711 2022-11-21 03:02:55 +00:00
  • 65d9efef94 fix: 增加店员错误信息回 显 paulGao 2022-11-18 10:15:50 +08:00
  • c5b19db662
         !253 fix: 修复下载商品导入模版错误问题 Merge pull request !253 from OceansDeep/feature/pg OceansDeep 2022-11-17 10:36:42 +00:00
  • f6a50cc43a fix: 修复下载商品导入模版错误问题 paulGao 2022-11-17 18:36:04 +08:00
  • a13260b8c6 '楼层参数写入错误修正' Chopper711 2022-11-14 09:44:53 +08:00
  • 66c0200457 '商家楼层装修权限放开' Chopper711 2022-11-14 09:31:20 +08:00
  • e244883165 '两个装修类合并' Chopper711 2022-11-14 09:21:35 +08:00
  • 92367c9020 '店铺保存模板配置问题处理' Chopper711 2022-11-14 09:05:43 +08:00
  • e78ea60644 '限制演示站点部分功能' Chopper711 2022-11-11 15:18:48 +08:00
  • 29f73eaaa1 '楼层装修演示站点被覆盖问题处理' Chopper711 2022-11-08 14:35:29 +08:00
  • 22c004a892
         !250 pref: 优化es生成全部商品索引，减少数据库操作 优化文件 Merge pull request !250 from OceansDeep/feature/pg OceansDeep 2022-11-02 12:02:48 +00:00
  • ef0507cf1d fix: 优化文件 paulGao 2022-11-02 19:59:13 +08:00
  • 9df9e33ce1 fix: 优化代码 paulGao 2022-11-02 19:54:57 +08:00
  • 52a2caaa6d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-11-02 19:43:44 +08:00
  • 0b6aa9e857 fix: 优化代码 paulGao 2022-11-02 19:43:38 +08:00
  • 3b078cfd6b pref: 优化es生成全部商品索引，减少数据库操作 paulGao 2022-11-02 19:43:17 +08:00
  • 67b746998f
         update README.md. Chopper711 2022-10-31 03:04:13 +00:00
  • 52f62f0c1d
         update README.md. Chopper711 2022-10-31 03:04:01 +00:00
  • ca23b5ab33 防重复提交问题å‘处理 Chopper711 2022-10-28 17:58:28 +08:00
  • 5a14790ec2 平台脱敏 Chopper711 2022-10-28 17:33:06 +08:00
  • 67542eebfb 用户信息脱敏 Chopper711 2022-10-28 16:58:30 +08:00
  • 88c62bc238 用戶信息查看脫敏字段處理 Chopper711 2022-10-28 16:09:26 +08:00
  • 0c4ed91335
         update README.md. Chopper711 2022-10-27 07:31:48 +00:00
  • 74dbb611ab
         update README.md. Chopper711 2022-10-27 07:31:19 +00:00
  • 07e72c7e72
         !248 更新无法更新分销员待提现总金额的bug Merge pull request !248 from 隔壁老黄/tempbranch Chopper711 2022-10-27 01:30:00 +00:00
  • 2c0700c10e lilishop.sql chc 2022-10-26 17:38:51 +08:00
  • 191cee25a4
         !246 fix: 限流次数不对 Merge pull request !246 from @xiaochangbai/pr/optime_lock Merge pull request !246 from @xiaochangbai/pr/optime_lock Chopper711 2022-10-26 09:26:19 +00:00
  • 1b4fad72ed
         !249 修改xxl-job合并冲突配置文件 Merge pull request !249 from 欢哥/master Merge pull request !249 from 欢哥/master Chopper711 2022-10-26 09:13:43 +00:00
  • 3fce0dba48 fix 修改合并冲突文件 code huan 2022-10-26 14:58:55 +08:00
  • 706346338b 获取店铺首页 chc 2022-10-25 19:13:03 +08:00
  • aee846764b 更新无法更新分销员待提现总金额的bug neo0820 2022-10-19 22:04:09 +08:00
  • 391b35ef1f sql错误 chc 2022-10-25 18:37:12 +08:00
  • 9364841cf4
         update README.md. 蔡洪呈 2022-10-24 08:39:35 +00:00
  • 0d7b44fe51
         !247 fix: 优化生成商品索引，取消检查库存不为0 优化es商品搜索及es商品特定查询条件的分页 Merge pull request !247 from OceansDeep/feature/pg OceansDeep 2022-10-24 06:40:33 +00:00
  • 47734cfca6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-10-24 14:38:08 +08:00
  • a272e53519 fix: 优化es商品搜索及es商品特定查询条件的分页 paulGao 2022-10-24 14:37:36 +08:00
  • 710fe1998b fix: 限流次数不对 xiaochangbai 2022-10-21 17:36:26 +08:00
  • 31c76c08b8
         update pom.xml. 修改revision版本号 蔡洪呈 2022-10-21 08:48:17 +00:00
  • e8e2e8e315 v4.2.5 chc 2022-10-21 11:27:28 +08:00
  • 5a1c6b9e7f v4.2.5 chc 2022-10-21 11:26:55 +08:00
  • 1d98d8eecb 店员 chc 2022-10-20 17:28:37 +08:00