bbit/Ticket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bbit/Ticket:9fd80980e7a52e5a7bc1da156b4404b3971d9ae6
Branches Tags
bbit/Ticket:master
...
compare: bbit/Ticket:bf87c09803e1536a0e2124a1cf772f2c45e9f98f
Branches Tags
bbit/Ticket:master

2 Commits
9fd80980e7 ... bf87c09803

Author SHA1 Message Date
BBIT-Kai bf87c09803 完善前端显示字段；去掉开放测试接口 2026-05-27 11:45:57 +08:00
BBIT-Kai a716c481da 修复企业管理员角色无法红冲的问题；修复操作列按钮高低不齐的问题 2026-05-27 09:29:06 +08:00
33 changed files with 437 additions and 227 deletions
Expand all files Collapse all files
.gitignore
+1
View File
@@ -1,3 +1,4 @@
web/node_modules/
web/dist/
log/
server/src/main/resources/dist/
server/src/main/kotlin/com/bbit/ticket/Application.kt
+7 -1
View File
@@ -27,6 +27,8 @@ import com.bbit.ticket.service.openapi.OpenInvoiceTaskWorker
import kotlinx.coroutines.runBlocking
import io.ktor.server.application.Application
import io.ktor.server.auth.authenticate
import io.ktor.server.http.content.singlePageApplication
import io.ktor.server.http.content.vue
import io.ktor.server.netty.EngineMain
import io.ktor.server.response.respond
import io.ktor.server.routing.get
@@ -47,7 +49,7 @@ fun Application.module() {
configureCors()
configureSecurity()
configureDatabase()
configureRedis()
// configureRedis()
runBlocking {
DatabaseInitializer.initialize()
SeedData.seed()
@@ -58,6 +60,10 @@ fun Application.module() {
get("/health") {
call.respond(ok(mapOf("status" to "UP", "service" to AppConfig.app.name)))
}
singlePageApplication {
useResources = true
vue("dist")
}
route("/api") {
registerAuthRoutes()
registerUserRoutes()
server/src/main/kotlin/com/bbit/ticket/dao/piaotong/EnterpriseManageDao.kt
+38 -3
View File
@@ -105,10 +105,33 @@ object EnterpriseManageDao {
}
}
fun digitalAccountsForEnterprise(enterpriseId: Uuid): List<DigitalAccountManageItem> =
PtDigitalAccountTable.selectAll()
.where { (PtDigitalAccountTable.enterpriseId eq enterpriseId) and PtDigitalAccountTable.deletedAt.isNull() }
fun digitalAccountsForEnterprise(
enterpriseId: Uuid,
account: String?,
status: String?,
page: Int,
pageSize: Int,
): PageResult<DigitalAccountManageItem> {
val where = digitalAccountWhere(enterpriseId, account, status)
val total = PtDigitalAccountTable.selectAll().where { where }.count()
val rows = PtDigitalAccountTable.selectAll()
.where { where }
.orderBy(PtDigitalAccountTable.createdAt, SortOrder.DESC)
.limit(pageSize)
.offset(pageOffset(page, pageSize))
.map { it.toDigitalAccountItem() }
return PageResult(rows, page, pageSize, total)
}
fun digitalAccountOptionsForEnterprise(
enterpriseId: Uuid,
account: String?,
limit: Int,
): List<DigitalAccountManageItem> =
PtDigitalAccountTable.selectAll()
.where { digitalAccountWhere(enterpriseId, account, "ENABLED") }
.orderBy(PtDigitalAccountTable.createdAt, SortOrder.DESC)
.limit(limit)
.map { it.toDigitalAccountItem() }
fun digitalAccount(id: Uuid): ResultRow? =
@@ -134,6 +157,18 @@ object EnterpriseManageDao {
}
.singleOrNull()
private fun digitalAccountWhere(enterpriseId: Uuid, account: String?, status: String?): Op<Boolean> {
var where: Op<Boolean> =
(PtDigitalAccountTable.enterpriseId eq enterpriseId) and PtDigitalAccountTable.deletedAt.isNull()
account?.trim()?.takeIf { it.isNotEmpty() }?.let {
where = where and (PtDigitalAccountTable.account like "%$it%")
}
status?.trim()?.takeIf { it.isNotEmpty() }?.let {
where = where and (PtDigitalAccountTable.status eq it.uppercase())
}
return where
}
fun upsertDigitalAccount(enterpriseId: Uuid, item: DigitalAccountInfo): Uuid {
val existing = PtDigitalAccountTable.selectAll()
.where {
server/src/main/kotlin/com/bbit/ticket/database/piaotong/HistoryInvoiceBasicTable.kt
+8 -7
View File
@@ -1,4 +1,4 @@
package com.bbit.ticket.database.piaotong
package com.bbit.ticket.database.piaotong
import org.jetbrains.exposed.v1.core.Table
import org.jetbrains.exposed.v1.javatime.timestampWithTimeZone
@@ -306,13 +306,13 @@ object HistoryInvoiceBasicTable : Table("history_invoice_basic") {
.nullable()
/**
* 冲红状态
* 红冲状态
*
* NOT_RED：未冲红
* ALREADY_RED：已冲红
* REDING：冲红中
* RED_FAIL：冲红失败
* PART_RED：部分冲红
* NOT_RED：未红冲
* ALREADY_RED：已红冲
* REDING：红冲中
* RED_FAIL：红冲失败
* PART_RED：部分红冲
*/
val redFlag = varchar("red_flag", 32)
.nullable()
@@ -453,3 +453,4 @@ object HistoryInvoiceBasicTable : Table("history_invoice_basic") {
override val primaryKey = PrimaryKey(id)
}
server/src/main/kotlin/com/bbit/ticket/database/piaotong/HistoryInvoiceRedTable.kt
+8 -7
View File
@@ -1,4 +1,4 @@
@file:OptIn(ExperimentalUuidApi::class)
@file:OptIn(ExperimentalUuidApi::class)
package com.bbit.ticket.database.piaotong
@@ -26,13 +26,13 @@ object HistoryInvoiceRedTable : Table("history_invoice_red") {
/**
* 发票代码
* 需冲红的原发票代码，冲红增值税发票管理系统开具的发票或数电纸质发票时必填
* 需红冲的原发票代码，红冲增值税发票管理系统开具的发票或数电纸质发票时必填
*/
val invoiceCode = varchar("invoice_code", 12).nullable()
/**
* 发票请求流水号
* 需冲红的原发票号码，冲红增值税发票管理系统开具的发票或数电纸质发票时必填
* 需红冲的原发票号码，红冲增值税发票管理系统开具的发票或数电纸质发票时必填
*/
val invoiceNo = varchar("invoice_no", 8).nullable()
@@ -42,7 +42,7 @@ object HistoryInvoiceRedTable : Table("history_invoice_red") {
val invoiceReqSerialNo = varchar("invoice_req_serial_no", 20)
/**
* 冲红原因
* 红冲原因
* 01：开票有误
* 02：销货退回
* 03：服务中止
@@ -61,9 +61,9 @@ object HistoryInvoiceRedTable : Table("history_invoice_red") {
* 81：数电发票（增值税专用发票）
* 82：数电发票（普通发票）。
* 默认蓝票的发票种类代码。
* 此字段目的解决数电发票冲红增值税发票，只有企业不再使用增值税系统时才可以跨票种冲红。
* 数电发票（普通发票）可以冲红数电发票（普通发票）、增值税电子普通发票、增值税纸质普通发票。
* 数电发票（增值税专用发票）可以冲红数电发票（增值税专用发票）、增值税电子专用发票、增值税纸质专用发票。
* 此字段目的解决数电发票红冲增值税发票，只有企业不再使用增值税系统时才可以跨票种红冲。
* 数电发票（普通发票）可以红冲数电发票（普通发票）、增值税电子普通发票、增值税纸质普通发票。
* 数电发票（增值税专用发票）可以红冲数电发票（增值税专用发票）、增值税电子专用发票、增值税纸质专用发票。
*/
val invoiceKind = varchar("invoice_kind", 2).nullable()
@@ -104,3 +104,4 @@ object HistoryInvoiceRedTable : Table("history_invoice_red") {
override val primaryKey = PrimaryKey(id)
}
server/src/main/kotlin/com/bbit/ticket/database/piaotong/OpenInvoiceTaskTable.kt
-1
View File
@@ -16,7 +16,6 @@ object OpenInvoiceTaskTable : Table("open_invoice_task") {
val taxAccount = varchar("tax_account", 64).nullable()
val taskType = varchar("task_type", 32)
val sourceType = varchar("source_type", 32)
val runMode = varchar("run_mode", 16)
val invoiceReqSerialNo = varchar("invoice_req_serial_no", 20)
val batchNo = varchar("batch_no", 64).nullable()
val status = varchar("status", 32)
server/src/main/kotlin/com/bbit/ticket/entity/openapi/OpenInvoiceTaskDto.kt
-2
View File
@@ -9,7 +9,6 @@ data class OpenInvoiceTaskSubmitResponse(
val invoiceReqSerialNo: String,
val status: String,
val taskType: String,
val runMode: String,
)
@Serializable
@@ -37,7 +36,6 @@ data class OpenInvoiceTaskItem(
val account: String? = null,
val taskType: String,
val sourceType: String,
val runMode: String,
val invoiceReqSerialNo: String,
val batchNo: String? = null,
val status: String,
server/src/main/kotlin/com/bbit/ticket/entity/request/CreateRedInvoiceRequest.kt
+4 -4
View File
@@ -1,4 +1,4 @@
package com.bbit.ticket.entity.request
package com.bbit.ticket.entity.request
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@@ -28,7 +28,7 @@ data class CreateRedInvoiceRequest(
/**
* 蓝票代码
*
* 冲红税控发票或数电纸质发票时必填
* 红冲税控发票或数电纸质发票时必填
*/
@SerialName("blueInvoiceCode")
val blueInvoiceCode: String? = null,
@@ -36,7 +36,7 @@ data class CreateRedInvoiceRequest(
/**
* 蓝票号码
*
* 冲红税控发票或数电纸质发票时必填
* 红冲税控发票或数电纸质发票时必填
*/
@SerialName("blueInvoiceNo")
val blueInvoiceNo: String? = null,
@@ -98,4 +98,4 @@ data class CreateRedInvoiceRequest(
*/
@SerialName("definedData")
val definedData: String? = null
)
)
server/src/main/kotlin/com/bbit/ticket/entity/request/InitRedInvoiceConfirmRequest.kt
+6 -6
View File
@@ -1,4 +1,4 @@
package com.bbit.ticket.entity.request
package com.bbit.ticket.entity.request
import kotlinx.serialization.Serializable
@@ -20,25 +20,25 @@ data class InitRedInvoiceConfirmRequest(
/**
* 税控蓝字发票代码（10或12位）
* 冲红增值税发票管理系统开具的发票或数电纸票时必填
* 红冲增值税发票管理系统开具的发票或数电纸票时必填
*/
val invoiceCode: String? = null,
/**
* 税控蓝字发票号码（8位）
* 冲红增值税发票管理系统开具的发票或数电纸票时必填
* 红冲增值税发票管理系统开具的发票或数电纸票时必填
*/
val invoiceNo: String? = null,
/**
* 蓝字数电票号码（20位）
* 冲红数电发票时必填
* 红冲数电发票时必填
*/
val blueAllEleInvNo: String? = null,
/**
* 蓝字发票开票日期（yyyyMMdd）
* 冲红非票通平台开具的发票时必填
* 红冲非票通平台开具的发票时必填
*/
val blueInvoiceDate: String? = null,
@@ -48,4 +48,4 @@ data class InitRedInvoiceConfirmRequest(
* 若不传：优先取蓝票开票账号，否则取企业当前账号
*/
val account: String? = null
)
)
server/src/main/kotlin/com/bbit/ticket/entity/request/QuickRedInvoiceRequest.kt
+9 -9
View File
@@ -1,10 +1,10 @@
package com.bbit.ticket.entity.request
package com.bbit.ticket.entity.request
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
/**
* 快捷冲红数电发票请求
* 快捷红冲数电发票请求
*/
@Serializable
data class QuickRedInvoiceRequest(
@@ -29,7 +29,7 @@ data class QuickRedInvoiceRequest(
/**
* 原发票代码
*
* 冲红增值税系统发票或数电纸质发票时必填
* 红冲增值税系统发票或数电纸质发票时必填
*/
@SerialName("invoiceCode")
val invoiceCode: String? = null,
@@ -37,7 +37,7 @@ data class QuickRedInvoiceRequest(
/**
* 原发票号码
*
* 冲红增值税系统发票或数电纸质发票时必填
* 红冲增值税系统发票或数电纸质发票时必填
*/
@SerialName("invoiceNo")
val invoiceNo: String? = null,
@@ -45,7 +45,7 @@ data class QuickRedInvoiceRequest(
/**
* 原数电发票号码
*
* 冲红数电发票时必填
* 红冲数电发票时必填
*/
@SerialName("blueAllEleInvNo")
val blueAllEleInvNo: String? = null,
@@ -56,14 +56,14 @@ data class QuickRedInvoiceRequest(
* 格式：yyyyMMdd
*
* 场景：
* 冲红非票通平台开具的发票时必填，
* 红冲非票通平台开具的发票时必填，
* 税局会结合该日期与数电发票号码拉取原票
*/
@SerialName("blueInvoiceDate")
val blueInvoiceDate: String? = null,
/**
* 冲红原因
* 红冲原因
*
* 默认值：01
*
@@ -108,7 +108,7 @@ data class QuickRedInvoiceRequest(
*
* 默认取蓝票票种
*
* 用于跨票种冲红场景
* 用于跨票种红冲场景
*/
@SerialName("invoiceKind")
val invoiceKind: String? = null,
@@ -150,4 +150,4 @@ data class QuickRedInvoiceRequest(
*/
@SerialName("definedData")
val definedData: String? = null
)
)
server/src/main/kotlin/com/bbit/ticket/entity/request/RedCreateRequest.kt
+7 -2
View File
@@ -1,4 +1,4 @@
package com.bbit.ticket.entity.request
package com.bbit.ticket.entity.request
import kotlinx.serialization.Serializable
@@ -7,7 +7,11 @@ data class RedCreateRequest(
val historyId: String,
/**
* 冲红原因
* 平台数电账号 ID。企业管理员发起红冲时用于指定开票员。
*/
val digitalAccountId: String? = null,
/**
* 红冲原因
*
* 默认值：01
*
@@ -22,3 +26,4 @@ data class RedCreateRequest(
val takerTel: String? = null,
val takerEmail: String? = null,
)
server/src/main/kotlin/com/bbit/ticket/entity/response/InvoiceHistoryItem.kt
+3 -2
View File
@@ -1,4 +1,4 @@
@file:OptIn(kotlin.uuid.ExperimentalUuidApi::class)
@file:OptIn(kotlin.uuid.ExperimentalUuidApi::class)
package com.bbit.ticket.entity.response
@@ -100,7 +100,7 @@ data class InvoiceHistoryItem(
// ===== 发票状态标记 =====
/** 作废状态 */
val invalidFlag: String? = null,
/** 冲红状态 */
/** 红冲状态 */
val redFlag: String? = null,
// ===== 人员信息 =====
@@ -149,3 +149,4 @@ data class InvoiceHistoryItem(
/** 删除标记 */
val invDeletedFlag: String? = null,
)
server/src/main/kotlin/com/bbit/ticket/entity/response/InvoiceQueryResponse.kt
+8 -8
View File
@@ -1,4 +1,4 @@
package com.bbit.ticket.entity.response
package com.bbit.ticket.entity.response
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@@ -168,13 +168,13 @@ data class InvoiceInfo(
val invalidFlag: String,
/**
* 冲红标志
* 红冲标志
*
* NOT_RED：未冲红
* ALREADY_RED：已冲红
* REDING：冲红中
* RED_FAIL：冲红失败
* PART_RED：部分冲红
* NOT_RED：未红冲
* ALREADY_RED：已红冲
* REDING：红冲中
* RED_FAIL：红冲失败
* PART_RED：部分红冲
*/
@SerialName("redFlag")
val redFlag: String,
@@ -345,4 +345,4 @@ data class InvoiceItem(
*/
@SerialName("itemNo")
val itemNo: String
)
)
server/src/main/kotlin/com/bbit/ticket/entity/response/InvoiceResponse.kt
+8 -8
View File
@@ -1,4 +1,4 @@
package com.bbit.ticket.entity.response
package com.bbit.ticket.entity.response
import com.bbit.ticket.entity.request.InvoiceItem
import kotlinx.serialization.SerialName
@@ -187,12 +187,12 @@ data class GetInvoiceInfoResponse(
val invalidFlag: String? = null,
/**
* 冲红状态
* NOT_RED：未冲红
* ALREADY_RED：已冲红
* REDING：冲红中
* RED_FAIL：冲红失败
* PART_RED：部分冲红
* 红冲状态
* NOT_RED：未红冲
* ALREADY_RED：已红冲
* REDING：红冲中
* RED_FAIL：红冲失败
* PART_RED：部分红冲
*/
val redFlag: String? = null,
@@ -344,4 +344,4 @@ data class GetInvoiceInfoItem(
/** 蓝字发票明细序号（红票场景） */
val blueInvOrderNo: String? = null
)
)
server/src/main/kotlin/com/bbit/ticket/entity/response/QuickRedInvoiceResponse.kt
+3 -3
View File
@@ -1,10 +1,10 @@
package com.bbit.ticket.entity.response
package com.bbit.ticket.entity.response
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
/**
* 快捷冲红数电发票响应
* 快捷红冲数电发票响应
*/
@Serializable
data class QuickRedInvoiceResponse(
@@ -51,4 +51,4 @@ data class QuickRedInvoiceResponse(
*/
@SerialName("redApplySerialNo")
val redApplySerialNo: String? = null
)
)
server/src/main/kotlin/com/bbit/ticket/entity/response/RedInvoiceInfoResponse.kt
+4 -3
View File
@@ -1,16 +1,16 @@
package com.bbit.ticket.entity.response
package com.bbit.ticket.entity.response
import kotlinx.serialization.Serializable
/**
* 红票申请信息
*
* 对应 [HistoryInvoiceRedTable] 的冲红申请字段，
* 对应 [HistoryInvoiceRedTable] 的红冲申请字段，
* 用于红票详情弹窗展示。
*/
@Serializable
data class RedInvoiceInfoResponse(
/** 冲红原因：01=开票有误 02=销货退回 03=服务中止 04=销售折让 */
/** 红冲原因：01=开票有误 02=销货退回 03=服务中止 04=销售折让 */
val redReason: String,
/** 收票人名称 */
val takerName: String? = null,
@@ -19,3 +19,4 @@ data class RedInvoiceInfoResponse(
/** 收票人邮箱 */
val takerEmail: String? = null,
)
server/src/main/kotlin/com/bbit/ticket/route/openapi/registerOpenInvoiceTaskRoutes.kt
+2 -16
View File
@@ -8,27 +8,13 @@ import io.ktor.server.routing.Route
import io.ktor.server.routing.post
fun Route.registerOpenInvoiceTaskRoutes() {
post("/test") {
post {
val principal = call.requireOpenApiPrincipal()
val request = call.receive<OpenBlueInvoiceCreateRequest>()
call.respondOpenApi(principal, "blue-invoice-task.test", null) {
call.respondOpenApi(principal, "blue-invoice-task.create", null) {
OpenInvoiceTaskService.createIssueTask(
principal = principal,
request = request,
runMode = OpenInvoiceTaskService.MODE_SIMULATED,
sourceType = OpenInvoiceTaskService.SOURCE_TEST,
)
}
}
post("/production") {
val principal = call.requireOpenApiPrincipal()
val request = call.receive<OpenBlueInvoiceCreateRequest>()
call.respondOpenApi(principal, "blue-invoice-task.production", null) {
OpenInvoiceTaskService.createIssueTask(
principal = principal,
request = request,
runMode = OpenInvoiceTaskService.MODE_REAL,
)
}
}
server/src/main/kotlin/com/bbit/ticket/route/piaotong/registerOpenInvoiceTaskManageRoutes.kt
-1
View File
@@ -21,7 +21,6 @@ fun Route.registerOpenInvoiceTaskManageRoutes() {
digitalAccountId = call.request.queryParameters["digitalAccountId"],
status = call.request.queryParameters["status"],
sourceType = call.request.queryParameters["sourceType"],
runMode = call.request.queryParameters["runMode"],
page = call.request.queryParameters["page"]?.toIntOrNull() ?: 1,
pageSize = call.request.queryParameters["pageSize"]?.toIntOrNull() ?: 20,
)
server/src/main/kotlin/com/bbit/ticket/route/piaotong/registerPTAuthRoutes.kt
+19 -1
View File
@@ -12,6 +12,8 @@ import com.bbit.ticket.entity.request.UpdateDigitalAccountStatusRequest
import com.bbit.ticket.entity.request.UpdateInvoiceSettingRequest
import com.bbit.ticket.service.piaotong.PTAuthService
import com.bbit.ticket.service.piaotong.PTConfigService
import com.bbit.ticket.utils.queryInt
import com.bbit.ticket.utils.queryString
import com.bbit.ticket.utils.requireCurrentUser
import io.ktor.server.request.receive
import io.ktor.server.routing.Route
@@ -59,7 +61,23 @@ fun Route.registerPTAuthRoutes() {
get("/digital-accounts") {
call.respondPt("查询数电账号失败") {
PTConfigService.listDigitalAccounts(call.requireCurrentUser())
PTConfigService.listDigitalAccounts(
user = call.requireCurrentUser(),
account = call.queryString("account"),
status = call.queryString("status"),
page = call.queryInt("page", 1),
pageSize = call.queryInt("pageSize", 20),
)
}
}
get("/digital-accounts/options") {
call.respondPt("查询数电账号选项失败") {
PTConfigService.listDigitalAccountOptions(
user = call.requireCurrentUser(),
account = call.queryString("account"),
limit = call.queryInt("limit", 200),
)
}
}
server/src/main/kotlin/com/bbit/ticket/service/openapi/OpenInvoiceTaskService.kt
+40 -70
View File
@@ -56,9 +56,6 @@ object OpenInvoiceTaskService {
const val TASK_ISSUE_BLUE = "ISSUE_BLUE"
const val TASK_QUERY_BLUE = "QUERY_BLUE"
const val SOURCE_SINGLE = "SINGLE"
const val SOURCE_TEST = "TEST"
const val MODE_REAL = "REAL"
const val MODE_SIMULATED = "SIMULATED"
private const val STATUS_PENDING = "PENDING"
private const val STATUS_PROCESSING = "PROCESSING"
@@ -75,7 +72,6 @@ object OpenInvoiceTaskService {
suspend fun createIssueTask(
principal: OpenApiPrincipal,
request: OpenBlueInvoiceCreateRequest,
runMode: String,
sourceType: String = SOURCE_SINGLE,
batchNo: String? = null,
): OpenInvoiceTaskSubmitResponse {
@@ -97,12 +93,6 @@ object OpenInvoiceTaskService {
.singleOrNull()
}
if (existing != null) {
if (existing[OpenInvoiceTaskTable.runMode] != runMode) {
throw BizException(
ErrorCode.BAD_REQUEST.code,
"invoiceReqSerialNo 已存在 ${existing[OpenInvoiceTaskTable.runMode]} 任务，不能重复创建 $runMode 任务",
)
}
return existing.toSubmitResponse()
}
@@ -129,7 +119,6 @@ object OpenInvoiceTaskService {
it[taxAccount] = principal.taxAccount
it[taskType] = TASK_ISSUE_BLUE
it[OpenInvoiceTaskTable.sourceType] = sourceType
it[OpenInvoiceTaskTable.runMode] = runMode
it[OpenInvoiceTaskTable.invoiceReqSerialNo] = invoiceReqSerialNo
it[OpenInvoiceTaskTable.batchNo] = batchNo
it[status] = STATUS_PENDING
@@ -146,19 +135,12 @@ object OpenInvoiceTaskService {
}
.single()
}
if (task[OpenInvoiceTaskTable.runMode] != runMode) {
throw BizException(
ErrorCode.BAD_REQUEST.code,
"invoiceReqSerialNo 已存在 ${task[OpenInvoiceTaskTable.runMode]} 任务，不能重复创建 $runMode 任务",
)
}
return OpenInvoiceTaskSubmitResponse(
taskId = task[OpenInvoiceTaskTable.id].toString(),
invoiceReqSerialNo = invoiceReqSerialNo,
status = task[OpenInvoiceTaskTable.status],
taskType = TASK_ISSUE_BLUE,
runMode = runMode,
)
}
@@ -201,7 +183,6 @@ object OpenInvoiceTaskService {
digitalAccountId: String?,
status: String?,
sourceType: String?,
runMode: String?,
page: Int,
pageSize: Int,
): PageResult<OpenInvoiceTaskItem> = dbQuery {
@@ -215,19 +196,32 @@ object OpenInvoiceTaskService {
sourceType?.takeIf { it.isNotBlank() }?.let {
where = where and (OpenInvoiceTaskTable.sourceType eq it)
}
runMode?.takeIf { it.isNotBlank() }?.let {
where = where and (OpenInvoiceTaskTable.runMode eq it)
}
val accountRows = PtDigitalAccountTable.selectAll()
.where { accountScope(user) }
.associateBy { it[PtDigitalAccountTable.id] }
val total = OpenInvoiceTaskTable.selectAll().where { where }.count()
val items = OpenInvoiceTaskTable.selectAll()
val taskRows = OpenInvoiceTaskTable.selectAll()
.where { where }
.orderBy(OpenInvoiceTaskTable.createdAt, SortOrder.DESC)
.limit(pageSize)
.offset(((page - 1).coerceAtLeast(0) * pageSize).toLong())
.map { it.toTaskItem(accountRows[it[OpenInvoiceTaskTable.digitalAccountId]]?.get(PtDigitalAccountTable.account)) }
.toList()
val historyMessages = taskRows
.map { it[OpenInvoiceTaskTable.invoiceReqSerialNo] }
.distinct()
.takeIf { it.isNotEmpty() }
?.let { serialNos ->
HistoryInvoiceBasicTable.selectAll()
.where { HistoryInvoiceBasicTable.invoiceReqSerialNo inList serialNos }
.associate { it[HistoryInvoiceBasicTable.invoiceReqSerialNo] to it[HistoryInvoiceBasicTable.msg] }
}
?: emptyMap()
val items = taskRows.map {
it.toTaskItem(
accountRows[it[OpenInvoiceTaskTable.digitalAccountId]]?.get(PtDigitalAccountTable.account),
historyMessages[it[OpenInvoiceTaskTable.invoiceReqSerialNo]],
)
}
PageResult(items, page, pageSize, total)
}
@@ -274,18 +268,13 @@ object OpenInvoiceTaskService {
private suspend fun processIssueTask(task: ResultRow) {
val taskId = task[OpenInvoiceTaskTable.id]
val runMode = task[OpenInvoiceTaskTable.runMode]
val request = task[OpenInvoiceTaskTable.requestBody]
?.let { myJson.decodeFromString<OpenBlueInvoiceCreateRequest>(it) }
?: return failTask(taskId, "REQUEST_BODY_NULL", "任务请求体为空")
val askRequest = request.toAskInvoiceRequest(task)
createHistoryPlaceholder(task, askRequest)
try {
if (runMode == MODE_SIMULATED) {
delay(2000)
} else {
PTApi.invoiceBlue(askRequest)
}
PTApi.invoiceBlue(askRequest)
completeIssueTask(task)
} catch (e: PTException) {
failTask(taskId, e.code, e.message)
@@ -298,31 +287,23 @@ object OpenInvoiceTaskService {
}
private suspend fun processQueryTask(task: ResultRow) {
val taskId = task[OpenInvoiceTaskTable.id]
val runMode = task[OpenInvoiceTaskTable.runMode]
val invoiceReqSerialNo = task[OpenInvoiceTaskTable.invoiceReqSerialNo]
try {
val code = if (runMode == MODE_SIMULATED) {
delay(2000)
simulatedQueryCode(invoiceReqSerialNo, task[OpenInvoiceTaskTable.pollCount])
} else {
val res = PTApi.queryInvoiceInfo(
QueryInvoiceRequest(
taxpayerNum = task[OpenInvoiceTaskTable.taxpayerNum],
invoiceReqSerialNo = invoiceReqSerialNo,
)
val res = PTApi.queryInvoiceInfo(
QueryInvoiceRequest(
taxpayerNum = task[OpenInvoiceTaskTable.taxpayerNum],
invoiceReqSerialNo = invoiceReqSerialNo,
)
)
dbQuery {
BlueInvoiceDao.upsertInvoiceInfo(
task[OpenInvoiceTaskTable.userId],
res,
task[OpenInvoiceTaskTable.enterpriseId],
task[OpenInvoiceTaskTable.digitalAccountId],
)
dbQuery {
BlueInvoiceDao.upsertInvoiceInfo(
task[OpenInvoiceTaskTable.userId],
res,
task[OpenInvoiceTaskTable.enterpriseId],
task[OpenInvoiceTaskTable.digitalAccountId],
)
}
res.code
}
handleQueryCode(task, code)
handleQueryCode(task, res.code, res.msg)
} catch (e: PTException) {
retryOrFail(task, e.code, e.message)
} catch (e: Exception) {
@@ -352,7 +333,6 @@ object OpenInvoiceTaskService {
it[taxAccount] = task[OpenInvoiceTaskTable.taxAccount]
it[taskType] = TASK_QUERY_BLUE
it[sourceType] = task[OpenInvoiceTaskTable.sourceType]
it[runMode] = task[OpenInvoiceTaskTable.runMode]
it[OpenInvoiceTaskTable.invoiceReqSerialNo] = invoiceReqSerialNo
it[batchNo] = task[OpenInvoiceTaskTable.batchNo]
it[status] = STATUS_PENDING
@@ -365,23 +345,23 @@ object OpenInvoiceTaskService {
}
}
private suspend fun handleQueryCode(task: ResultRow, code: String) {
private suspend fun handleQueryCode(task: ResultRow, code: String, message: String?) {
when (code) {
"0000" -> finishQueryTask(task, STATUS_SUCCESS, code, null)
"9999" -> finishQueryTask(task, STATUS_FAILED, code, "开票失败")
"9999" -> finishQueryTask(task, STATUS_FAILED, code, message?.takeIf { it.isNotBlank() } ?: "开票失败")
AUTH_REQUIRED_CODE -> {
val message = "需要登录/风险认证"
val authMessage = message?.takeIf { it.isNotBlank() } ?: "需要登录/风险认证"
dbQuery {
OpenInvoiceTaskTable.update({ OpenInvoiceTaskTable.id eq task[OpenInvoiceTaskTable.id] }) {
it[status] = STATUS_WAITING_AUTH
it[ptCode] = code
it[errorMessage] = message
it[errorMessage] = authMessage
it[updatedAt] = OffsetDateTime.now()
it[lockedBy] = null
it[lockedAt] = null
}
}
pauseApiKey(task[OpenInvoiceTaskTable.apiKey], code, message)
pauseApiKey(task[OpenInvoiceTaskTable.apiKey], code, authMessage)
}
"7777", "6666" -> requeueQueryTask(task, code)
else -> requeueQueryTask(task, code)
@@ -644,15 +624,6 @@ object OpenInvoiceTaskService {
orderList = orderList,
)
private fun simulatedQueryCode(invoiceReqSerialNo: String, pollCount: Int): String =
when {
invoiceReqSerialNo.contains("3999", ignoreCase = true) -> AUTH_REQUIRED_CODE
invoiceReqSerialNo.contains("FAIL", ignoreCase = true) -> "9999"
pollCount <= 0 -> "7777"
pollCount == 1 -> "6666"
else -> "0000"
}
private fun historyCode(code: String): String =
if (code.length <= 8) code else HISTORY_FAILED_CODE
@@ -690,10 +661,9 @@ object OpenInvoiceTaskService {
invoiceReqSerialNo = this[OpenInvoiceTaskTable.invoiceReqSerialNo],
status = this[OpenInvoiceTaskTable.status],
taskType = this[OpenInvoiceTaskTable.taskType],
runMode = this[OpenInvoiceTaskTable.runMode],
)
private fun ResultRow.toTaskItem(account: String?): OpenInvoiceTaskItem =
private fun ResultRow.toTaskItem(account: String?, historyMessage: String?): OpenInvoiceTaskItem =
OpenInvoiceTaskItem(
id = this[OpenInvoiceTaskTable.id].toString(),
digitalAccountId = this[OpenInvoiceTaskTable.digitalAccountId].toString(),
@@ -701,12 +671,12 @@ object OpenInvoiceTaskService {
account = account,
taskType = this[OpenInvoiceTaskTable.taskType],
sourceType = this[OpenInvoiceTaskTable.sourceType],
runMode = this[OpenInvoiceTaskTable.runMode],
invoiceReqSerialNo = this[OpenInvoiceTaskTable.invoiceReqSerialNo],
batchNo = this[OpenInvoiceTaskTable.batchNo],
status = this[OpenInvoiceTaskTable.status],
ptCode = this[OpenInvoiceTaskTable.ptCode],
errorMessage = this[OpenInvoiceTaskTable.errorMessage],
errorMessage = this[OpenInvoiceTaskTable.errorMessage]
?: historyMessage?.takeIf { this[OpenInvoiceTaskTable.status] == STATUS_FAILED },
attemptCount = this[OpenInvoiceTaskTable.attemptCount],
maxAttemptCount = this[OpenInvoiceTaskTable.maxAttemptCount],
pollCount = this[OpenInvoiceTaskTable.pollCount],
server/src/main/kotlin/com/bbit/ticket/service/piaotong/PTConfigService.kt
+32 -4
View File
@@ -6,6 +6,7 @@ import com.bbit.ticket.dao.piaotong.EnterpriseManageDao
import com.bbit.ticket.dao.system.UserDao
import com.bbit.ticket.database.piaotong.PtDigitalAccountTable
import com.bbit.ticket.database.system.SysUserTable
import com.bbit.ticket.entity.common.PageResult
import com.bbit.ticket.entity.request.CreateDigitalAccountRequest
import com.bbit.ticket.entity.request.QueryDigitalAccountListRequest
import com.bbit.ticket.entity.request.QueryEnterpriseBankAccountRequest
@@ -62,15 +63,42 @@ object PTConfigService {
return PTAuthService.queryEnterpriseBankInfo(QueryEnterpriseBankAccountRequest(taxpayerNum)).bankList
}
suspend fun listDigitalAccounts(user: CurrentUser): List<DigitalAccountManageItem> = dbQuery {
suspend fun listDigitalAccounts(
user: CurrentUser,
account: String?,
status: String?,
page: Int,
pageSize: Int,
): PageResult<DigitalAccountManageItem> = dbQuery {
when {
user.isSuperAdmin || user.isEnterpriseAdmin -> {
EnterpriseManageDao.digitalAccountsForEnterprise(requireEnterpriseId(user))
EnterpriseManageDao.digitalAccountsForEnterprise(requireEnterpriseId(user), account, status, page, pageSize)
}
user.isDigitalOperator -> {
val id = user.digitalAccountId
?: throw BizException(ErrorCode.BAD_REQUEST.code, "当前账号未绑定数电账号")
EnterpriseManageDao.digitalAccount(id)?.let { listOf(EnterpriseManageDao.run { it.toDigitalAccountItem() }) }
val item = EnterpriseManageDao.digitalAccount(id)
?.let { EnterpriseManageDao.run { it.toDigitalAccountItem() } }
?.takeIf { account.isNullOrBlank() || it.account.contains(account.trim(), ignoreCase = true) }
?.takeIf { status.isNullOrBlank() || it.status == status.trim().uppercase() }
PageResult(listOfNotNull(item), page, pageSize, if (item == null) 0 else 1)
}
else -> PageResult(emptyList(), page, pageSize, 0)
}
}
suspend fun listDigitalAccountOptions(user: CurrentUser, account: String?, limit: Int): List<DigitalAccountManageItem> = dbQuery {
when {
user.isSuperAdmin || user.isEnterpriseAdmin -> {
EnterpriseManageDao.digitalAccountOptionsForEnterprise(requireEnterpriseId(user), account, limit.coerceIn(1, 200))
}
user.isDigitalOperator -> {
val id = user.digitalAccountId
?: throw BizException(ErrorCode.BAD_REQUEST.code, "当前账号未绑定数电账号")
EnterpriseManageDao.digitalAccount(id)
?.let { EnterpriseManageDao.run { it.toDigitalAccountItem() } }
?.takeIf { account.isNullOrBlank() || it.account.contains(account.trim(), ignoreCase = true) }
?.let { listOf(it) }
?: emptyList()
}
else -> emptyList()
@@ -97,7 +125,7 @@ object PTConfigService {
)
}
}
return listDigitalAccounts(user)
return listDigitalAccountOptions(user, null, 200)
}
suspend fun createDigitalAccount(user: CurrentUser, req: CreateDigitalAccountRequest): DigitalAccountManageItem {
server/src/main/kotlin/com/bbit/ticket/service/piaotong/PTRedService.kt
+1 -1
View File
@@ -28,7 +28,7 @@ object PTRedService {
* 红票接口调用 2.10
*/
suspend fun invoiceRed(user: CurrentUser, req: RedCreateRequest): String {
val account = PTConfigService.requireDigitalAccountForAction(user, null)
val account = PTConfigService.requireDigitalAccountForAction(user, req.digitalAccountId)
val invoiceReqSerialNo = PTClient.ptDate()
val historyId = Uuid.parse(req.historyId)
val his = dbQuery {
server/src/main/kotlin/com/bbit/ticket/utils/bootstrap/DatabaseInitializer.kt
+1
View File
@@ -59,6 +59,7 @@ object DatabaseInitializer {
exec(it)
}
}
exec("ALTER TABLE open_invoice_task DROP COLUMN IF EXISTS run_mode")
}
logger.info("Database schema initialized")
}
server/src/main/kotlin/com/bbit/ticket/utils/bootstrap/Global.kt
+1 -1
View File
@@ -2,7 +2,7 @@ package com.bbit.ticket.utils.bootstrap
object Global {
val isDev = true
val isDev = false
// 请求基础地址
var baseUrl: String
web/src/api/piaotong/index.ts
+21 -8
View File
@@ -1,4 +1,4 @@
import http from '@/api/http'
import http from '@/api/http'
/**
* 账号状态
@@ -158,8 +158,20 @@ export interface CreateDigitalAccountRequest {
platformPassword: string
}
export function listDigitalAccountsApi(): Promise<DigitalAccountItem[]> {
return http.get('/pt/digital-accounts')
export function listDigitalAccountsApi(params: {
page: number
pageSize: number
account?: string | null
status?: string | null
}): Promise<PageResult<DigitalAccountItem>> {
return http.get('/pt/digital-accounts', { params })
}
export function digitalAccountOptionsApi(params?: {
account?: string | null
limit?: number
}): Promise<DigitalAccountItem[]> {
return http.get('/pt/digital-accounts/options', { params })
}
export function refreshDigitalAccountsApi(): Promise<DigitalAccountItem[]> {
@@ -244,7 +256,6 @@ export interface OpenInvoiceTaskItem {
account?: string | null
taskType: string
sourceType: string
runMode: string
invoiceReqSerialNo: string
batchNo?: string | null
status: string
@@ -271,7 +282,6 @@ export function openInvoiceTaskPageApi(params: {
digitalAccountId?: string
status?: string | null
sourceType?: string | null
runMode?: string | null
}): Promise<PageResult<OpenInvoiceTaskItem>> {
return http.get('/pt/openapi/tasks', { params })
}
@@ -458,7 +468,9 @@ export function invoiceIssueApi(payload: InvoiceRequest): Promise<string> {
export interface RedCreateRequest {
/** 蓝票历史记录 ID */
historyId: string
/** 冲红原因：01开票有误 02销货退回 03服务中止 04销售折让 */
/** 平台数电账号 ID。企业管理员红冲时用于指定开票员 */
digitalAccountId?: string | null
/** 红冲原因：01开票有误 02销货退回 03服务中止 04销售折让 */
redReason: string
/** 收票人名称 */
takerName?: string
@@ -575,7 +587,7 @@ export interface InvoiceHistoryItem {
// ===== 发票状态标记 =====
/** 作废状态 */
invalidFlag?: string
/** 冲红状态 */
/** 红冲状态 */
redFlag?: string
// ===== 人员信息 =====
@@ -847,7 +859,7 @@ export function queryInvoiceApi(
/** 红票申请信息 */
export interface RedInvoiceInfo {
/** 冲红原因：01开票有误 02销货退回 03服务中止 04销售折让 */
/** 红冲原因：01开票有误 02销货退回 03服务中止 04销售折让 */
redReason: string
/** 收票人名称 */
takerName?: string
@@ -974,3 +986,4 @@ export function queryAuthStatusApi(payload: {
}): Promise<AuthQrcodeStatusResponse> {
return http.post('/pt/query-auth-status', payload)
}
web/src/features/piaotong/digital-accounts/index.vue
+62 -5
View File
@@ -4,6 +4,12 @@
<div class="page-toolbar">
<h2 class="page-toolbar-title">数电账号管理</h2>
<div class="page-toolbar-actions">
<n-input
v-model:value="accountKeyword"
clearable
placeholder="税局账号"
class="toolbar-filter-input"
/>
<n-button :loading="loading" @click="refreshAccounts">
<template #icon><n-icon :component="RefreshCw" /></template>
刷新
@@ -22,9 +28,12 @@
:columns="columns"
:data="accounts"
:loading="loading"
:pagination="{ pageSize: 10 }"
:pagination="pagination"
:row-key="(row: DigitalAccountItem) => row.id"
:scroll-x="1460"
remote
@update:page="onPageChange"
@update:page-size="onPageSizeChange"
/>
</div>
</section>
@@ -133,8 +142,8 @@
</template>
<script setup lang="ts">
import { computed, h, onMounted, reactive, ref } from 'vue'
import type { DataTableColumns, FormInst, FormRules } from 'naive-ui'
import { computed, h, onMounted, reactive, ref, watch } from 'vue'
import type { DataTableColumns, FormInst, FormRules, PaginationProps } from 'naive-ui'
import {
NAlert,
NButton,
@@ -175,6 +184,8 @@ const authStore = useAuthStore()
const loading = ref(false)
const saving = ref(false)
const accounts = ref<DigitalAccountItem[]>([])
const accountKeyword = ref('')
let accountSearchTimer: ReturnType<typeof setTimeout> | null = null
const showCreate = ref(false)
const showSms = ref(false)
const showQrcode = ref(false)
@@ -195,6 +206,17 @@ const canUpdateStatus = computed(() => authStore.hasPermission('digital-account:
const qrcodeTypeLabel = computed(() =>
qrcodeType.value === '2' ? '国家网络身份认证 APP' : '电子税务局 APP'
)
const pager = reactive({
page: 1,
pageSize: 10
})
const pagination = reactive<PaginationProps>({
page: pager.page,
pageSize: pager.pageSize,
itemCount: 0,
showSizePicker: true,
pageSizes: [10, 20, 50, 100]
})
const createForm = reactive({
account: '',
@@ -352,7 +374,17 @@ function renderEllipsisText(value?: string | null) {
async function load() {
loading.value = true
try {
accounts.value = await listDigitalAccountsApi()
const result = await listDigitalAccountsApi({
page: pager.page,
pageSize: pager.pageSize,
account: accountKeyword.value.trim() || null
})
accounts.value = result.items
pager.page = result.page
pager.pageSize = result.pageSize
pagination.page = result.page
pagination.pageSize = result.pageSize
pagination.itemCount = result.total
} finally {
loading.value = false
}
@@ -361,13 +393,26 @@ async function load() {
async function refreshAccounts() {
loading.value = true
try {
accounts.value = await refreshDigitalAccountsApi()
await refreshDigitalAccountsApi()
message.success('数电账号已刷新')
pager.page = 1
await load()
} finally {
loading.value = false
}
}
function onPageChange(page: number) {
pager.page = page
load()
}
function onPageSizeChange(pageSize: number) {
pager.page = 1
pager.pageSize = pageSize
load()
}
async function createAccount() {
await createFormRef.value?.validate()
saving.value = true
@@ -451,6 +496,14 @@ async function loadQrcode() {
}
onMounted(load)
watch(accountKeyword, () => {
if (accountSearchTimer) clearTimeout(accountSearchTimer)
accountSearchTimer = setTimeout(() => {
pager.page = 1
load()
}, 300)
})
</script>
<style scoped>
@@ -461,6 +514,10 @@ onMounted(load)
gap: 8px;
}
.toolbar-filter-input {
width: 240px;
}
.row-actions {
flex-wrap: nowrap;
white-space: nowrap;
web/src/features/piaotong/invoice-history/index.vue
+62 -22
View File
@@ -1,4 +1,4 @@
<template>
<template>
<div class="page-shell invoice-history-page">
<div class="stats-row">
<div v-for="s in stats" :key="s.label" class="stat-card">
@@ -173,9 +173,9 @@
}}</strong>
</div>
<div class="detail-item">
<span>冲红状态</span>
<span>红冲状态</span>
<strong>{{
redFlagMap[detailItem.redFlag || ''] || detailItem.redFlag || '未冲红'
redFlagMap[detailItem.redFlag || ''] || detailItem.redFlag || '未红冲'
}}</strong>
</div>
<div class="detail-item">
@@ -227,10 +227,10 @@
<template v-if="detailItem.invoiceType === 'RED' && redInfo">
<div class="detail-section">
<div class="detail-section-title">冲红申请</div>
<div class="detail-section-title">红冲申请</div>
<div class="detail-grid">
<div class="detail-item">
<span>冲红原因</span>
<span>红冲原因</span>
<strong>{{ redReasonMap[redInfo.redReason] || redInfo.redReason }}</strong>
</div>
<div class="detail-item">
@@ -419,7 +419,7 @@
<n-modal
v-model:show="showRedForm"
preset="card"
title="发起冲红"
title="发起红冲"
:style="{ width: '480px', maxWidth: '92vw' }"
:mask-closable="false"
content-style="padding: 20px"
@@ -431,11 +431,21 @@
label-placement="top"
require-mark-placement="right-hanging"
>
<n-form-item label="冲红原因" path="redReason">
<n-form-item label="开票员" path="digitalAccountId">
<n-select
v-model:value="redForm.digitalAccountId"
:options="digitalAccountOptions"
:loading="digitalAccountLoading"
placeholder="请选择开票员"
filterable
clearable
/>
</n-form-item>
<n-form-item label="红冲原因" path="redReason">
<n-select
v-model:value="redForm.redReason"
:options="redReasonOptions"
placeholder="请选择冲红原因"
placeholder="请选择红冲原因"
/>
</n-form-item>
<n-form-item label="收票人名称" path="takerName">
@@ -451,7 +461,7 @@
<div class="modal-actions">
<n-button quaternary @click="showRedForm = false">取消</n-button>
<n-button type="error" :loading="redSubmitting" @click="handleRedSubmit"
>确认冲红</n-button
>确认红冲</n-button
>
</div>
</n-form>
@@ -496,6 +506,7 @@ import {
invoiceHistoryApi,
invoiceKindMap,
invoiceStatusMap,
digitalAccountOptionsApi,
queryInvoiceApi,
redInvoiceCreateApi,
redInvoiceDownloadUrlApi,
@@ -507,6 +518,7 @@ import type {
InvoiceDetailGoods,
InvoiceDetailResponse,
InvoiceDetailVoucher,
DigitalAccountItem,
InvoiceHistoryItem,
RedCreateRequest,
RedInvoiceInfo
@@ -527,11 +539,11 @@ const invalidFlagMap: Record<string, string> = {
}
const redFlagMap: Record<string, string> = {
NOT_RED: '未冲红',
ALREADY_RED: '已冲红',
REDING: '冲红中',
RED_FAIL: '冲红失败',
PART_RED: '部分冲红'
NOT_RED: '未红冲',
ALREADY_RED: '已红冲',
REDING: '红冲中',
RED_FAIL: '红冲失败',
PART_RED: '部分红冲'
}
const redInvoiceKindCodes = new Set(['81', '82', '83', '87'])
@@ -728,7 +740,7 @@ function getRowActions(row: InvoiceHistoryItem) {
}
if (canCreateRedInvoice(row)) {
actions.push({ label: '冲红', icon: RotateCcw, onClick: () => startRedTask(row) })
actions.push({ label: '红冲', icon: RotateCcw, onClick: () => startRedTask(row) })
}
return actions
@@ -739,7 +751,7 @@ function getActionsColumnWidth() {
详情: 58,
刷新: 58,
查看票样: 86,
冲红: 58
红冲: 58
}
const rowWidths = dataSource.value.map((row) => {
const actions = getRowActions(row)
@@ -835,7 +847,7 @@ const columns = computed<DataTableColumns<InvoiceHistoryItem>>(() => {
: h('span', { style: 'color:#9ca3af' }, '-')
},
{
title: '冲红状态',
title: '红冲状态',
key: 'redFlag',
width: 110,
render: (row: InvoiceHistoryItem) => {
@@ -850,7 +862,7 @@ const columns = computed<DataTableColumns<InvoiceHistoryItem>>(() => {
}[row.status]
: undefined)
if (!redFlag || redFlag === 'NOT_RED') {
return h(NTag, { size: 'small', round: true }, () => '未冲红')
return h(NTag, { size: 'small', round: true }, () => '未红冲')
}
const typeMap: Record<string, 'error' | 'warning' | 'default'> = {
ALREADY_RED: 'error',
@@ -973,9 +985,12 @@ async function refreshStatus(item: InvoiceHistoryItem) {
const showRedForm = ref(false)
const redSubmitting = ref(false)
const redFormRef = ref()
const digitalAccountLoading = ref(false)
const digitalAccounts = ref<DigitalAccountItem[]>([])
const redForm = reactive({
historyId: '',
digitalAccountId: null as string | null,
redReason: '01',
takerName: '',
takerTel: '',
@@ -989,17 +1004,40 @@ const redReasonOptions = [
{ label: '销售折让', value: '04' }
]
const digitalAccountOptions = computed(() =>
digitalAccounts.value.map((item) => ({
label: `${item.account}${item.name ? `（${item.name}）` : ''}`,
value: item.id
}))
)
const redFormRules = {
redReason: [{ required: true, message: '请选择冲红原因', trigger: 'change' }]
digitalAccountId: [{ required: true, message: '请选择开票员', trigger: 'change' }],
redReason: [{ required: true, message: '请选择红冲原因', trigger: 'change' }]
}
function startRedTask(item: InvoiceHistoryItem) {
async function ensureDigitalAccountsLoaded() {
if (digitalAccounts.value.length > 0) return
digitalAccountLoading.value = true
try {
digitalAccounts.value = await digitalAccountOptionsApi({ limit: 200 })
} finally {
digitalAccountLoading.value = false
}
}
async function startRedTask(item: InvoiceHistoryItem) {
redForm.historyId = item.id
redForm.digitalAccountId = null
redForm.redReason = '01'
redForm.takerName = ''
redForm.takerTel = ''
redForm.takerEmail = ''
showRedForm.value = true
await ensureDigitalAccountsLoaded()
if (!redForm.digitalAccountId && digitalAccounts.value.length === 1) {
redForm.digitalAccountId = digitalAccounts.value[0].id
}
}
async function handleRedSubmit() {
@@ -1012,17 +1050,18 @@ async function handleRedSubmit() {
try {
const payload: RedCreateRequest = {
historyId: redForm.historyId,
digitalAccountId: redForm.digitalAccountId,
redReason: redForm.redReason,
takerName: redForm.takerName || undefined,
takerTel: redForm.takerTel || undefined,
takerEmail: redForm.takerEmail || undefined
}
await redInvoiceCreateApi(payload)
message.success('冲红任务创建成功')
message.success('红冲任务创建成功')
showRedForm.value = false
fetchData()
} catch {
message.error('创建冲红任务失败')
message.error('创建红冲任务失败')
} finally {
redSubmitting.value = false
}
@@ -1471,3 +1510,4 @@ onMounted(() => {
}
}
</style>
web/src/features/piaotong/invoice-issue/index.vue
+2 -2
View File
@@ -931,7 +931,7 @@ import {
invoiceIssueApi,
getEnterpriseInfoApi,
getPresetDataApi,
listDigitalAccountsApi
digitalAccountOptionsApi
} from '@/api/piaotong'
import type { DigitalAccountItem, InvoiceRequest, InvoiceItem, VariableLevyProof } from '@/api/piaotong'
import type { FormInst, FormRules } from 'naive-ui'
@@ -1574,7 +1574,7 @@ onMounted(async () => {
const [enterpriseInfo, presetData, accounts] = await Promise.all([
getEnterpriseInfoApi(),
getPresetDataApi(),
listDigitalAccountsApi()
digitalAccountOptionsApi({ limit: 200 })
])
digitalAccounts.value = accounts
const defaultAccount =
web/src/features/statistics/openapi/index.vue
+43 -27
View File
@@ -45,7 +45,7 @@
</div>
</section>
<n-drawer v-model:show="drawerVisible" :width="760">
<n-drawer v-model:show="drawerVisible" :width="980">
<n-drawer-content :title="drawerTitle" closable>
<div class="drawer-toolbar">
<n-select
@@ -66,15 +66,6 @@
class="task-filter"
@update:value="loadTasks(1)"
/>
<n-select
v-model:value="taskRunMode"
clearable
size="small"
placeholder="全部模式"
:options="runModeOptions"
class="task-filter"
@update:value="loadTasks(1)"
/>
<n-button size="small" :loading="taskLoading" @click="loadTasks(taskPage)">
<template #icon><n-icon :component="RefreshCw" /></template>
刷新
@@ -87,7 +78,7 @@
:data="tasks"
:loading="taskLoading"
:pagination="taskPagination"
:scroll-x="980"
:scroll-x="1280"
remote
@update:page="loadTasks"
@update:page-size="changeTaskPageSize"
@@ -122,7 +113,6 @@ const taskPageSize = ref(20)
const taskTotal = ref(0)
const taskStatus = ref<string | null>(null)
const taskSourceType = ref<string | null>(null)
const taskRunMode = ref<string | null>(null)
const statusOptions = [
{ label: '待处理', value: 'PENDING' },
@@ -134,14 +124,35 @@ const statusOptions = [
const sourceTypeOptions = [
{ label: '单笔', value: 'SINGLE' },
{ label: '批量', value: 'BATCH' },
{ label: '测试', value: 'TEST' }
{ label: '批量', value: 'BATCH' }
]
const runModeOptions = [
{ label: '生产', value: 'REAL' },
{ label: '模拟', value: 'SIMULATED' }
]
const queueStatusLabelMap: Record<string, string> = {
RUNNING: '运行中',
PAUSED: '已暂停'
}
const taskStatusLabelMap: Record<string, string> = {
PENDING: '待处理',
PROCESSING: '处理中',
SUCCESS: '成功',
FAILED: '失败',
WAITING_AUTH: '需认证'
}
const taskTypeLabelMap: Record<string, string> = {
ISSUE_BLUE: '蓝票开具',
QUERY_BLUE: '蓝票查询'
}
const sourceTypeLabelMap: Record<string, string> = {
SINGLE: '单笔',
BATCH: '批量'
}
function labelOf(map: Record<string, string>, value?: string | null) {
return value ? map[value] || value : '-'
}
const totals = computed(() =>
rows.value.reduce(
@@ -177,7 +188,11 @@ const columns: DataTableColumns<OpenInvoiceTaskOverviewItem> = [
key: 'status',
width: 110,
render: (row) =>
h(NTag, { type: statusTagType(row.status), size: 'small' }, { default: () => row.status })
h(
NTag,
{ type: statusTagType(row.status), size: 'small' },
{ default: () => labelOf(queueStatusLabelMap, row.status) }
)
},
{ title: '待处理', key: 'pending', width: 90 },
{ title: '处理中', key: 'processing', width: 90 },
@@ -265,21 +280,24 @@ function rowProps(row: OpenInvoiceTaskOverviewItem) {
const taskColumns: DataTableColumns<OpenInvoiceTaskItem> = [
{ title: '票号', key: 'invoiceReqSerialNo', minWidth: 170 },
{ title: '任务', key: 'taskType', width: 120 },
{ title: '来源', key: 'sourceType', width: 90 },
{ title: '模式', key: 'runMode', width: 90 },
{ title: '任务', key: 'taskType', width: 120, render: (row) => labelOf(taskTypeLabelMap, row.taskType) },
{ title: '来源', key: 'sourceType', width: 90, render: (row) => labelOf(sourceTypeLabelMap, row.sourceType) },
{
title: '状态',
key: 'status',
width: 110,
render: (row) =>
h(NTag, { type: statusTagType(row.status), size: 'small' }, { default: () => row.status })
h(
NTag,
{ type: statusTagType(row.status), size: 'small' },
{ default: () => labelOf(taskStatusLabelMap, row.status) }
)
},
{ title: 'PT码', key: 'ptCode', width: 90 },
{ title: '错误', key: 'errorMessage', minWidth: 260, ellipsis: { tooltip: true } },
{ title: '查询次数', key: 'pollCount', width: 90, render: (row) => `${row.pollCount}/${row.maxPollCount}` },
{ title: '重试', key: 'attemptCount', width: 90, render: (row) => `${row.attemptCount}/${row.maxAttemptCount}` },
{ title: '下次执行', key: 'nextRunAt', minWidth: 150 },
{ title: '错误', key: 'errorMessage', minWidth: 180 }
{ title: '下次执行', key: 'nextRunAt', minWidth: 150 }
]
const taskPagination = reactive<PaginationProps>({
@@ -307,7 +325,6 @@ async function loadTasks(page = 1) {
digitalAccountId: selected.value.digitalAccountId,
status: taskStatus.value,
sourceType: taskSourceType.value,
runMode: taskRunMode.value,
page,
pageSize: taskPageSize.value
})
@@ -326,7 +343,6 @@ function openDrawer(row: OpenInvoiceTaskOverviewItem) {
drawerVisible.value = true
taskStatus.value = null
taskSourceType.value = null
taskRunMode.value = null
loadTasks(1)
}
web/src/features/system/menus/index.vue
+1 -1
View File
@@ -262,7 +262,7 @@ function renderLabel(payload: { option: unknown }) {
? h(NTag, { size: 'small', type: 'primary' }, { default: () => '基础内置' })
: null
]),
h(NSpace, { size: 6, class: 'menu-tree-actions' }, () => [
h(NSpace, { size: 6, align: 'center', class: 'menu-tree-actions table-action-buttons' }, () => [
h(
NButton,
{ size: 'small', tertiary: true, class: 'action-btn', onClick: () => openCreate(node.id) },
web/src/features/system/roles/index.vue
+1 -1
View File
@@ -256,7 +256,7 @@ const columns = computed<DataTableColumns<RoleItem>>(() => [
title: '操作',
key: 'actions',
render: (r) =>
h(NSpace, { size: 6 }, () => [
h(NSpace, { size: 6, align: 'center', class: 'table-action-buttons' }, () => [
h(
NButton,
{
web/src/features/system/users/index.vue
+1 -1
View File
@@ -660,7 +660,7 @@ const columns = computed<DataTableColumns<UserListItem>>(() => [
render: (row) =>
h(
NSpace,
{ size: 6 },
{ size: 6, align: 'center', class: 'table-action-buttons' },
{
default: () => [
h(
web/src/style.css
+34
View File
@@ -213,6 +213,40 @@ select {
min-width: 68px;
}
.table-action-buttons,
.row-actions,
.table-actions,
.action-buttons {
display: flex;
align-items: center;
gap: 6px;
line-height: 1;
white-space: nowrap;
}
.table-action-buttons {
flex-wrap: nowrap;
}
.table-action-buttons .n-button,
.row-actions .n-button,
.table-actions .n-button,
.action-buttons .n-button {
display: inline-flex;
align-items: center;
justify-content: center;
flex: 0 0 auto;
vertical-align: middle;
}
.table-action-buttons .n-button__content,
.row-actions .n-button__content,
.table-actions .n-button__content,
.action-buttons .n-button__content {
display: inline-flex;
align-items: center;
}
.soft-stat {
border: 1px solid var(--app-border);
border-radius: 12px;