dev_caojiahao

caojiahao/dev_caojiahao

Fork 0

2be8bf27bf 虚拟订单无法售后问题 chc 2024-05-07 10:51:01 +08:00
2d052ffb1a

多了一个结束符号进行移除铉清 2024-04-19 05:17:44 +00:00
88ab071ac7 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2024-04-01 19:14:34 +08:00
bda72da679 fix: 足迹为空展示空信息问题，商品库存回滚数量错误问题 Chopper711 2024-04-01 19:14:28 +08:00
95e5ef2d33

!341 统计数据转换异常 Merge pull request !341 from Lele/dev Lele 2024-03-29 03:29:19 +00:00
48a294e7c6 fix: 统计数据转换异常 lele0521 2024-03-29 11:28:24 +08:00
794fa63302 fix: 核销订单如果订单不存在则抛出异常 Chopper711 2024-03-28 15:36:56 +08:00
cdb8e851a8 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop lele0521 2024-03-27 15:16:39 +08:00
f8ee3a8d15 fix: 统计数据转换异常 lele0521 2024-03-27 15:16:26 +08:00
76ab997922

!340 修复会员基本信息显示null异常 Merge pull request !340 from Lele/dev Lele 2024-03-27 01:03:02 +00:00
97e7a130f1 fix: 修复会员基本信息显示null异常 lele0521 2024-03-26 18:50:24 +08:00
2a96ad4af7

!339 修复商城问题文档中的bug Merge pull request !339 from Lele/dev Lele 2024-03-25 08:32:24 +00:00
e1aee4a744 fix: 修复商城问题文档中的bug lele0521 2024-03-25 16:29:24 +08:00
ecfe1524d4 fix: 修复商城问题文档中的bug lele0521 2024-03-25 16:26:21 +08:00
42ea2dc986 订单后台收款后返回状态不对 chc 2024-03-22 19:07:02 +08:00
230e2e7407

!336 【交易投诉】交由商家处理报错。 Merge pull request !336 from Lele/dev Lele 2024-03-21 08:22:49 +00:00
92639ba309 fix: 【交易投诉】交由商家处理报错。bug修复 lele0521 2024-03-21 16:21:29 +08:00
19b3225312

!335 修复添加APP版本控制异常 Merge pull request !335 from Lele/dev Lele 2024-03-21 05:54:53 +00:00
e56c20469d fix: APP版本控制区分APP类型 lele0521 2024-03-21 13:42:58 +08:00
a28eceaf61

!334 OSS资源管理中增加店铺名称搜索条件 Merge pull request !334 from Lele/dev Lele 2024-03-19 10:03:16 +00:00
1925c6d33c fix: OSS资源增加按店铺筛选 lele0521 2024-03-19 17:55:11 +08:00
fcac4002b1 fix: OSS资源增加按店铺筛选 lele0521 2024-03-19 17:03:55 +08:00
ed3a2ae9fc Merge branch 'master' into dev lele0521 2024-03-19 16:39:47 +08:00
4955d2135b fix: OSS资源增加按店铺筛选 lele0521 2024-03-19 16:39:36 +08:00
9f1dacc1d4 方法名修改 chc 2024-03-11 15:35:14 +08:00
f0765a6627 fix: 修复分销申请逻辑 lele0521 2024-03-07 11:23:50 +08:00
a31a9fdfbd fix: 修复字段错误 lele0521 2024-03-07 09:22:54 +08:00
fd2d0724a7 fix: token 过期后图片访问抛出一个未被捕获的异常问题处理，优化一个店铺审核的提示语 Chopper711 2024-02-01 15:37:59 +08:00
82d7389092 Merge remote-tracking branch 'origin/master' chc 2024-01-29 18:33:53 +08:00
a53eb3cfde 售后关闭功能同步 chc 2024-01-29 18:33:47 +08:00
bd048d725c

!333 增加默认退款金额显示 Merge pull request !333 from Lele/dev Lele 2024-01-29 06:37:37 +00:00
8e275613e1 fix: 增加默认退款金额显示 lele0521 2024-01-29 14:35:19 +08:00
fc869a34e0

!332 fix: 修复分销提现异常 Merge pull request !332 from Lele/dev Lele 2024-01-25 10:42:13 +00:00
48c84acb7c fix: 分销提现bug修复 lele0521 2024-01-25 18:39:27 +08:00
40d40a344e

