|
|
17b557df77
|
修改条件
|
2025-09-11 15:10:26 +08:00 |
|
jiaji.H
|
9635ec4572
|
Updata：区分套餐权益和附加权益
|
2025-09-11 14:54:21 +08:00 |
|
|
|
0dcbb3a057
|
解决冲突
|
2025-09-11 14:54:12 +08:00 |
|
|
|
64c56d5ca3
|
单价模式新加总价字段
|
2025-09-11 14:47:07 +08:00 |
|
jiaji.H
|
4d42019882
|
feat：分类权益
|
2025-09-10 13:55:41 +08:00 |
|
jiaji.H
|
5d47d6f1a9
|
feat:解决冲突
|
2025-09-09 11:02:31 +08:00 |
|
jiaji.H
|
2461bb8a93
|
feat：修改服务列表额度字段逻辑
|
2025-09-09 10:59:23 +08:00 |
|
jiaji.H
|
49f89d1319
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-09 10:16:23 +08:00 |
|
jiaji.H
|
2280cc40d9
|
Updata：更新数据库字段定义
|
2025-09-09 09:26:21 +08:00 |
|
|
|
1d6b207aea
|
添加套餐激活状态
|
2025-09-05 14:58:28 +08:00 |
|
|
|
73d997f754
|
Merge branch 'feat-cjy-taskBanch' into dev
|
2025-09-05 09:35:14 +08:00 |
|
|
|
dad33b003e
|
bugfix: 修复查询报错
|
2025-09-05 09:34:07 +08:00 |
|
|
|
b6dd26f8a3
|
Merge branch 'feat-cjy-taskBanch' into dev
|
2025-09-04 19:02:39 +08:00 |
|
|
|
c18f4162ff
|
bugfix:修改关于时间区间的处理
|
2025-09-04 19:01:15 +08:00 |
|
jiaji.H
|
caca0d91c7
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-04 13:26:26 +08:00 |
|
jiaji.H
|
7741a5dc35
|
Updata：不在定义内的额度信息
|
2025-09-04 13:25:52 +08:00 |
|
jiaji.H
|
a803a80f52
|
Merge branch 'feat-hjj-packageManage#A116' into dev
|
2025-09-04 11:55:58 +08:00 |
|
jiaji.H
|
04b4b3f7c5
|
Updata：去除不必要err
|
2025-09-04 11:55:50 +08:00 |
|
jiaji.H
|
e5d4e80e19
|
feat：解决冲突
|
2025-09-04 11:41:12 +08:00 |
|
|
|
ab79bf6e89
|
bugfix:增加模糊查询艺人名字
|
2025-09-03 17:54:16 +08:00 |
|
jiaji.H
|
1624992428
|
Updata：添加需求字段赋值
|
2025-09-03 16:29:36 +08:00 |
|
|
|
478c553c37
|
Merge branch 'feat-cjy-taskBench' into dev
# Conflicts:
# pb/bundle/bundle.pb.go
# pb/bundle/bundle_triple.pb.go
|
2025-09-03 16:23:56 +08:00 |
|
jiaji.H
|
c1e1ef5e0f
|
Updata：补充筛选逻辑
|
2025-09-03 15:57:56 +08:00 |
|
|
|
019197fc15
|
feat: 新增任务台功能
新增任务管理台功能
|
2025-09-03 15:51:35 +08:00 |
|
jiaji.H
|
1c148b0078
|
feat：增加对增值服务的名称和类型筛选以及额度字段和是否过期作废字段展示
|
2025-09-03 15:21:02 +08:00 |
|
jiaji.H
|
0c7f70af93
|
feat:增加额度对应需求字段
|
2025-09-03 11:33:05 +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 |
|
|
|
346dcb1d94
|
Merge branch 'feat-zjy-issue-013' into main
# Conflicts:
# pb/bundle/bundle.pb.go
|
2025-07-08 15:20:34 +08:00 |
|
|
|
de204751ac
|
修改
|
2025-07-08 15:10:45 +08:00 |
|
|
|
2e845b4fe1
|
修改
|
2025-07-08 15:10:26 +08:00 |
|
|
|
b2732eeaf9
|
解决冲突
|
2025-07-08 14:18:05 +08:00 |
|
|
|
744328055c
|
添加手续费
|
2025-07-08 14:17:38 +08:00 |
|
|
|
1dada43e0c
|
解决冲突
|
2025-07-07 19:34:57 +08:00 |
|
|
|
234d86896a
|
添加excel导入
|
2025-07-07 19:27:51 +08:00 |
|
|
|
402a7644e6
|
fix: 提交支持自动创建用户和订单代码
|
2025-07-07 13:31:17 +08:00 |
|
|
|
841ec173c4
|
Merge branch 'dev-lzh'
|
2025-07-07 11:58:32 +08:00 |
|
|
|
776574c4e0
|
Merge branch 'dev-lzh' into dev
|
2025-07-07 10:46:51 +08:00 |
|
|
|
87b7805c42
|
添加扩展记录的时间单位
|
2025-07-07 10:46:13 +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 |
|
|
|
40b3d8ddde
|
Merge branch 'dev-lzh' into dev
|
2025-06-27 17:57:24 +08:00 |
|
|
|
a556777369
|
优化待确认作品查询逻辑，拆分状态条件子查询
|
2025-06-27 17:42:10 +08:00 |
|
|
|
37c525d5c2
|
"优化用户余额查询SQL，增加过期时间倒序排序；修正发布平台ID字段命名大小写不一致问题"
|
2025-06-27 16:10:39 +08:00 |
|
|
|
4ec5bb8915
|
"修正字段命名大小写不一致问题"
|
2025-06-27 15:29:53 +08:00 |
|
|
|
335a61d6e7
|
"添加过期时间降序排序并优化查询字段"
|
2025-06-27 14:44:42 +08:00 |
|
|
|
b06d06c8e2
|
添加用户ID分组查询条件
|
2025-06-27 14:37:28 +08:00 |
|
|
|
1f1fbed3a8
|
"修改数据库表名从 fiee_bundle 到 micro_bundle"
|
2025-06-27 11:32:17 +08:00 |
|
|
|
8fe858aa03
|
Merge branch 'main' of https://gitea-inner.fontree.cn/fiee/micro-bundle
|
2025-06-26 17:33:08 +08:00 |
|
|
|
f3e29cb7e8
|
解决冲突
|
2025-06-26 17:32:53 +08:00 |
|
|
|
ae4bbe29c0
|
Merge branch 'sxy'
|
2025-06-26 17:31:25 +08:00 |
|
|
|
bfc409ed70
|
Merge branch 'dev-lzh'
|
2025-06-26 17:18:58 +08:00 |
|
|
|
ea4d3cacd4
|
Merge branch 'sxy' into dev
|
2025-06-26 17:10:45 +08:00 |
|
|
|
a01be125e6
|
修改冲突
|
2025-06-26 17:10:29 +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 |
|
|
|
0a4218757e
|
`
|
2025-06-26 09:19:23 +08:00 |
|
|
|
150e7162fe
|
优化待确认作品查询SQL，调整状态过滤条件位置
|
2025-06-26 09:18:51 +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 |
|
|
|
f2785fd407
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 15:23:18 +08:00 |
|
|
|
4f9b72928b
|
"修正发布平台ID字段命名大小写不一致问题"
|
2025-06-25 15:21:53 +08:00 |
|
|
|
953641b575
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 13:49:03 +08:00 |
|
|
|
7468c2f442
|
"修正用户余额查询SQL中的字段别名拼写错误"
|
2025-06-25 13:48:54 +08:00 |
|
|
|
047451e5c4
|
Merge branch 'sxy' into dev
|
2025-06-25 13:37:43 +08:00 |
|
|
|
9c9e9c0663
|
修改返回数据校验
|
2025-06-25 13:36:33 +08:00 |
|
|
|
f4841ed772
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 11:56:20 +08:00 |
|
|
|
e4a9c3ac4d
|
优化套餐余额查询SQL，调整JOIN逻辑并简化查询条件
|
2025-06-25 11:56:09 +08:00 |
|
|
|
63516ad0a8
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 10:14:06 +08:00 |
|
|
|
92c8e4d574
|
优化套餐余额更新方式，直接使用旧数据模型并改用Save方法
|
2025-06-25 10:13:57 +08:00 |
|
|
|
93dac4ec2e
|
Merge branch 'dev-lzh' into dev
|
2025-06-25 09:33:37 +08:00 |
|
|
|
1b5b6037fd
|
增加待确认作品状态过滤条件
|
2025-06-25 09:33:29 +08:00 |
|
|
|
5a3367e47d
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 17:08:47 +08:00 |
|
|
|
1885d2b8dc
|
"优化用户余额查询的JOIN方式并添加分组"
|
2025-06-24 17:08:36 +08:00 |
|
|
|
7154d0a92a
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 16:29:20 +08:00 |
|
|
|
f55af5f719
|
过滤待确认条件
|
2025-06-24 16:29:11 +08:00 |
|
|
|
cd4e1492c8
|
Merge branch 'sxy' into dev
|
2025-06-24 16:01:05 +08:00 |
|
|
|
668b7eb06e
|
修改信息-服务类型
|
2025-06-24 16:00:45 +08:00 |
|
|
|
6e29d40998
|
Merge branch 'sxy' into dev
|
2025-06-24 15:54:25 +08:00 |
|
|
|
56c17a709f
|
修改信息
|
2025-06-24 15:53:10 +08:00 |
|
|
|
d6888a4e3c
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 15:14:18 +08:00 |
|
|
|
043274e61f
|
添加余量信息已购买字段
|
2025-06-24 15:08:37 +08:00 |
|
|
|
38fccfa827
|
Merge branch 'dev-lzh' into dev
|
2025-06-24 15:04:16 +08:00 |
|
