Skip to content

G
galaxy-iOS
Commit 7efc138d authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

办证和续签缴费更改

parent 2543e98d
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 60 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/M/YHVisaPaymentListModel.swift
View file @ 7efc138d
......@@ -33,6 +33,7 @@ class YHVisaPaymentModel : SmartCodable {
var want_min_time : String = "" //意向开始时间
var want_max_time : String = "" //意向结束时间
var go_time : String = ""// 实际赴港时间
var fee_money: String = "" // 20250226之后用这个缴费金额
required init() {
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberContentItems.swift
View file @ 7efc138d
......@@ -109,7 +109,12 @@ extension YHPayMemberContentItems {
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
item.updateUI(title: "缴费金额：",detail: "\(model.fee_hkd)港币（≈\(model.fee_rmb)人民币)",showBtn: false)
if model.fee_money.count > 0 {
item.updateUI(title: "缴费金额：",detail: "\(model.fee_money)",showBtn: false)
} else {
item.updateUI(title: "缴费金额：",detail: "\(model.fee_hkd)港币（≈\(model.fee_rmb)人民币)",showBtn: false)
}
lastView = item
}
......@@ -122,7 +127,12 @@ extension YHPayMemberContentItems {
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
item.updateUI(title: "缴费金额：",detail: "\(model.fee_hkd)港币（≈\(model.fee_rmb)人民币)",showBtn: false)
if model.fee_money.count > 0 {
item.updateUI(title: "缴费金额：",detail: "\(model.fee_money)",showBtn: false)
} else {
item.updateUI(title: "缴费金额：",detail: "\(model.fee_hkd)港币（≈\(model.fee_rmb)人民币)",showBtn: false)
}
lastView = item
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalApplicationVC.swift
View file @ 7efc138d
......@@ -53,8 +53,18 @@ class YHHKVisaRenewalApplicationVC: YHBaseViewController {
private lazy var viewModel = YHHKVisaRenewalPaymentViewModel()
private let orderId: Int
private let renewalId: Int
private var orderId: Int = 0
private var renewalId: Int = 0
private var id: Int = 0
private var isEdit: Int = 0
init(id: Int, isEdit: Int) {
self.id = id
self.isEdit = isEdit
super.init(nibName: nil, bundle: nil)
}
init(orderId: Int, renewalId: Int) {
self.orderId = orderId
self.renewalId = renewalId
......@@ -126,54 +136,14 @@ extension YHHKVisaRenewalApplicationVC {
self.tableView.reloadData()
return
}
//let approvalPendingMsg = "申请人暂未获批，无法在港缴费"
//let confirmedPresenceMsg = "申请人已在港"
var sections: [[YHVisaRenewalItemDetailType]] = []
//let confirmingPresenceTips: ASAttributedString = .init(string: "提示：", .foreground(UIColor.yhOrangeColor)) + .init(string: "缴费前请先确认涉及到的") + .init(string: "申请人在香港", .foreground(UIColor.yhOrangeColor))
//var confirmingPresenceSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("确认申请人在港", nil), .tips(confirmingPresenceTips)]
//var actionMembers: [YHVisaRenewalItemDetailType] = []
var paymentMembers: [YHVisaRenewalItemDetailType] = []
// self.updateSureButtonState(false)
paymentListModel.list.forEach { [weak self] person in
guard let self = self else {
return
}
guard let presenceStatus = YHVisaRenewalPresenceStatus(rawValue: person.confirm_hk_status) else { return }
// let member = YHVisaRenewalItemDetailType.residenceAction(person.name, presenceStatus, .mid) { [weak self] in
// guard let self = self else {
// return
// }
// switch presenceStatus {
// case .approvalPending:
// YHHUD.flash(message: approvalPendingMsg)
// case .confirmingPresence:
// self.showAlertView(confirmBlock: { [weak self] in
// guard let self = self else {
// return
// }
// YHHUD.show(.progress(message: "确认中..."))
// self.viewModel.confirmInHK(orderId: self.orderId, renewalId: self.renewalId, uid: person.id, type: person.type) { [weak self] success, error in
// guard let self = self else {
// return
// }
// YHHUD.hide()
// if success {
// YHHUD.flash(message: "已确认在港")
// self.requestData(isNeedLoading: true)
// } else {
// if let errorMsg = error?.errorMsg, errorMsg.count > 0 {
// YHHUD.flash(message: errorMsg)
// }
// }
// }
// })
// case .confirmedPresence:
// YHHUD.flash(message: confirmedPresenceMsg)
// }
// }
// actionMembers.append(member)
guard let paymentStatus = YHVisaRenewalPaymentStatus(rawValue: person.pay_status) else {
return
}
......@@ -187,7 +157,11 @@ extension YHHKVisaRenewalApplicationVC {
case .confirmingPresence:
paymentMembers.append(.subInfo("临时档案号：", "-", nil))
paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
paymentMembers.append(.subRemark("请先确认用户完成确认在港"))
case .confirmedPresence:
paymentMembers.append(.subInfo("临时档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
......@@ -197,7 +171,11 @@ extension YHHKVisaRenewalApplicationVC {
self.copyToPasteBoard(person.file_num, message: "已复制档案号")
}))
paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
paymentMembers.append(.subRemark("请复制档案号去港府官网缴费"))
}
case .paid:
......@@ -213,15 +191,17 @@ extension YHHKVisaRenewalApplicationVC {
}
self.copyToPasteBoard(person.file_num, message: "已复制档案号")
}))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
paymentMembers.append(.subContent("缴费电子签证：", fileName, "查看", .bottom, { [weak self] in
guard let self = self else {
return
}
self.gotoPreview(person.receipt)
}))
// self.updateSureButtonState(true)
case .expired:
paymentMembers.append(.occupyingSpace)
paymentMembers.append(.subHeader(person.name, .expired))
......@@ -232,22 +212,21 @@ extension YHHKVisaRenewalApplicationVC {
self.copyToPasteBoard(person.file_num, message: "已复制档案号")
}))
paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
case .pendingApproval:
paymentMembers.append(.occupyingSpace)
paymentMembers.append(.subHeader(person.name, .pendingApproval))
paymentMembers.append(.subRemark("续签申请暂未正式获批，请耐心等待"))
}
}
// if let lastMember = actionMembers.last, case let.residenceAction(name, status, _, action) = lastMember {
// actionMembers[actionMembers.count - 1] = .residenceAction(name, status, .bottom, action)
// confirmingPresenceSection.append(contentsOf: actionMembers)
// }
if paymentMembers.count > 0 {
paymentMembers.append(.occupyingSpace)
}
//sections.append(confirmingPresenceSection)
let payMethodTips: ASAttributedString = .init(string: "提示：", .foreground(UIColor.yhOrangeColor)) + .init(string: "请先到下方“缴费成员”处") + .init(string: "复制档案号", .foreground(UIColor.yhOrangeColor)) + .init(string: "再缴费")
let webPageUrl = paymentListModel.payment_url
if webPageUrl.count > 0, URL(string: webPageUrl) != nil {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalPaymentVC.swift
View file @ 7efc138d
......@@ -272,7 +272,12 @@ extension YHHKVisaRenewalPaymentVC {
case .confirmingPresence:
paymentMembers.append(.subInfo("档案号：", "-", nil))
paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
paymentMembers.append(.subRemark("请先确认用户完成确认在港"))
case .confirmedPresence:
paymentMembers.append(.subInfo("档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
......@@ -282,7 +287,11 @@ extension YHHKVisaRenewalPaymentVC {
self.copyToPasteBoard(person.file_num, message: "已复制档案号")
}))
paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
paymentMembers.append(.subRemark("请复制档案号去港府官网缴费"))
}
case .paid:
......@@ -298,7 +307,12 @@ extension YHHKVisaRenewalPaymentVC {
}
self.copyToPasteBoard(person.file_num, message: "已复制档案号")
}))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
paymentMembers.append(.subContent("缴费电子签证：", fileName, "查看", .bottom, { [weak self] in
guard let self = self else {
return
......@@ -317,7 +331,11 @@ extension YHHKVisaRenewalPaymentVC {
self.copyToPasteBoard(person.file_num, message: "已复制档案号")
}))
paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
if person.fee_money.count > 0 {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
} else {
paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
}
case .pendingApproval:
paymentMembers.append(.occupyingSpace)
paymentMembers.append(.subHeader(person.name, .pendingApproval))
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/M/YHHKVisaRenewalPaymentList.swift
View file @ 7efc138d
......@@ -50,6 +50,8 @@ class YHHKVisaRenewalPaymentItem: SmartCodable {
// 电子签证地址
var receipt: String = ""
// 缴费金额,2025-2-26之后的用区间
var fee_money: String = ""
required init() {
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment