Skip to content

G
GeliBusinessPlatform
Commit 0d4b3081 authored by lujunye's avatar lujunye
Browse files
Options

改状态

parent 4108a232
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 101 additions and 21 deletions
GeliBusinessPlatform/Define/Define.swift
View file @ 0d4b3081
......@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址
//test
//let SERVERCE_ImageHost = "https://z.gelifood.com/"
//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
let SERVERCE_ImageHost = "https://zx.gelifood.com/"
let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
let SERVERCE_ImageHost = "https://z.gelifood.com/"
let SERVERCE_HOST = "https://z.gelifood.com/admin/"
//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
//online
//视图常量
......
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 0d4b3081
......@@ -216,5 +216,7 @@
<string>Order/confirmReturnedGoods</string>
<key>审核同意退货或退款</key>
<string>Order/refundOrSalesReturn</string>
<key>订单确认收货</key>
<string>Order/confirmReceiving</string>
</dict>
</plist>
GeliBusinessPlatform/Model/OrderInterface.swift
View file @ 0d4b3081
......@@ -446,3 +446,17 @@ func refundOrSalesReturn(_ params:[String:Any],success:@escaping (_ res:Any)->()
}) { (error) in
}
}
//MARK: -- 订单确认收货
/**
params-key:
user_token(验证token)
order_id（订单id）
*/
func confirmReceiving(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) { NetworkRequest.sharedInstance.postRequest("订单确认收货", params, { (rep:DataResponse<UpDataModel>) in
}, success: { (data) in
success(data)
}) { (error) in
}
}
GeliBusinessPlatform/Model/UpDataModel.swift
View file @ 0d4b3081
......@@ -8,7 +8,7 @@
import Foundation
import ObjectMapper
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,
//发送验证码,验证短信验证码,修改登录密码,绑定、更换绑定格利支付账号,简单通用操作接口,普通订单发货,预售订单发货,订单绑定/更换绑定客户,确认订单,订单取消,修改订单商品价格,订单退款,普通订单退货,预售订单退货,修改订单支付方式(状态),商家仓库添加,商家仓库修改,商家仓库删除,提交下单,商品入库审核,商品入库,商品入库申请,商品出库,商品申请出库,商品审核出库,出库入库审核不通过,编辑地址,删除地址,新增采购单,审核采购单,撤销入库,采购单修改支付状态,供应商编辑,新增供应商,编辑客户,新增客户,应收账款收款,设为未收,取消采购单,修改采购订单,新增品牌,拒绝退款,确认用户退款到账,拒绝接单,审核同意退货退款,取消订单审核,确认收到退货,审核同意退货或退款,订单确认收货,
class UpDataModel: Mappable {
......
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @ 0d4b3081
......@@ -217,7 +217,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
alertView.rightBtn.tag = 1003
self.view.window?.addSubview(alertView)
break
case "退款":
case "退款","取消订单并退款":
let alertView = GeliAlertView(frame: self.view.window!.bounds)
alertView.delegate = self;
alertView.tishiLbl.text = ""
......@@ -316,6 +316,24 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
alertView.rightBtn.tag = 1012
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 = 1020
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 = 1021
self.view.window?.addSubview(alertView)
break
case "付款码":
let alertView = GeliAltetCodeView(frame: self.view.window!.bounds)
alertView.saveImgID = orderId
......@@ -1164,7 +1182,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
switch status {
case 0:
// str = "未确定" "待付款"
titleArr = ["修改价格","拒绝接单","同意接单","先货后款"]
titleArr = ["修改价格","同意接单","先货后款","拒绝接单"]
if self.dataMdoel!.order_res?.goods_before_pay == 1 {
titleArr = ["修改价格","同意接单","拒绝接单"]
}
......@@ -1182,14 +1200,18 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
break
case 6:
// str = "待发货"
titleArr = ["取消订单","发货"]
if self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["发货","取消订单"]
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr.append("确认收款")
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["发货","取消订单并退款"]
if self.dataMdoel!.order_res?.pay_status == 0{
titleArr = ["发货","取消订单","确认收款"]
}
}else{
titleArr = ["发货","退款"]
if self.dataMdoel!.order_res?.pay_status == 0{
titleArr = ["发货","取消订单"]
}
if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr = ["付款码","取消订单"]
titleArr.append("付款码")
}
}
if self.dataMdoel?.order_res?.apply_cancel == 1 {
......@@ -1198,16 +1220,30 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
break
case 7:
// str = "待收货"
titleArr = ["退款"]
if self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["取消订单"]
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr.append("确认收款")
if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
titleArr = ["确认收货","退款退货","退款"]
if self.dataMdoel?.order_res?.pay_status == 0{//未收款
titleArr = ["确认收货","确认收款","取消订单"]
}
if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr = ["付款码","取消订单"]
}else{
titleArr = ["退款"]
if self.dataMdoel?.order_res?.pay_status == 0 {
titleArr = ["取消订单"]
}
if self.dataMdoel?.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr = ["取消订单","付款码"]
}
}
// titleArr = ["退款"]
// if self.dataMdoel!.order_res?.pay_status == 0 {
// titleArr = ["取消订单"]
// if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
// titleArr.append("确认收款")
// }
// if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
// titleArr = ["付款码","取消订单"]
// }
// }
if self.dataMdoel?.order_res?.apply_cancel == 1 {
titleArr = ["拒绝取消订单","同意取消订单"]
}
......@@ -1252,9 +1288,21 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
break
case 10:
// str = "订单关闭"str = "已取消" //用户取消（预售
titleArr = ["退款退货"]
if self.dataMdoel!.order_res?.pay_status == 0 {
titleArr = ["取消订单"]
}
if self.dataMdoel!.order_res?.from == 3 || self.dataMdoel!.order_res?.from == 5 {
titleArr.append("确认收款")
}
if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
titleArr = ["付款码"]
titleArr.append("付款码")
}
// if self.dataMdoel!.order_res?.goods_before_pay == 1 && lmIdx == 1{
// titleArr = ["付款码"]
// }
// if self.dataMdoel!.order_res?.pay_status == 0 {
// if self.dataMdoel?.order_res?.from == 3 || self.dataMdoel?.order_res?.from == 5 {
// titleArr = ["确认收款"]
......@@ -1369,6 +1417,22 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
self.loadData()
}) { (error) in
}
}else if sender.tag == 1020 {
confirmReceiving(["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)
}) { (error) in
}
}else if sender.tag == 1021 {
refundAndSalesReturn(["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)
}) { (error) in
}
}else if sender.tag == 1099 {
editPayType(["user_token":UserToken as Any,"order_id":self.dataMdoel?.order_res?.order_id as Any,"is_adsale":0 as Any,"amount_type":0 as Any,"pay_type":7 as Any], success: { (data) 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