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

Commit Graph

  • 5e6a56e193 优化代码，修改一个可能出现的获取商品分类的错误 paulGao 2022-06-09 09:15:57 +08:00
  • 478ba2048a 修改商品有效性判定中，根据商品更新时间比较改为商品创建时间比较（因修改了商品更新逻辑，每次都是删除后新增，所以无商品更新时间） paulGao 2022-06-09 09:13:13 +08:00
  • 8426294a0f 修复判断会员存在条件参数传递顺序错误问题 paulGao 2022-06-08 16:35:44 +08:00
  • 178954c8b2
         !186 适配优化的sql，将平台id改为0 Merge pull request !186 from OceansDeep/feature/pg OceansDeep 2022-06-08 08:16:05 +00:00
  • 6ce2b65d89 适配优化的sql，将平台id改为0 paulGao 2022-06-08 16:15:14 +08:00
  • fb45fee426 提现申请时，预存款金额为0无法审核通过错误 fengtianyangyang 2022-06-07 18:41:31 +08:00
  • ffca49f469 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-07 18:30:24 +08:00
  • f32c7a7253 运费计算模式调整 同一运费模版的商品，采用累加计算，起送费/虚件（重）费用。 Chopper 2022-06-07 18:30:21 +08:00
  • a64ccdba78
         !185 修复一个可能出现的获取促销信息的bug Merge pull request !185 from OceansDeep/feature/pg OceansDeep 2022-06-07 07:24:58 +00:00
  • 5f6bae6fa9 修复一个可能出现的获取促销信息的bug paulGao 2022-06-07 15:18:07 +08:00
  • fd503b4071
         !184 过滤无效促销信息异常增加日志 Merge pull request !184 from OceansDeep/feature/pg OceansDeep 2022-06-07 07:07:54 +00:00
  • 9ece357e39 过滤无效促销信息异常增加日志 paulGao 2022-06-07 15:07:14 +08:00
  • d53c8362a2
         !183 修复一个可能出现的获取促销信息的bug Merge pull request !183 from OceansDeep/feature/pg OceansDeep 2022-06-07 04:31:08 +00:00
  • 8f3ca8c28d 修复一个可能出现的获取促销信息的bug paulGao 2022-06-07 12:30:29 +08:00
  • 7f5675ae3c
         !182 修复一个可能出现的获取促销信息的bug Merge pull request !182 from OceansDeep/feature/pg OceansDeep 2022-06-07 04:16:37 +00:00
  • 7b9f4be98c 修复一个可能出现的获取促销信息的bug paulGao 2022-06-07 12:16:08 +08:00
  • ca352ca341 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-07 09:37:25 +08:00
  • a22ccbdda5 兼容MINIO Chopper 2022-06-07 09:35:58 +08:00
  • e6b50248de
         !181 修复券活动获取的优惠券某些情况不能使用问题 Merge pull request !181 from OceansDeep/feature/pg OceansDeep 2022-06-06 07:26:12 +00:00
  • ee3f8a9261 修复券活动获取的优惠券某些情况不能使用问题 paulGao 2022-06-06 15:24:52 +08:00
  • 922d7222cd
         !180 修复一个可能发生的获取订单信息时发生的错误 Merge pull request !180 from OceansDeep/feature/pg OceansDeep 2022-06-06 02:13:39 +00:00
  • 4a8900105b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-06 10:12:17 +08:00
  • 65a4bb7778 修复一个可能发生的获取订单信息时发生的错误 paulGao 2022-06-06 10:12:09 +08:00
  • 3944551c06
         !179 修复取消订单商品时库存更新问题 Merge pull request !179 from OceansDeep/feature/pg OceansDeep 2022-06-02 09:13:07 +00:00
  • 66d7ffbb17 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-06-02 16:58:42 +08:00
  • c4d879a0ad 修复取消订单商品时库存更新问题 paulGao 2022-06-02 16:50:26 +08:00
  • b97f77c740
         !176 智能商品推荐 Merge pull request !176 from viper/Intelligent_recommendation OceansDeep 2022-06-02 07:17:40 +00:00
  • 27ad9b0599
         !177 增加结算时当前商品促销最新状态的查询 Merge pull request !177 from OceansDeep/feature/pg OceansDeep 2022-06-02 02:32:37 +00:00
  • 234b8ab31c 增加结算时当前商品促销最新状态的查询（修复手动删除或下架促销活动时，购物车商品还是促销价格问题） paulGao 2022-06-02 10:31:24 +08:00
  • 519a608316 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-06-02 09:16:46 +08:00
  • d4a13c8a82 店铺商品数量，店铺缓存数据2小时。优化 Chopper 2022-06-02 09:16:30 +08:00
  • ccb57411a2 refactor:优化代码 xiaochangbai 2022-06-01 21:27:51 +08:00
  • 486bebe6d2 feat:智能商品推荐 xiaochangbai 2022-06-01 18:03:30 +08:00
  • 5b3129bf01
         !174 优化商品信息变更时，删除商品缓存流程 Merge pull request !174 from OceansDeep/feature/pg OceansDeep 2022-06-01 07:24:22 +00:00
  • 23c742c4c6 优化商品信息变更时，删除商品缓存流程 paulGao 2022-06-01 15:23:21 +08:00
  • 90d3bbd79e
         !173 修复新增商品时，批发商品规则没有保存问题 Merge pull request !173 from OceansDeep/feature/pg OceansDeep 2022-05-31 09:27:36 +00:00
  • 400a06d2ac 修复新增商品时，批发商品规则没有保存问题 paulGao 2022-05-31 17:23:21 +08:00
  • 594d2f620c
         !172 修复编辑商品时默认读取缓存中的数据 Merge pull request !172 from OceansDeep/feature/pg OceansDeep 2022-05-31 09:01:34 +00:00
  • 1a6ec578de 修复编辑商品时默认读取缓存中的数据 paulGao 2022-05-31 17:01:01 +08:00
  • e009604595
         !171 修复无法新建批发商品 Merge pull request !171 from OceansDeep/feature/pg OceansDeep 2022-05-31 08:34:24 +00:00
  • 8b23c623d1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-05-31 16:34:01 +08:00
  • a3c4e72902 修复无法新建批发商品 paulGao 2022-05-31 16:33:10 +08:00
  • 7e54412fc3
         !167 修复直播延迟消息状态错误 Merge pull request !167 from viper/fix_broadcast-status-msg chopper711 2022-05-31 08:09:02 +00:00
  • 564970a324
         !170 分类编辑时,清除缓存;优化代码 Merge pull request !170 from OceansDeep/feature/pg OceansDeep 2022-05-31 06:38:52 +00:00
  • 1ecd32027e 分类编辑时,清除缓存;优化代码 paulGao 2022-05-31 14:37:18 +08:00
  • ceb5727337
         !169 修复新增编辑商品无商品图片问题 Merge pull request !169 from OceansDeep/feature/pg OceansDeep 2022-05-30 02:42:56 +00:00
  • 17c7552f7f 增加商品批发销售模式的处理。优化生成商品sku的结构。 paulGao 2022-05-30 10:39:12 +08:00
  • 8fbcad8856
         !168 增加商品批发销售模式的处理。优化生成商品sku的结构。 Merge pull request !168 from OceansDeep/feature/pg OceansDeep 2022-05-27 10:28:46 +00:00
  • a61fd454b4 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-05-27 16:32:56 +08:00
  • c0337afbaa 优化代码。升级hutool和lombok依赖 paulGao 2022-05-27 16:32:39 +08:00
  • acb9e78a36 增加商品批发销售模式的处理。优化生成商品sku的结构。 paulGao 2022-05-27 16:32:00 +08:00
  • 431ff04644 fix: 修复直播延迟消息状态错误 xiaochangbai 2022-05-26 16:24:39 +08:00
  • 201fb0a136 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-25 17:41:36 +08:00
  • 90671729ea 上一周期数据问题处理 Chopper 2022-05-25 17:41:31 +08:00
  • 8596175f8e
         !166 修复商品编辑规格时，删除规格后。es中没有删除问题。 Merge pull request !166 from OceansDeep/feature/pg OceansDeep 2022-05-25 03:25:34 +00:00
  • e9fdec6bb0 修复商品编辑规格时，删除规格后。es中没有删除问题。 paulGao 2022-05-25 11:22:53 +08:00
  • 026b6aca07
         !165 优化更新商品sku的方式 Merge pull request !165 from OceansDeep/feature/pg OceansDeep 2022-05-19 09:41:30 +00:00
  • fafe3c0c55 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-05-19 17:35:23 +08:00
  • f2b327c811 添加一种更新商品sku的方式。mysql replace into(先查找，如存在则删除，新增。如不存在新增) paulGao 2022-05-19 17:34:55 +08:00
  • 7fccbc2aa2 根据类型查看文章接口缺失 caihongcheng 2022-05-19 15:23:44 +08:00
  • 7c40f5988b Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-18 22:38:18 +08:00
  • b19e4043cd 字符串长度处理 Chopper 2022-05-18 22:38:13 +08:00
  • db75aa1cab
         !159 优化修改sku时，如存在sku则不新增 Merge pull request !159 from OceansDeep/feature/pg OceansDeep 2022-05-18 14:02:16 +00:00
  • f5718b4062 优化修改sku时，如存在sku则不新增 paulGao 2022-05-18 22:00:42 +08:00
  • d25f17782b 规范长度限制 Chopper 2022-05-18 21:35:17 +08:00
  • e3626a094d 支付参数长度进行限制 Chopper 2022-05-18 16:48:03 +08:00
  • fc7b17fe40 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-18 15:15:31 +08:00
  • 87e13b3677 支付问题处理 Chopper 2022-05-18 15:15:22 +08:00
  • a540e42460 siteController caihongcheng 2022-05-18 14:35:34 +08:00
  • c4e24fb0a3
         !158 优化生成商品索引，分批生成 Merge pull request !158 from OceansDeep/feature/pg OceansDeep 2022-05-13 10:19:42 +00:00
  • 31fb55635e 优化生成商品索引，分批生成 paulGao 2022-05-13 18:18:46 +08:00
  • 3dcff0b682 在线人数流量展示少一个小时问题处理 Chopper 2022-05-13 17:42:36 +08:00
  • 81f48d9c92 对上一周期的参数赋值做处理 Chopper 2022-05-13 11:45:30 +08:00
  • 6331b0d587 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-13 11:19:11 +08:00
  • 57cf3b94e0 足迹分页相关问题处理 Chopper 2022-05-13 11:19:02 +08:00
  • b683eac996
         !157 优化修改sku时，如存在sku则不新增 Merge pull request !157 from OceansDeep/feature/pg OceansDeep 2022-05-13 03:09:18 +00:00
  • ccdcb1d0f6 优化修改sku时，如存在sku则不新增 paulGao 2022-05-13 11:03:26 +08:00
  • 4f5f02f030 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-13 09:19:24 +08:00
  • 0629ce51af 默认值给予0 Chopper 2022-05-13 09:19:21 +08:00
  • 46f1fcc269 优化修改sku时，如存在sku则不新增 paulGao 2022-05-13 09:01:06 +08:00
  • b49b0290f8 还原多合并代码 fengtianyangyang 2022-05-12 15:30:53 +08:00
  • 7ca351f7cd 结算单-平台优惠券补贴金额错误修改 fengtianyangyang 2022-05-11 19:20:35 +08:00
  • 850b124da3 流量统计增加对上一周期的数据填充 Chopper 2022-05-11 17:49:44 +08:00
  • 49a2d3cab3
         !156 更新阿里云maven地址。更新部分依赖到最新 Merge pull request !156 from OceansDeep/feature/pg OceansDeep 2022-05-10 06:47:19 +00:00
  • 038eda1562 更新阿里云maven地址。更新部分依赖到最新 paulGao 2022-05-10 14:38:57 +08:00
  • b91c8e34c2 电子面单 caihongcheng 2022-05-09 09:27:30 +08:00
  • 0a631a7c93 requestData多了个引号 caihongcheng 2022-05-07 21:24:51 +08:00
  • 4705c2595a 追踪物流信息增加手机号后四位参数 caihongcheng 2022-05-06 16:16:34 +08:00
  • 0ff6809d63 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-05-06 15:51:19 +08:00
  • a375feabfc 售后流水问题，售后代码被多个地方调用的方式优化，以后只有一个入口 Chopper 2022-05-06 15:51:13 +08:00
  • 5b9fd139a3
         !155 修复结算时，清空购物车问题 Merge pull request !155 from OceansDeep/feature/pg OceansDeep 2022-05-06 07:51:04 +00:00
  • fd92d93289 修复结算时，清空购物车问题 paulGao 2022-05-06 15:50:20 +08:00
  • 840637c0d0 优化编辑商品状态时，商品缓存的删除 paulGao 2022-05-05 17:58:13 +08:00
  • f41f5386cc
         !154 修复防重复提交bug Merge pull request !154 from OceansDeep/feature/pg OceansDeep 2022-05-05 04:01:58 +00:00
  • f4a7d8ea92 修复防重复提交bug paulGao 2022-05-05 11:57:05 +08:00
  • 26c9160c75
         !152 优化默认生成的es商品索引结构。解决初次启动时，搜索商品报错 Merge pull request !152 from OceansDeep/feature/pg OceansDeep 2022-04-27 10:17:58 +00:00
  • 4c1955da75 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into feature/pg paulGao 2022-04-27 18:15:30 +08:00
  • 66e6272571 优化默认生成的es商品索引结构。解决初次启动时，搜索商品报错 paulGao 2022-04-27 18:15:11 +08:00
  • e9d5e705ed Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper 2022-04-26 14:16:44 +08:00
  • 16fdb28141 多修改的代码还原 Chopper 2022-04-26 14:16:39 +08:00