!331 fix & improve Merge pull request !331 from OceansDeep/pg OceansDeep 2024-01-25 08:46:48 +00:00
d31257ba76 fix: 修复促销拼团订单取消后，活动结束后，检查成团没有筛选取消后的订单返还多余库存问题 misworga831 2024-01-25 16:12:33 +08:00
f0a80338da Merge remote-tracking branch 'origin/master' chc 2024-01-25 14:02:24 +08:00
6b5ca5b337 分类缓存获取 chc 2024-01-25 14:02:18 +08:00
61f9d7812d

!330 fix & improve Merge pull request !330 from OceansDeep/pg OceansDeep 2024-01-24 10:54:33 +00:00
d5eeafc554 fix: 优化虚拟商品不需要填写收货地址 misworga831 2024-01-24 18:53:31 +08:00
2175433444 fix: 优化取消订单返还促销商品库存 misworga831 2024-01-24 18:52:43 +08:00
cfbb1a1519 Merge branch 'master' of https://gitee.com/beijing_hongye_huicheng/lilishop pikachu1995@126.com 2024-01-24 14:54:29 +08:00
1302ca6de4 优化结算单退款计算逻辑 pikachu1995@126.com 2024-01-24 14:54:23 +08:00
239b520939 Merge remote-tracking branch 'origin/master' chc 2024-01-24 11:32:43 +08:00
56d9dbee5b 库存预警功能,预警为0不进行预警 chc 2024-01-24 11:32:28 +08:00
41decf1fa1

!329 fix & improve Merge pull request !329 from OceansDeep/pg OceansDeep 2024-01-24 02:11:26 +00:00
1d2cb5737d fix: 修复促销商品库存扣减问题 misworga831 2024-01-24 10:10:43 +08:00
a2496b267a fix: 优化商品图片获取 misworga831 2024-01-24 10:10:11 +08:00
178544fe2d 管理端支持下载结算单账单 pikachu1995@126.com 2024-01-24 09:48:25 +08:00
9e3b9c8f38 店铺结算单增加积分/砍价商品退款统计 pikachu1995@126.com 2024-01-23 15:06:14 +08:00
b439d8283f

!328 fix & improve Merge pull request !328 from OceansDeep/pg OceansDeep 2024-01-22 10:57:02 +00:00
fb48bce38d fix: 优化商品图片地址存储结构，只保留图片地址，去除其他无效参数，优化商品图片规则，改为全部通用spu图片，可为第一个规格项单独设置一个图片。 misworga831 2024-01-22 18:56:13 +08:00
b189fbe238 腾讯COS图片路径缺少符号 pikachu1995@126.com 2024-01-22 15:59:33 +08:00
26c1c97442

!327 fix & improve Merge pull request !327 from OceansDeep/pg OceansDeep 2024-01-22 02:55:04 +00:00
ee8f5b6e1e fix: 优化商品图片地址存储结构，只保留图片地址，去除其他无效参数，优化商品图片规则，改为全部通用spu图片，可为第一个规格项单独设置一个图片。 misworga831 2024-01-22 10:44:24 +08:00
6755515b1f upgrade: 更新 hutool 和 mybatis plus 版本 misworga831 2024-01-22 10:43:09 +08:00
074036c0b5

!326 退款状态功能增加字段 Merge pull request !326 from Lele/dev Lele 2024-01-18 09:45:11 +00:00
c7d0820eed Merge branch 'master' into dev lele0521 2024-01-18 17:42:37 +08:00
97c0fdbf1d feat: 退款状态功能增加字段 lele0521 2024-01-18 17:40:05 +08:00
a962939db8 库存预警功能 chc 2024-01-18 11:44:08 +08:00
a9802710ef

!325 修复日志格式异常 Merge pull request !325 from Lele/dev Lele 2024-01-17 10:30:54 +00:00
aaaa0b1ebf Merge branch 'master' into dev lele0521 2024-01-17 18:06:13 +08:00
f34d10146a fix: 修复日志异常 lele0521 2024-01-17 17:07:20 +08:00
b875cbdda4

!324 补充提交部分退款售后逻辑 Merge pull request !324 from Lele/dev Lele 2024-01-16 09:24:05 +00:00
d80a3f7f48 fix: 补充提交部分退款售后逻辑 lele0521 2024-01-16 17:18:28 +08:00
259946e78f

