Skip to content

G
GeliBusinessPlatform
Commit ad04a038 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

626 iOS：“待发货”的现货订单详情，点击“退款”后，不应该还有“退货”&“打印”按钮，因为还没“发货”。

parent 8772d33b
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 33 deletions
GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift
View file @ ad04a038
......@@ -68,6 +68,8 @@ class OrderDetailResModel: Mappable {
var order_status : Int?//订单状态
var order_status_d : Int?//订单详细状态
var shipping_type : Int?//配送方式：1派送,2自提
var shipping_status : Int?//商品配送情况;0未发货,1已发货,2已收货,4退货
var sale_res : OrderDetailSaleResModel?//订单预售详情(不是预售订单为空数组，无key=>value)
required init?( map: Map) {
......@@ -105,6 +107,7 @@ class OrderDetailResModel: Mappable {
other_price <- map["other_price"]
shipping_type <- map["shipping_type"]
sale_res <- map["sale_res"]
shipping_status <- map["shipping_status"]
}
}
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ ad04a038
......@@ -113,7 +113,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.isCaneditLatsData = false
}
self.listView.reloadData()
......@@ -195,7 +195,7 @@ 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)
......@@ -226,17 +226,17 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
print("修改价格（普通商品返回数据）\(sender)")
self.dataMdoel?.order_goods = sender
loadData()
}
//MARK:--修改价格（预售返回数据）
func changeYuShouGoodsByData(sender: EditOGPAdDataModel?, djText: String, wkText: String) {
print("修改价格（预售返回数据）--只更新datamodel，不请求网络\(sender)")
self.dataMdoel?.order_res?.sale_res?.dj_amount = sender!.dj_amount
self.dataMdoel?.order_res?.sale_res?.wk_amount = sender!.wk_amount
loadData()
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
let view = UIView()
......@@ -318,7 +318,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
switch indexPath.section {
case 0:
cell.nameLbl.text = "关联客户"
if self.dataMdoel?.order_res?.cus_id != 0 {
cell.contentLbl.text = self.dataMdoel?.order_res?.cus_name
}else{
......@@ -347,7 +347,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if indexPath.row == 1 {
cell.lineView.isHidden = true
}
let rowModel = self.dataMdoel?.order_goods![indexPath.row]
cell.iconImg?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
......@@ -356,7 +356,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
cell.priceLbl.text = "￥" + (self.dataMdoel?.order_res?.goods_amount)!
cell.detailLbl2.text = "x" + StringByInt(number: (rowModel?.cart_number!)!)
return cell
case 2:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
......@@ -467,7 +467,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
if self.dataMdoel?.order_res?.lwb_no == nil {
cell.contentLbl.text = "-"
}else if cell.contentLbl.text?.count == 0 {
cell.contentLbl.text = "请输入物流单号"
if !isCaneditLatsData {
//MARK:-不能进行修改了
......@@ -760,7 +760,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
view.delegate = self
view.dataArr = zhiFuFangShiArr
view.selectNum = wk_payWay
view.tempNum = view.selectNum
self.view.addSubview(view)
glSelectView = view
......@@ -790,13 +790,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn = "未付款"
}else{
self.dataMdoel?.order_res?.sale_res?.dj_pay_status_cn = "已付款"
}
self.dataMdoel?.order_res?.sale_res?.dj_pay_type = pay_type
self.listView.reloadData()
self.loadData()
}
}) { (error) in
......@@ -804,7 +804,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
}
if view.titleLbl.text == "请选择定尾款支付方式"{
var pay_type = 0
if selectNum == 1 {
pay_type = 7
......@@ -812,7 +812,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
pay_type = selectNum + 7
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
editPayType(["user_token":UserToken as Any,"order_id":orderId as Any,"is_adsale":1 as Any,"amount_type":2 as Any,"pay_type":pay_type], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
......@@ -822,13 +822,13 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn = "未付款"
}else{
self.dataMdoel?.order_res?.sale_res?.wk_pay_status_cn = "已付款"
}
self.dataMdoel?.order_res?.sale_res?.wk_pay_type = pay_type
self.listView.reloadData()
self.loadData()
}
}) { (error) in
......@@ -836,7 +836,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
if view.titleLbl.text == "请选择支付方式" {
//MARK:--选择支付方式回调
var pay_type = 0
if selectNum == 1 {
pay_type = 7
......@@ -844,7 +844,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
pay_type = selectNum + 7
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
editPayType(["user_token":UserToken as Any,"order_id":orderId as Any,"is_adsale":0 as Any,"amount_type":0 as Any,"pay_type":pay_type], success: { (data) in
let dataM = data as! UpDataModel
if dataM.code == 1 {
......@@ -854,12 +854,12 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.dataMdoel?.order_res?.pay_status_cn = "未付款"
}else{
self.dataMdoel?.order_res?.pay_status_cn = "已付款"
}
self.dataMdoel?.order_res?.pay_type = pay_type
self.listView.reloadData()
self.loadData()
}
}) { (error) in
......@@ -877,7 +877,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.dataMdoel?.order_res?.lc_name = self.wuLiuFSArr[selectNum]
self.listView.reloadData()
self.loadData()
}
}) { (erro) in
......@@ -1024,7 +1024,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let view1 = HeaderOnlyTitleView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 39))
view1.nameLbl.text = "订单信息"
view.addSubview(view1)
return view
default:
break
......@@ -1071,8 +1071,15 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 7:
// str = "待收货"
if self.dataMdoel?.order_res?.pay_status != 2 && self.dataMdoel?.order_res?.pay_status != 11 {
titleArr = ["退货","打印","退款"]
if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2 {
titleArr = ["退货","打印","退款"]
}else{
titleArr = ["打印","退款"]
}
}else{
titleArr = ["打印","退款"]
}
......@@ -1081,11 +1088,21 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
case 5:
// str = "订单完成"
if status_d == 53 {
titleArr = ["退货","打印","退款"]
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 {
titleArr = ["退货","打印"]
if self.dataMdoel?.order_res?.shipping_status == 1 || self.dataMdoel?.order_res?.shipping_status == 2 {
titleArr = ["退货","打印"]
}else{
titleArr = []
}
}
break
......@@ -1105,14 +1122,14 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
//MARK:--弹窗代理 --还有其他弹窗，根据tag分类
func sureGeliAlertViewAction(sender: UIButton) {
let UserToken = UserDefaults.standard.value(forKey: "user_token")
if sender.tag == 1001 {
HUD.flash(.progress)
orderConfirm(["user_token":UserToken as Any,"order_id" : self.dataMdoel?.order_res?.order_id 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
......@@ -1123,7 +1140,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
HUD.flash(.labeledSubSuccess(subtitle: "取消成功"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange()
self.loadData()
}) { (error) in
......@@ -1145,7 +1162,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange()
self.loadData()
}) { (error) in
......@@ -1157,7 +1174,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
HUD.flash(.labeledSubSuccess(subtitle: "提交成功"),delay: 1.2)
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "orderChange"), object: nil)
self.delegate?.refishingOrderDchange()
self.loadData()
}) { (error) in
......
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