fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,872 Commits 45 Branches 7 Tags 34 MiB
b5d69179ae
Commit Graph

170 Commits

Author SHA1 Message Date
JNG
b5d69179ae 解决冲突 2026-06-10 16:09:22 +08:00
JNG
e78ef82305 添加定时同步订单状态 2026-06-10 16:09:03 +08:00
jiaji.H
2353dd6db8 Update：解决冲突 2026-06-10 10:57:45 +08:00
JNG
b5cc3485d0 修改 2026-06-09 14:51:04 +08:00
JNG
86eac0df6a 添加个人订单查询 2026-06-09 14:50:32 +08:00
cjy
ebb9296e2a Merge branch 'feat-cjy-Paylater' into dev 
# Conflicts:
#	pb/bundle/bundle.pb.go
 2026-06-09 13:02:51 +08:00
cjy
0a1878e5ae Merge branch 'jng' into feat-cjy-Paylater 
# Conflicts:
#	internal/logic/bundleLogic.go
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
 2026-06-09 09:38:13 +08:00
cjy
4a867d2a97 Merge branch 'feat-hjj-Paylater' into feat-cjy-Paylater 
# Conflicts:
#	pb/bundle/bundle.pb.go
 2026-06-09 09:31:33 +08:00
jiaji.H
46cea10a5e Update：增加查询指定用户未过期的订单列表 2026-06-08 19:17:52 +08:00
JNG
beb03ba82c 解决冲突 2026-06-08 17:10:48 +08:00
JNG
d18a5243f2 订单新增先用后付 2026-06-08 17:08:04 +08:00
cjy
239b97b759 Update:任务管理台接入bundleTaskType,支持指派时设置与查询过滤 
- proto: 新增 enum BundleTaskType,4 个相关 message 加字段
- model: 新增 BundleTaskTypeNormal/PayLater 常量
- dto: TaskAssignRequest / EmployeeTaskQueryRequest /
  TaskAssignRecordsQueryRequest / TaskAssignRecordsResponse
  新增 BundleTaskType 字段
- controller: 3 个方法做 proto→dto 映射,响应带回该字段
- logic: 3 个查询返回路径的 DTO 映射补字段
- dao: AssignTask 写入字段(新建/更新 task_management,
  新建 task_assign_records);GetEmployeeAssignedTasks 的 Select
  加列、Where 加条件;GetTaskAssignRecordsList 列表与汇总查询
  两处都加 Where 条件
 2026-06-04 15:37:50 +08:00
jiaji.H
23d406eea1 Update：解决冲突 2026-04-13 13:11:33 +08:00
jiaji.H
8079b490fc Update：解决冲突 2026-04-13 11:08:52 +08:00
JNG
92c4584352 解决冲突 2026-03-19 16:52:25 +08:00
JNG
ab45e57fd8 对账单添加安通流水号 2026-03-19 16:51:50 +08:00
jiaji.H
5ec92819ea Updata：解决冲突 2026-03-11 16:29:23 +08:00
jiaji.H
f548ac9571 feat：新增问卷调查模块逻辑 2026-03-11 16:17:57 +08:00
jiaji.H
f5cb5050cf Updata：解决冲突 2026-02-26 15:35:28 +08:00
cjy
bd8fbfb292 Merge branch 'feat-cjy-taskBench' 
# Conflicts:
#	internal/dao/taskDao.go
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
 2026-02-13 10:10:17 +08:00
cjy
59b0342478 Merge branch 'feat-cjy-taskBench' into dev 
# Conflicts:
#	pb/bundle/bundle.pb.go
 2026-02-10 16:37:11 +08:00
jiaji.H
2369e5c210 Updata：解决冲突 2026-02-10 15:36:10 +08:00
jiaji.H
acc76444b5 Updata：解决冲突 2026-02-10 11:34:37 +08:00
jiaji.H
daccf29f02 Updata：增加更新发票url接口 2026-02-10 10:48:25 +08:00
cjy
7b39f34a43 feat：增加一个接口，获取最除非续费订单的套餐开始时间 
# Conflicts:
#	internal/dao/orderRecordsDao.go
#	pb/bundle/bundle.pb.go
 2026-02-09 11:38:16 +08:00
jiaji.H
a78bf365a7 Updata：解决冲突 2026-02-09 11:29:51 +08:00
jiaji.H
db2b6b6205 Updata：解决冲突 2026-02-09 11:29:12 +08:00
JNG
0bba264009 解决冲突 2026-02-09 11:28:51 +08:00
cjy
d2f556ff52 Merge branch 'feat-cjy-taskBench' into dev 
# Conflicts:
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle_triple.pb.go
 2026-02-09 10:36:49 +08:00
cjy
285bddad15 feat：增加一个接口，获取最除非续费订单的套餐开始时间 
# Conflicts:
#	internal/dao/orderRecordsDao.go
#	pb/bundle/bundle.pb.go
 2026-02-06 16:27:52 +08:00
cjy
b764722fab feat: 查询任务完成日志，根据任务的uuid查询对应作品的uuid列表 2026-02-06 13:41:31 +08:00
cjy
6ad2d52e9d feat：任务管理台增加竞品报告 2026-02-06 11:15:01 +08:00
jiaji.H
dc55fa5dfe Updata：解决冲突 2026-02-04 13:22:16 +08:00
zhoujunyao
c7cbe76848 fix: 调整创建订单的uuid 2026-02-04 12:18:07 +08:00
zhoujunyao
2155d56187 fix: 调整创建订单的uuid 2026-02-04 12:13:00 +08:00
jiaji.H
36a134a1e8 Updata：增加是否续费 2026-02-04 11:15:19 +08:00
jiaji.H
3dac79736b Updata：解决冲突 2026-02-04 10:26:37 +08:00
jiaji.H
f219ed3b05 Updata：更新字段 2026-02-04 10:23:11 +08:00
jiaji.H
013c14b9f7 Updata：增加获取最新发票编辑号接口 2026-02-04 10:18:50 +08:00
cjy
cde554ecbd Merge branch 'feat-cjy-customerContract' 
# Conflicts:
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle.validator.pb.go
#	pb/bundle/bundle_triple.pb.go
 2026-02-04 09:40:22 +08:00
JNG
aa772f6590 解决冲突 2026-02-03 10:19:01 +08:00
JNG
eee821c4cb 11 2026-02-03 10:01:36 +08:00
jiaji.H
6b7df996a3 Updata：解决冲突 2026-02-02 11:21:23 +08:00
jiaji.H
0a273e7e32 Updata：增加H5获取用户发票列表 2026-02-02 10:56:54 +08:00
cjy
dcfe12ba09 Merge branch 'fix-cjy-main' into dev 
# Conflicts:
#	pb/bundle.proto
#	pb/bundle/bundle.pb.go
#	pb/bundle/bundle.validator.pb.go
#	pb/bundle/bundle_triple.pb.go
 2026-02-02 10:21:31 +08:00
cjy
a568b3b897 update:proto文件 2026-02-02 09:43:06 +08:00
JNG
7581a337a7 解决冲突 2026-01-30 15:42:37 +08:00
JNG
0c930af71a 添加接口 2026-01-30 15:41:55 +08:00
cjy
d74cc74369 Merge branch 'feat-cjy-customerContract' into dev 
# Conflicts:
#	pb/bundle/bundle.pb.go
 2026-01-30 15:31:53 +08:00
cjy
c57b60230b feat: 增加推荐人列表 2026-01-30 15:30:57 +08:00