Skip to content

G
GeliBusinessPlatform
Commit 48a7396a authored by lujunye's avatar lujunye
Browse files
Options

详情补充同意，拒绝取消订单

parent 312e84be
Hide whitespace changes
Inline Side-by-side
Showing with 70 additions and 29 deletions
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ 48a7396a
......@@ -55,6 +55,7 @@ class OrderDetailResModel: Mappable {
var lwb_no : String?//运单号
var pay_type : Int?
var pay_status : Int?
var apply_cancel:Int?
var postscript : String? //买家留言
var order_postscript : String? //订单备注
var address : String?
......@@ -79,6 +80,7 @@ class OrderDetailResModel: Mappable {
order_id <- map["order_id"]
order_sn <- map["order_sn"]
add_time <- map["add_time"]
apply_cancel <- map["apply_cancel"]
user_id <- map["user_id"]
cus_id <- map["cus_id"]
add_time <- map["add_time"]
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 48a7396a
......@@ -192,7 +192,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.view.window?.addSubview(alertView)
break
case "发货":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
......@@ -200,7 +199,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1003
self.view.window?.addSubview(alertView)
break
case "退款":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......@@ -210,7 +208,6 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "继续退款"), for: .normal)
alertView.rightBtn.tag = 1004
self.view.window?.addSubview(alertView)
break
case "退货":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
......@@ -220,13 +217,29 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1005
self.view.window?.addSubview(alertView)
break
case "同意取消订单":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否同意取消订单？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1006
self.view.window?.addSubview(alertView)
break
case "拒绝取消订单":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
alertView.titileLbl.text = "是否拒绝取消订单？"
alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
alertView.rightBtn.tag = 1007
self.view.window?.addSubview(alertView)
break
case "付款码":
let alertView = GeliAltetCodeView(frame: self.view.window!.bounds)
alertView.saveImgID = orderId
self.view.window?.addSubview(alertView)
break
default:
break
......@@ -365,7 +378,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.nameLbl.text = rowModel?.goods_name
if rowModel?.goods_attr != nil {
cell.detailLbl.text = (rowModel?.goods_attr)!
}else{
cell.detailLbl.text = "-"
}
......@@ -1091,9 +1104,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel!.order_res?.shipping_status == 1 && self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["修改价格","付款码","退货"]
}
if self.dataMdoel!.order_res?.shipping_status == 0 && self.dataMdoel!.order_res?.pay_status == 12 {
titleArr = ["修改价格","付款码","退款"]
}
// if self.dataMdoel!.order_res?.shipping_status == 0 && self.dataMdoel!.order_res?.pay_status == 12 {
// titleArr = ["修改价格","付款码","退定金"]
// }
break
case 6:
// str = "待发货"
......@@ -1101,6 +1114,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["发货","取消订单","确认收款"]
}
if self.dataMdoel?.order_res?.apply_cancel == 1 {
titleArr = ["拒绝取消订单","同意取消订单"]
}
break
case 7:
// str = "待收货"
......@@ -1108,32 +1124,35 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["确认收款","取消订单","确认收货"]
}
if self.dataMdoel?.order_res?.apply_cancel == 1 {
titleArr = ["拒绝取消订单","同意取消订单"]
}
break
//订单完成
case 5:
// str = "订单完成"
// titleArr = ["删除订单"]
// titleArr = ["删除订单"]
// if status_d == 53 {
// if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2 {
// titleArr = ["退货","打印","退款"]
//
// }else{
// titleArr = ["打印","退款"]
// }
// }else if status_d == 52{
// titleArr = ["打印","退款"]
// }else if status_d == 51 {
// if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2 {
// titleArr = ["退货","打印"]
//
// }else{
// titleArr = []
// }
// }
// if status_d == 53 {
// if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2 {
// titleArr = ["退货","打印","退款"]
//
// }else{
// titleArr = ["打印","退款"]
// }
// }else if status_d == 52{
// titleArr = ["打印","退款"]
// }else if status_d == 51 {
// if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2 {
// titleArr = ["退货","打印"]
//
// }else{
// titleArr = []
// }
// }
break
case 9:
case 9:
// 退款中
if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
titleArr = ["确认收到退款"]
......@@ -1144,7 +1163,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
// str = "订单关闭"str = "已取消" //用户取消（预售
titleArr = []
break
case 10:
case 10:
// str = "订单关闭"str = "已取消" //用户取消（预售
titleArr = ["退货退款","交易关闭"]
if self.dataMdoel!.order_res?.pay_status == 0 {
......@@ -1221,6 +1240,26 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.loadData()
}) { (error) in
}
}else if sender.tag == 1006{
HUD.flash(.progress)
orderCancelAudit(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"type":1 as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "已同意"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange()
self.loadData()
}) { (error) in
}
}else if sender.tag == 1007{
HUD.flash(.progress)
orderCancelAudit(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id as Any,"type":2 as Any], success: { (data) in
HUD.flash(.labeledSubSuccess(subtitle: "已拒绝"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange()
self.loadData()
}) { (error) in
}
}else if sender.tag == 1005 {
HUD.flash(.progress)
......
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