Commit Graph

177 Commits

Author SHA1 Message Date
lzh
dc5ba41c0d Merge branch 'dev-lzh' into dev 2025-06-15 11:44:28 +08:00
lzh
edbe9f2c0a 添加用户余量信息查询接口 2025-06-15 11:43:50 +08:00
lzh
99f04c1de2 添加用户余量信息查询接口 2025-06-15 11:34:51 +08:00
5157dd589e 解决冲突 2025-06-15 10:09:08 +08:00
b72b7e17ec 修改 2025-06-15 10:08:40 +08:00
sxy
8f533c4601 Merge branch 'sxy' into dev 2025-06-14 17:28:28 +08:00
sxy
ed66051786 修改条件限制 2025-06-14 17:28:19 +08:00
sxy
9415b3b701 Merge branch 'sxy' into dev 2025-06-14 17:21:39 +08:00
sxy
c4ef0b5f96 修改返回节省金额 2025-06-14 17:21:26 +08:00
sxy
5887473b9e Merge branch 'sxy' into dev 2025-06-14 17:19:04 +08:00
sxy
f042ca7891 修改返回时间 2025-06-14 17:18:51 +08:00
sxy
fb043a2dd9 Merge branch 'sxy' into dev 2025-06-14 17:01:09 +08:00
sxy
abb53ac651 修改符号 2025-06-14 16:59:41 +08:00
lzh
b1831b09ae Merge branch 'dev-lzh' into dev 2025-06-14 16:33:57 +08:00
lzh
39a172f3dd 添加待确认记录查询 2025-06-14 16:31:01 +08:00
1d3871de3a Merge branch 'jng' into dev 2025-06-14 15:09:22 +08:00
1f0a6c2082 111 2025-06-14 15:09:15 +08:00
lzh
15e313f053 1 2025-06-14 11:41:00 +08:00
6552868292 Merge branch 'jng' into dev 2025-06-14 11:29:53 +08:00
7f28aeb349 修改 2025-06-14 11:29:33 +08:00
lzh
7fbb5e59b7 添加可用时间扩展支持 2025-06-14 11:28:54 +08:00
c880ef997e Merge branch 'jng' into dev 2025-06-14 10:21:38 +08:00
53d67eef82 修改 2025-06-14 10:21:05 +08:00
lzh
4e79ab7a28 Merge branch 'dev-lzh' into dev 2025-06-14 10:20:17 +08:00
lzh
4f56854e36 添加作品详情和作品列表 2025-06-14 09:41:44 +08:00
34d4dc8d84 解决冲突 2025-06-13 22:37:22 +08:00
b8dadc0ee0 修改 2025-06-13 22:36:54 +08:00
4cdb1508a8 解决冲突 2025-06-13 19:25:22 +08:00
2238689f11 修改 2025-06-13 19:25:00 +08:00
lzh
5fe886a487 Merge branch 'dev-lzh' into dev 2025-06-13 18:31:05 +08:00
lzh
ea3f8b0cb4 添加userid 2025-06-13 18:29:35 +08:00
lzh
01399daa30 Merge branch 'dev-lzh' into dev 2025-06-13 18:05:39 +08:00
lzh
895b7cce11 修改扩展、余量接口 2025-06-13 18:04:31 +08:00
sxy
539d725a14 Merge branch 'sxy' into dev 2025-06-13 16:47:46 +08:00
sxy
3cf6a506a8 增加金额计算 2025-06-13 16:43:56 +08:00
lzh
4006092dba 扩展记录修改 2025-06-13 15:46:29 +08:00
lzh
26bbfc173f Merge branch 'dev-lzh' into dev 2025-06-13 14:20:54 +08:00
lzh
c8a129d34e 拆分模块 2025-06-13 14:12:09 +08:00
3b1c1c3016 修改 2025-06-13 14:01:56 +08:00
581d005eff 修改 2025-06-13 14:01:29 +08:00
lzh
5f2c9f0f64 添加过滤参数支持 2025-06-13 13:54:58 +08:00
sxy
ff39e5a67a Merge branch 'sxy' into dev 2025-06-13 13:19:41 +08:00
sxy
651dbfb6a3 修改增值服务语言数据返回 2025-06-13 13:14:50 +08:00
lzh
a631cccb13 添加扩展列表支持 2025-06-13 11:01:57 +08:00
lzh
961dfe7a8e 添加扩展包计算 2025-06-12 18:46:10 +08:00
b5ff394b27 解决冲突 2025-06-12 18:14:20 +08:00
a619c45aa7 修改 2025-06-12 18:13:57 +08:00
lzh
3b3efcb534 添加余量管理接口 2025-06-12 17:51:24 +08:00
e2c67151a0 解决冲突 2025-06-12 16:37:52 +08:00
8694d6b52d 修改 2025-06-12 16:37:22 +08:00
sxy
87b8d516a8 Merge branch 'sxy' into dev 2025-06-12 11:58:47 +08:00
sxy
bb35c56cbb 修改背景选项 2025-06-12 11:57:55 +08:00
sxy
4e718554b8 Merge branch 'sxy' into dev 2025-06-12 11:41:22 +08:00
sxy
c190c4c7c3 修改套餐详情 2025-06-12 11:41:05 +08:00
sxy
b8461a302c Merge branch 'sxy' into dev 2025-06-12 11:26:04 +08:00
sxy
06b13d0f16 修改 2025-06-12 11:25:50 +08:00
sxy
37b057fbc1 Merge branch 'sxy' into dev 2025-06-12 10:19:52 +08:00
sxy
6c57bb8e02 修改节省金额 2025-06-12 10:19:30 +08:00
lzh
7bd70e8968 Merge branch 'jng' into dev-lzh 2025-06-11 17:31:29 +08:00
sxy
fa6d5bd4c3 Merge branch 'sxy' into dev 2025-06-11 14:39:54 +08:00
sxy
46bb16ad7e 修改保存错误 2025-06-11 14:39:30 +08:00
be192ce95d Merge branch 'jng' into dev 2025-06-11 14:32:59 +08:00
af14bcf74b 修改 2025-06-11 14:32:51 +08:00
sxy
bd35319780 Merge branch 'sxy' into dev 2025-06-11 14:25:27 +08:00
sxy
082cee499a 修改套餐详情 2025-06-11 14:25:15 +08:00
sxy
f67223ce46 Merge branch 'sxy' into dev 2025-06-11 11:58:55 +08:00
sxy
6f1a46fa07 修改套餐详情 2025-06-11 11:58:41 +08:00
sxy
84ca17620d Merge branch 'sxy' into dev 2025-06-11 11:46:07 +08:00
sxy
18d4e6e826 修改套餐详情 2025-06-11 11:45:54 +08:00
sxy
a8ecf9a2ca Merge branch 'sxy' into dev 2025-06-11 10:49:03 +08:00
sxy
7fe281fdd6 "修改" 2025-06-11 10:46:07 +08:00
9c64f3bc6d 解决冲突 2025-06-10 16:15:00 +08:00
7b3e4f3522 11 2025-06-10 16:11:50 +08:00
sxy
359dbede04 Merge branch 'sxy' into dev 2025-06-10 14:03:59 +08:00
sxy
21f3dac99a "套餐修改" 2025-06-10 14:03:17 +08:00
lzh
7ee8759e8e 添加手动扩展、扩展记录 2025-06-09 13:58:27 +08:00
010b775b0b 11 2025-06-09 13:58:09 +08:00
jhc
6b07fe383f Merge branch 'dev' of http://172.16.100.91:3000/fiee/micro-bundle into dev 2025-06-06 18:36:52 +08:00
jhc
558d322847 修改 2025-06-06 18:36:37 +08:00
sxy
e8dd695efd 修改套餐与服务取消逻辑 2025-06-06 15:27:06 +08:00
sxy
7a065f487d "修改套餐" 2025-05-28 09:34:43 +08:00
jhc
a515beee31 修改 2025-05-09 16:10:40 +08:00
jhc
28aa556f39 修改 2025-05-09 14:44:55 +08:00
jhc
bb8264e155 修改 2025-05-09 14:37:40 +08:00
jhc
e2ed03be90 修改 2025-05-09 14:35:27 +08:00
jhc
4290d78804 修改 2025-05-09 13:55:16 +08:00
jhc
44a4ae8b7f 订单查询 添加 手机号 以及 财务确认状态 2025-05-09 13:28:14 +08:00
jhc
d14aa14601 订单添加 财务确认 状态 默认未确认 2025-05-09 10:07:34 +08:00
songchuang
adea561589 bug修复 2025-03-29 11:22:19 +08:00
songchuang
463cf84642 代码上传 2025-03-29 07:33:16 +08:00
songchuang
4a1c783448 代码上传 2025-03-29 06:59:17 +08:00
songchuang
56ee6e37cf 代码上传 2025-03-29 06:00:18 +08:00
songchuang
53d893b11a bug修复 2025-03-29 05:41:02 +08:00
songchuang
bc31b6a02d 功能添加 2025-03-29 04:59:56 +08:00
songchuang
76fd430ef1 增值套餐功能提交 2025-03-29 02:05:56 +08:00
songchuang
5788d7a203 检验是生成过订单代码上传 2025-03-28 16:47:41 +08:00
songchuang
fca3d6809a 代码优化 2025-03-28 10:54:04 +08:00
songchuang
3b61d06d9a 代码优化 2025-03-28 10:04:52 +08:00
songchuang
d8b2ec5174 附加值代码上传 2025-03-28 09:23:17 +08:00
sxy
e01d5dcb0f 增加增值套餐服务 2025-03-25 16:30:09 +08:00