|
|
e7188528f0
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:15:38 +08:00 |
|
|
|
9ddb7e8276
|
fix: 调整创建订单的uuid
|
2026-02-04 13:15:18 +08:00 |
|
|
|
00460ed290
|
Merge branch 'feat-zjy-fixbug-033' into dev
|
2026-02-04 13:09:05 +08:00 |
|
|
|
151abc145b
|
fix: 调整创建订单的uuid
|
2026-02-04 13:08:18 +08:00 |
|
|
|
a822149b30
|
Merge branch 'feat-zjy-fixbug-033' into dev
# Conflicts:
# internal/logic/orderRecordsLogic.go
# pb/bundle.proto
# pb/bundle/bundle.pb.go
# pb/bundle/bundle.validator.pb.go
# pb/bundle/bundle_triple.pb.go
|
2026-02-04 12:17:23 +08:00 |
|
|
|
2155d56187
|
fix: 调整创建订单的uuid
|
2026-02-04 12:13:00 +08:00 |
|
|
|
6ef896b009
|
fix: rizhi
|
2026-02-04 11:26:30 +08:00 |
|
|
|
4f3fcb8206
|
修改
|
2026-02-03 16:46:33 +08:00 |
|
|
|
fa43fadae2
|
添加竞品数
|
2026-02-03 10:18:40 +08:00 |
|
|
|
e7fff341ca
|
Update orderRecordsDao.go
|
2026-02-02 09:58:39 +08:00 |
|
|
|
84dacc72ce
|
添加购买类型字段
|
2026-01-30 14:26:28 +08:00 |
|
|
|
8b85aeee28
|
11
|
2026-01-12 18:08:45 +08:00 |
|
|
|
bbe0c0390c
|
11
|
2026-01-12 14:36:20 +08:00 |
|
|
|
71f7be5716
|
fix: 支付回调，更新手续费
|
2026-01-07 10:50:51 +08:00 |
|
|
|
fa640ed8ef
|
修改合同签署
|
2025-12-25 18:44:43 +08:00 |
|
|
|
d3e66c1167
|
Update orderRecordsDao.go
|
2025-10-28 16:06:12 +08:00 |
|
|
|
328b3e2197
|
Update orderRecordsDao.go
|
2025-10-28 10:14:07 +08:00 |
|
|
|
e0361c89da
|
Update orderRecordsDao.go
|
2025-10-28 10:03:43 +08:00 |
|
|
|
47db06f1f5
|
Update orderRecordsDao.go
|
2025-10-28 09:46:14 +08:00 |
|
|
|
8c1afa3d83
|
Update orderRecordsDao.go
|
2025-10-28 09:38:46 +08:00 |
|
|
|
af4ad3339f
|
订单详情添加类型
|
2025-10-20 15:19:59 +08:00 |
|
|
|
567f70c610
|
Merge branch 'jng' into dev
|
2025-07-16 19:01:27 +08:00 |
|
|
|
2edf4b82ae
|
修改
|
2025-07-16 19:01:04 +08:00 |
|
|
|
567503bcd6
|
Merge branch 'jng' into dev
|
2025-07-16 18:18:44 +08:00 |
|
|
|
145486aec2
|
修改
|
2025-07-16 18:18:24 +08:00 |
|
|
|
6cf7804b39
|
修改
|
2025-07-16 17:53:27 +08:00 |
|
|
|
b149446170
|
修改
|
2025-07-16 17:52:50 +08:00 |
|
|
|
24102eccbd
|
11
|
2025-07-08 16:16:04 +08:00 |
|
|
|
dad01f7f85
|
解决冲突
|
2025-07-08 16:12:50 +08:00 |
|
|
|
383a64077d
|
添加手续费
|
2025-07-08 16:12:16 +08:00 |
|
|
|
1dada43e0c
|
解决冲突
|
2025-07-07 19:34:57 +08:00 |
|
|
|
402a7644e6
|
fix: 提交支持自动创建用户和订单代码
|
2025-07-07 13:31:17 +08:00 |
|
|
|
d5e4c9590f
|
Merge branch 'jng'
|
2025-07-03 16:11:44 +08:00 |
|
|
|
bda31412ee
|
Merge branch 'jng' into dev
|
2025-07-03 14:31:35 +08:00 |
|
|
|
e9f12cd0eb
|
111
|
2025-07-03 14:28:09 +08:00 |
|
|
|
e7a5e19472
|
添加手续费字段
|
2025-07-03 14:02:25 +08:00 |
|
|
|
76e2b893a1
|
解决冲突
|
2025-07-02 15:30:51 +08:00 |
|
|
|
641c10aec2
|
解决冲突
|
2025-07-02 14:01:44 +08:00 |
|
|
|
0f40072e22
|
添加支付时间筛选
|
2025-07-02 14:00:54 +08:00 |
|
|
|
57a3154634
|
fix: 拦截重复回调
|
2025-06-27 20:03:21 +08:00 |
|
|
|
f3e29cb7e8
|
解决冲突
|
2025-06-26 17:32:53 +08:00 |
|
|
|
bfc409ed70
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:58 +08:00 |
|
|
|
46ffdc0d0d
|
Merge branch 'jng' into dev
|
2025-06-26 13:53:41 +08:00 |
|
|
|
7c0027f624
|
修改
|
2025-06-26 13:53:16 +08:00 |
|
|
|
c25157b661
|
Merge branch 'jng' into dev
|
2025-06-26 13:41:07 +08:00 |
|
|
|
397dd56761
|
修改
|
2025-06-26 13:40:03 +08:00 |
|
|
|
24a6fd1eba
|
Merge branch 'jng' into dev
|
2025-06-25 16:58:31 +08:00 |
|
|
|
26eb0df464
|
修改
|
2025-06-25 16:57:57 +08:00 |
|
|
|
66f70eb643
|
修改
|
2025-06-25 15:31:42 +08:00 |
|
|
|
b9313b9ba2
|
添加状态筛选
|
2025-06-25 15:29:37 +08:00 |
|
