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

Commit Graph

  • da9ea504fb Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-08-02 15:15:43 +08:00
  • bb171f6e23 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-08-02 10:57:31 +08:00
  • b860c2eed0 优化结构 Chopper 2022-08-02 10:52:47 +08:00
  • fdf81d1b39 分词问题优化 Chopper 2022-08-02 10:51:10 +08:00
  • 40bf6d3010 优化获取秒杀活动 paulGao 2022-07-27 22:13:56 +08:00
  • 2d63d36f51
         !217 优化促销验证商品，检查商品是否可以参与促销 Merge pull request !217 from OceansDeep/feature/pg OceansDeep 2022-07-27 09:22:37 +00:00
  • ed976e90dc 优化促销验证商品，检查商品是否可以参与促销 paulGao 2022-07-27 17:21:48 +08:00
  • 6f4994b5da
         !216 add transactional Merge pull request !216 from OceansDeep/feature/pg OceansDeep 2022-07-27 04:07:29 +00:00
  • a2a923809e add transactional paulGao 2022-07-27 12:06:47 +08:00
  • 8d06ccace9
         !215 修复小程序注册用户没有发送会员注册信息问题 Merge pull request !215 from OceansDeep/feature/pg OceansDeep 2022-07-26 11:30:20 +00:00
  • 99479e722a 修复小程序注册用户没有发送会员注册信息问题 paulGao 2022-07-26 19:18:01 +08:00
  • 70890cdc19
         !214 修复积分商品购买时，价格问题 Merge pull request !214 from OceansDeep/feature/pg OceansDeep 2022-07-25 13:00:47 +00:00
  • 0eebc544a6 修复积分商品购买时，价格问题 paulGao 2022-07-25 20:52:03 +08:00
  • 12280e5769
         !213 优化代码，修复自动生成的es分词无效问题 Merge pull request !213 from OceansDeep/feature/pg OceansDeep 2022-07-21 03:53:36 +00:00
  • 4ec2c1b943 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-21 11:52:17 +08:00
  • d6edb93403 优化代码，修复自动生成的es分词无效问题 paulGao 2022-07-21 11:52:12 +08:00
  • 3236a05ae9 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-07-19 18:45:42 +08:00
  • 5576ae7305 解决 lilishop4.2.4中存在序列化购物车，促销信息会在序列化后丢失，无法反序列化。 Chopper 2022-07-19 18:45:08 +08:00
  • d5aadf6926 店铺入驻分批保存可能存在无法入住问题解决 Chopper 2022-07-19 18:38:38 +08:00
  • 2eb469b228 improve code paulGao 2022-07-19 15:24:39 +08:00
  • 088c6faae1 店铺保存问题处理，解决可能存在多次入驻店铺无法申请失败问题 Chopper 2022-07-19 15:15:59 +08:00
  • 04f7d22e3f
         !212 优化商品索引的促销信息生成。优化批量生成分词 Merge pull request !212 from OceansDeep/feature/pg OceansDeep 2022-07-18 11:12:12 +00:00
  • 950274f6be 优化商品索引的促销信息生成。优化批量生成分词 paulGao 2022-07-18 19:06:17 +08:00
  • c6596fff1a
         !211 更新部分es日志 Merge pull request !211 from OceansDeep/feature/pg OceansDeep 2022-07-18 04:11:55 +00:00
  • 7cbbc57514 更新部分es日志 paulGao 2022-07-18 12:11:16 +08:00
  • 8041a4a4fc 店铺退款流水金额计算错误 fengtianyangyang 2022-07-15 14:27:10 +08:00
  • 1fa247aa35
         !210 优化保存楼层装修。优化管理端优惠券搜索 Merge pull request !210 from OceansDeep/feature/pg OceansDeep 2022-07-13 13:05:15 +00:00
  • 7de49dcfb8 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-13 20:03:12 +08:00
  • b21e307640 优化保存楼层装修。优化管理端优惠券搜索 paulGao 2022-07-13 20:03:05 +08:00
  • aae7eedd49 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-07-13 19:06:06 +08:00
  • bce60310c5 minio增加字段，可配置前端访问地址。endpoint可以继续走局域网ip Chopper 2022-07-13 19:05:59 +08:00
  • d17cb4ce96
         !209 修复批发商品订单下单时，订单单项价格错误问题 Merge pull request !209 from OceansDeep/feature/pg OceansDeep 2022-07-12 09:16:09 +00:00
  • 4b25a03b1d Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-12 17:13:35 +08:00
  • 682433efe4 修复批发商品订单下单时，订单单项价格错误问题 paulGao 2022-07-12 17:13:17 +08:00
  • a6f28d67eb 代码格式化一下 Chopper 2022-07-12 10:17:34 +08:00
  • c663aa2799 minio上传失败前端无感知问题处理 Chopper 2022-07-11 18:53:07 +08:00
  • 2c02b816b5 一个分销时间展示以及一个字段没有正确的存储值问题处理 Chopper 2022-07-11 18:52:31 +08:00
  • d14b87729a
         !208 解决短信发送失败 时，前端无感知问题。from zypy333/N/A Merge pull request !208 from zypy333/N/A Chopper711 2022-07-11 03:51:16 +00:00
  • 70b41ab8a8 sql修改 fengtianyangyang 2022-07-08 15:17:59 +08:00
  • d185b548f7
         update framework/src/main/java/cn/lili/modules/sms/impl/SmsUtilAliImplService.java. 抛出返回码错误 zypy333 2022-07-08 03:57:53 +00:00
  • 4b5dcec08b
         !207 优化取消订单生成店铺流水 Merge pull request !207 from OceansDeep/feature/pg OceansDeep 2022-07-07 10:11:04 +00:00
  • 13a7a875a4 优化取消订单生成店铺流水 paulGao 2022-07-07 18:10:31 +08:00
  • 8743bf4b93
         !206 增加取消订单生成店铺流水，优化代码 Merge pull request !206 from OceansDeep/feature/pg OceansDeep 2022-07-07 09:26:32 +00:00
  • d8792e9e27 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-07 17:25:36 +08:00
  • 82a0cd0336 增加取消订单生成店铺流水，优化代码 paulGao 2022-07-07 17:25:15 +08:00
  • 60ae5b8965 后台用户编辑问题处理 Chopper 2022-07-06 17:30:01 +08:00
  • 4d4b54ec36 分销订单0元佣金记录订单问题处理 Chopper 2022-07-06 16:41:40 +08:00
  • 53f6910a34 积分商品不允许使用优惠券 Chopper 2022-07-06 15:57:49 +08:00
  • 826c3a8f8f
         !205 代码优化，修复订单投诉问题 Merge pull request !205 from OceansDeep/feature/pg OceansDeep 2022-07-04 10:32:34 +00:00
  • 727ddd3198 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-07-04 18:31:49 +08:00
  • 7b535434ae 代码优化，修复订单投诉问题 paulGao 2022-07-04 18:31:36 +08:00
  • da8ed53c60
         !204 修正方法命名 Merge pull request !204 from zypy333/N/A 感谢支持 Chopper711 2022-07-04 09:14:40 +00:00
  • 40e9d6f392 时间不归零导致无法展示订单统计历史数据 Chopper 2022-07-01 15:36:07 +08:00
  • d189f55de1
         修正方法命名 zypy333 2022-07-01 03:18:20 +00:00
  • 893f4a0388
         !202 update framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java. Merge pull request !202 from zypy333/N/A Chopper711 2022-06-30 07:21:35 +00:00
  • a28547c581
         update framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java. 修正错别字 zypy333 2022-06-29 03:10:05 +00:00
  • a8079e0d35
         !201 优化生成索引时，自动将分词信息添加到分词表 Merge pull request !201 from OceansDeep/feature/pg OceansDeep 2022-06-29 01:42:36 +00:00
  • 60a210a45f 优化生成索引时，自动将分词信息添加到分词表 paulGao 2022-06-29 09:33:02 +08:00
  • 170aa01946 变更购物车会导致优惠券金额错误问题处理 Chopper 2022-06-27 17:57:48 +08:00
  • f4c8e5d493
         !200 优化商品索引，如数据库中无当前商品则删除商品索引 Merge pull request !200 from OceansDeep/feature/pg OceansDeep 2022-06-23 01:58:22 +00:00
  • b3a0a402d7 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 paulGao 2022-06-23 09:55:52 +08:00
  • b6c70d1530
         update README.md. Chopper711 2022-06-23 01:46:05 +00:00
  • 8fbc7b9f5c Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-23 09:11:37 +08:00
  • 3c2e73b5f5 调整es日志级别 Chopper 2022-06-23 09:11:33 +08:00
  • 1a221eefe3 优化商品索引，如数据库中无当前商品则删除商品索引 paulGao 2022-06-22 18:42:04 +08:00
  • 5912428c00
         !199 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 Merge pull request !199 from OceansDeep/feature/pg OceansDeep 2022-06-22 09:46:45 +00:00
  • f01236cc96 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 paulGao 2022-06-22 17:44:40 +08:00
  • ad1f5a297e 修复获取会员钱包可能发生的异常 paulGao 2022-06-22 17:32:19 +08:00
  • 96697e11fd 优化监听事务提交发送mq事件，为订单变更发送mq增加事务提交监听 paulGao 2022-06-22 17:31:26 +08:00
  • 25e8b9b578
         !198 修复编辑有参加商品的促销活动的时间时，原参与活动的商品的时间没有更新问题 Merge pull request !198 from OceansDeep/feature/pg OceansDeep 2022-06-22 07:06:39 +00:00
  • 49603e29bd 修复编辑有参加商品的促销活动的时间时，原参与活动的商品的时间没有更新问题 paulGao 2022-06-22 15:05:25 +08:00
  • 6a18489c15
         !197 代码结构优化。默认拼团结束时间修改为24小时 Merge pull request !197 from OceansDeep/feature/pg OceansDeep 2022-06-22 06:53:21 +00:00
  • cb52fca2a4 代码结构优化。默认拼团结束时间修改为24小时 paulGao 2022-06-22 14:44:58 +08:00
  • 00964e6bbf Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-20 15:29:10 +08:00
  • ea1b91af2a 日志内容意义不明确优化，补充备注。去除一行无效的代码。 Chopper 2022-06-20 12:01:32 +08:00
  • 8894e5482f minio删除文件错误bug修复 Chopper 2022-06-20 11:06:20 +08:00
  • e17e3474ca 优化商品索引搜索 paulGao 2022-06-17 19:08:08 +08:00
  • 6d09bd4987 优化商品索引搜索 paulGao 2022-06-17 15:40:52 +08:00
  • 84f3907140
         !194 修复生成索引时no such index问题 Merge pull request !194 from OceansDeep/feature/pg OceansDeep 2022-06-17 03:21:07 +00:00
  • d704e2eb55 修复生成索引时no such index问题 paulGao 2022-06-17 11:20:22 +08:00
  • 2e4c6f4284
         !193 增加批发商品不能参加促销活动的限制 修复批发商品购买数量限制 Merge pull request !193 from OceansDeep/feature/pg OceansDeep 2022-06-16 08:47:21 +00:00
  • 61c77e0047 修复批发商品购买数量限制 paulGao 2022-06-16 16:46:09 +08:00
  • cf1e6fc283 增加批发商品不能参加促销活动的限制 paulGao 2022-06-16 16:40:28 +08:00
  • b361e46fb7
         !192 优化代码，修复bug Merge pull request !192 from OceansDeep/feature/pg OceansDeep 2022-06-16 02:22:47 +00:00
  • 7bb06e7fdc 优化代码，修复bug paulGao 2022-06-16 10:21:41 +08:00
  • 9f83b40be4 错误提交 caihongcheng 2022-06-15 18:21:06 +08:00
  • 1edd3441bc 电子面单 caihongcheng 2022-06-15 18:09:55 +08:00
  • 079a4a2cf6
         !191 优化编辑店铺信息后，清除缓存 Merge pull request !191 from OceansDeep/feature/pg OceansDeep 2022-06-14 07:38:31 +00:00
  • 049a759cda 优化编辑店铺信息后，清除缓存 paulGao 2022-06-14 15:36:29 +08:00
  • a6ff38159f
         !190 优化索引生成，商品索引查询 Merge pull request !190 from OceansDeep/feature/pg OceansDeep 2022-06-13 10:51:16 +00:00
  • 056f040317 优化索引生成，商品索引查询 paulGao 2022-06-13 18:50:09 +08:00
  • c161206832
         update README.md. chopper711 2022-06-13 06:54:12 +00:00
  • e9a0c293f8
         update README.md. chopper711 2022-06-13 06:53:48 +00:00
  • 24de62f5f4
         !189 优化代码结构 Merge pull request !189 from OceansDeep/feature/pg OceansDeep 2022-06-10 10:43:28 +00:00
  • b7b278f296 优化代码结构 paulGao 2022-06-10 18:42:56 +08:00
  • 712941038b
         !188 优化初始化商品索引，增加编辑商品时，保留原商品的销量、好评率和评价量 Merge pull request !188 from OceansDeep/feature/pg OceansDeep 2022-06-09 08:46:56 +00:00
  • 4316fa8953 优化初始化商品索引，增加编辑商品时，保留原商品的销量、好评率和评价量 paulGao 2022-06-09 16:43:16 +08:00
  • d14763d52c 优化代码，增加buyer启动时检测es索引存在，如不存在则自动创建 paulGao 2022-06-09 15:32:24 +08:00
  • 79e1f34890
         !187 优化代码，修复bug Merge pull request !187 from OceansDeep/feature/pg OceansDeep 2022-06-09 01:19:19 +00:00
  • 3cb8e066b3 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-09 09:16:18 +08:00