Merge branch 'dev-lzh-0905' into dev

手动扩展类型算作增值类型
2025-10-22 15:23:06 +08:00 · 2025-10-22 15:22:54 +08:00
1 changed files with 5 additions and 1 deletions
--- a/internal/dao/bundleExtend.go
+++ b/internal/dao/bundleExtend.go
@ -422,7 +422,11 @@ func GetUsedRecord(req *bundle.GetUsedRecordListReq) (data []model.CostLogPo, to
 		session = session.Where("ccl.submit_time >= ?", time.UnixMilli(req.SubmitTimeStart))
 	}
 	if req.CostType != 0 {
+		if req.CostType == 1 {
 			session = session.Where("cwl.cost_type = ?", req.CostType)
+		} else {
+			session = session.Where("cwl.cost_type in ?", []int{3, 2})
+		}
 	}
 	if req.User != "" {
 		if utils.IsPhoneNumber(req.User) {
Author	SHA1	Message	Date
lzh	4687a172f2	Merge branch 'dev-lzh-0905' into dev	2025-10-22 15:23:06 +08:00
lzh	cc6f1577a1	手动扩展类型算作增值类型	2025-10-22 15:22:54 +08:00