!323 增加操作日志、新增会员昵称默认规则、增加退款状态 Merge pull request !323 from Lele/dev Lele 2024-01-16 08:49:35 +00:00
9c24adf77d fix: 补充提交部分退款售后逻辑 lele0521 2024-01-16 16:45:27 +08:00
4c47d4aba2 fix: 区分商家、管理端OSS资源文件夹的创建 lele0521 2024-01-16 15:53:37 +08:00
7f9061cfc5 fix: Merging dev lele0521 2024-01-16 11:29:03 +08:00
085dad2107 库存预警功能回退 chc 2024-01-16 10:10:07 +08:00
055a7fffdb 首页暂不显示预警 chc 2024-01-11 13:33:46 +08:00
6cea6af59b 分包裹发货，库存预警 chc 2024-01-11 13:33:13 +08:00
6f0f8106e0 分包裹SQL chc 2024-01-08 19:15:07 +08:00
c9a0ce7985 feat: 增加退款状态（部分退款、全部退款） lele0521 2024-01-05 17:29:34 +08:00
b40533c553 feat: 增加操作日志（商品、用户、促销相关修改操作） lele0521 2024-01-04 18:10:57 +08:00
e2fff23080 feat: 新增会员昵称默认规则 lele0521 2024-01-04 17:36:39 +08:00
72482ee395 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop Chopper711 2023-12-18 08:40:31 +08:00
5366034556 fix: 禁用演示站点地区维护功能费 Chopper711 2023-12-18 08:40:24 +08:00
484e2a2318

!320 fix & improve Merge pull request !320 from OceansDeep/pg OceansDeep 2023-12-05 06:23:34 +00:00
0873fba7df fix: 优化商品参数聚合搜索 misworga831 2023-12-05 14:21:55 +08:00
4aa6f864f0

!319 fix & improve Merge pull request !319 from OceansDeep/pg OceansDeep 2023-12-05 06:07:08 +00:00
183b2ba30c fix: 优化商品参数聚合搜索 misworga831 2023-12-05 11:48:56 +08:00
071f15347e feat: 新增会员绑定手机号功能 lele0521 2023-12-04 16:05:17 +08:00
71ed58e665

!318 fix & improve Merge pull request !318 from OceansDeep/pg OceansDeep 2023-11-23 03:17:21 +00:00
50c7e20ba6 fix: 修复活动优惠券，没有生成商品促销信息问题 misworga831 2023-11-23 11:16:08 +08:00
876b801fa1 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop into pg misworga831 2023-11-21 10:15:06 +08:00
bd42b88b71 fix: 优化商品索引不存在，搜索商品报错 misworga831 2023-11-21 10:14:59 +08:00
b2dfb3abe2

update README.md. Chopper711 2023-11-08 08:18:00 +00:00
164f726222 fix: 将订单创建消息发送节点从业务类内部调整为事务提交节点 Chopper711 2023-11-08 09:15:06 +08:00
24cdf5cf00 fix: 商品评价更新后，清除sku缓存不全问题。获取有图评价过滤条件缺少状态问题 misworga831 2023-11-06 17:50:24 +08:00
93cb9da558

!317 fix & improve Merge pull request !317 from OceansDeep/pg OceansDeep 2023-11-06 07:21:01 +00:00
66c6bfa0fb fix: 优化自定义分词插入（修改为插入时，遇到唯一索引错误跳过） misworga831 2023-11-06 15:19:53 +08:00
edd93a6ad4

update README.md. Chopper711 2023-11-03 07:05:29 +00:00
ea1626a2ef

!315 fix & improve Merge pull request !315 from OceansDeep/pg OceansDeep 2023-10-24 08:30:44 +00:00
1f3b7f21bb fix: 优化更新商品评价为所有Sku的评价 misworga831 2023-10-24 16:29:04 +08:00
e6fe055cd5

!314 fix & improve Merge pull request !314 from OceansDeep/pg OceansDeep 2023-10-24 06:42:40 +00:00
1422b6fdbc fix: 优化更新商品评价为所有Sku的评价 misworga831 2023-10-24 14:41:41 +08:00
cfb70eff8a fix: 优化特殊情况下出现的商品数据无商品分类查询报错的问题 misworga831 2023-10-24 08:27:02 +08:00
dfe6085432 fix: buyer端增加获取sku接口 misworga831 2023-10-23 18:13:54 +08:00
b8e8db0e36

!313 fix & improve Merge pull request !313 from OceansDeep/pg OceansDeep 2023-10-23 06:22:27 +00:00

Commit Graph Select branches Hide Pull Requests master Mono Color

Commit Graph

Select branches

Hide Pull Requests

master