fix:支付
This commit is contained in:
momo
parent
fcfea291e5
commit
d22be1d676
@ -23,8 +23,8 @@ type ExchangeRateUnit interface{}
|
|||||||
type PayMethods string
|
type PayMethods string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
PAYMETHODCARD PayMethods = "CARD"
|
PAY_METHOD_CARD PayMethods = "CARD"
|
||||||
PayMethodVISA PayMethods = "VISA"
|
PayMethodVISA PayMethods = "VISA"
|
||||||
)
|
)
|
||||||
|
|
||||||
// 支付状态
|
// 支付状态
|
||||||
@ -56,20 +56,21 @@ const (
|
|||||||
type OrderStatusCode int64
|
type OrderStatusCode int64
|
||||||
|
|
||||||
const (
|
const (
|
||||||
ORDERSTATUSUNPAIDDEPOSIT OrderStatusCode = 0 // 0,未支付定金
|
ORDER_STATUS_UNPAIDDEPOSIT OrderStatusCode = 0 // 0,未支付定金
|
||||||
ORDERSTATUSDIRECTMAILORDERED OrderStatusCode = 10100 // 10100,直邮单--已下单
|
ORDER_STATUS_DIRECTMAIL_ORDERED OrderStatusCode = 10100 // 10100,直邮单--已下单
|
||||||
ORDERSTATUSDIRECTMAILORDEREDMAINING OrderStatusCode = 10100001 // 10100001,直邮单--已下单--尾款
|
ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING OrderStatusCode = 10100001 // 10100001,直邮单--已下单--尾款
|
||||||
ORDERSTATUSDIRECTMAILCANCEL OrderStatusCode = 10101 // 10101,直邮单--已取消
|
ORDER_STATUS_DIRECTMAIL_CANCEL OrderStatusCode = 10101 // 10101,直邮单--已取消
|
||||||
ORDERSTATUSDIRECTMAILSTARTPRODUCTION OrderStatusCode = 10200 // 10200,直邮单--开始生产
|
ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION OrderStatusCode = 10200 // 10200,直邮单--开始生产
|
||||||
ORDERSTATUSDIRECTMAILCOMPLETEPRODUCTION OrderStatusCode = 10300 // 10300,直邮单--生产完成
|
ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION OrderStatusCode = 10300 // 10300,直邮单--生产完成
|
||||||
ORDERSTATUSDIRECTMAILSHIPPED OrderStatusCode = 10400 // 10400,直邮单--已发货
|
ORDER_STATUS_DIRECTMAIL_SHIPPED OrderStatusCode = 10400 // 10400,直邮单--已发货
|
||||||
ORDERSTATUSDIRECTMAILARRIVED OrderStatusCode = 10500 // 10500,直邮单--已到达
|
ORDER_STATUS_DIRECTMAIL_ARRIVED OrderStatusCode = 10500 // 10500,直邮单--已到达
|
||||||
ORDERSTATUSCLOUDSTOREORDERED OrderStatusCode = 20100 // 20100,云仓单--已下单
|
ORDER_STATUS_CLOUDSTORE_ORDERED OrderStatusCode = 20100 // 20100,云仓单--已下单
|
||||||
ORDERSTATUSCLOUDSTOREORDEREDMAINING OrderStatusCode = 20100001 // 20100001,云仓单--已下单-尾款
|
ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING OrderStatusCode = 20100001 // 20100001,云仓单--已下单-尾款
|
||||||
ORDERSTATUSCLOUDSTORECANCEL OrderStatusCode = 20101 // 20101,云仓单--已取消
|
ORDER_STATUS_CLOUDSTORE_CANCEL OrderStatusCode = 20101 // 20101,云仓单--已取消
|
||||||
ORDERSTATUSCLOUDSTORESTARTPRODUCTION OrderStatusCode = 20200 // 20200,云仓单--开始生产
|
ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION OrderStatusCode = 20200 // 20200,云仓单--开始生产
|
||||||
ORDERSTATUSCLOUDSTOREOMPLETEPRODUCTION OrderStatusCode = 20300 // 20300,云仓单--生产完成
|
ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION OrderStatusCode = 20300 // 20300,云仓单--生产完成
|
||||||
ORDERSTATUSCLOUDSTOREARRIVEDWAREHOUSE OrderStatusCode = 20400 // 20400,云仓单--直达仓库
|
ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE OrderStatusCode = 20400 // 20400,云仓单--直达仓库
|
||||||
|
ORDER_STATUS_COMPLETE OrderStatusCode = 30000 // 30000,订单完成
|
||||||
)
|
)
|
||||||
|
|
||||||
// 订单状态名称
|
// 订单状态名称
|
||||||
@ -93,27 +94,29 @@ func init() {
|
|||||||
|
|
||||||
// 订单状态名称
|
// 订单状态名称
|
||||||
OrderStatusMessage = make(map[OrderStatusCode]string)
|
OrderStatusMessage = make(map[OrderStatusCode]string)
|
||||||
OrderStatusMessage[ORDERSTATUSUNPAIDDEPOSIT] = "未支付定金"
|
OrderStatusMessage[ORDER_STATUS_UNPAIDDEPOSIT] = "未支付定金"
|
||||||
|
|
||||||
OrderStatusMessage[ORDERSTATUSDIRECTMAILORDERED] = "直邮单--已下单"
|
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ORDERED] = "直邮单--已下单"
|
||||||
OrderStatusMessage[ORDERSTATUSDIRECTMAILSTARTPRODUCTION] = "直邮单--开始生产"
|
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION] = "直邮单--开始生产"
|
||||||
OrderStatusMessage[ORDERSTATUSDIRECTMAILCOMPLETEPRODUCTION] = "直邮单--生产完成"
|
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION] = "直邮单--生产完成"
|
||||||
OrderStatusMessage[ORDERSTATUSDIRECTMAILSHIPPED] = "直邮单--已发货"
|
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_SHIPPED] = "直邮单--已发货"
|
||||||
OrderStatusMessage[ORDERSTATUSDIRECTMAILARRIVED] = "直邮单--已到达"
|
OrderStatusMessage[ORDER_STATUS_DIRECTMAIL_ARRIVED] = "直邮单--已到达"
|
||||||
|
|
||||||
OrderStatusMessage[ORDERSTATUSCLOUDSTOREORDERED] = "云仓单--已下单"
|
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ORDERED] = "云仓单--已下单"
|
||||||
OrderStatusMessage[ORDERSTATUSCLOUDSTORESTARTPRODUCTION] = "云仓单--开始生产"
|
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION] = "云仓单--开始生产"
|
||||||
OrderStatusMessage[ORDERSTATUSCLOUDSTOREOMPLETEPRODUCTION] = "云仓单--生产完成"
|
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION] = "云仓单--生产完成"
|
||||||
OrderStatusMessage[ORDERSTATUSCLOUDSTOREARRIVEDWAREHOUSE] = "云仓单--直达仓库"
|
OrderStatusMessage[ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE] = "云仓单--直达仓库"
|
||||||
|
|
||||||
|
OrderStatusMessage[ORDER_STATUS_COMPLETE] = "订单完成"
|
||||||
|
|
||||||
// 订单状态--用户可见--直邮
|
// 订单状态--用户可见--直邮
|
||||||
OrderStatusUserDIRECTMAIL = []OrderStatusCode{
|
OrderStatusUserDIRECTMAIL = []OrderStatusCode{
|
||||||
ORDERSTATUSUNPAIDDEPOSIT,
|
ORDER_STATUS_UNPAIDDEPOSIT, ORDER_STATUS_COMPLETE,
|
||||||
ORDERSTATUSDIRECTMAILORDERED, ORDERSTATUSDIRECTMAILSTARTPRODUCTION, ORDERSTATUSDIRECTMAILCOMPLETEPRODUCTION, ORDERSTATUSDIRECTMAILSHIPPED, ORDERSTATUSDIRECTMAILARRIVED,
|
ORDER_STATUS_DIRECTMAIL_ORDERED, ORDER_STATUS_DIRECTMAIL_STARTPRODUCTION, ORDER_STATUS_DIRECTMAIL_COMPLETEPRODUCTION, ORDER_STATUS_DIRECTMAIL_SHIPPED, ORDER_STATUS_DIRECTMAIL_ARRIVED,
|
||||||
}
|
}
|
||||||
// 订单状态--用户可见--云仓
|
// 订单状态--用户可见--云仓
|
||||||
OrderStatusUserCLOUDSTORE = []OrderStatusCode{
|
OrderStatusUserCLOUDSTORE = []OrderStatusCode{
|
||||||
ORDERSTATUSUNPAIDDEPOSIT,
|
ORDER_STATUS_UNPAIDDEPOSIT, ORDER_STATUS_COMPLETE,
|
||||||
ORDERSTATUSCLOUDSTOREORDERED, ORDERSTATUSCLOUDSTORESTARTPRODUCTION, ORDERSTATUSCLOUDSTOREOMPLETEPRODUCTION, ORDERSTATUSCLOUDSTOREARRIVEDWAREHOUSE,
|
ORDER_STATUS_CLOUDSTORE_ORDERED, ORDER_STATUS_CLOUDSTORE_STARTPRODUCTION, ORDER_STATUS_CLOUDSTORE_COMPLETEPRODUCTION, ORDER_STATUS_CLOUDSTORE_ARRIVEDWAREHOUSE,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -253,11 +253,11 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
|||||||
if payStage == "deposit" {
|
if payStage == "deposit" {
|
||||||
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
|
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
|
||||||
// 直邮
|
// 直邮
|
||||||
statusCode = constants.ORDERSTATUSDIRECTMAILORDERED
|
statusCode = constants.ORDER_STATUS_DIRECTMAIL_ORDERED
|
||||||
}
|
}
|
||||||
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDSCLOUDSTORE {
|
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDSCLOUDSTORE {
|
||||||
// 云仓
|
// 云仓
|
||||||
statusCode = constants.ORDERSTATUSCLOUDSTOREORDERED
|
statusCode = constants.ORDER_STATUS_CLOUDSTORE_ORDERED
|
||||||
}
|
}
|
||||||
payStageInt = 1
|
payStageInt = 1
|
||||||
orderPayStatusCode = constants.ORDERPAYSTATUSPAIDDEPOSIT
|
orderPayStatusCode = constants.ORDERPAYSTATUSPAIDDEPOSIT
|
||||||
@ -287,13 +287,13 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
|||||||
if payStage == "remaining_balance" {
|
if payStage == "remaining_balance" {
|
||||||
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
|
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDIRECTMAIL {
|
||||||
// 直邮
|
// 直邮
|
||||||
statusCodePre = constants.ORDERSTATUSDIRECTMAILORDERED
|
statusCodePre = constants.ORDER_STATUS_DIRECTMAIL_ORDERED
|
||||||
statusCode = constants.ORDERSTATUSDIRECTMAILORDEREDMAINING
|
statusCode = constants.ORDER_STATUS_DIRECTMAIL_ORDEREDMAINING
|
||||||
}
|
}
|
||||||
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDSCLOUDSTORE {
|
if *orderInfo.DeliveryMethod == constants.DELIVERYMETHODDSCLOUDSTORE {
|
||||||
// 云仓
|
// 云仓
|
||||||
statusCodePre = constants.ORDERSTATUSCLOUDSTOREORDERED
|
statusCodePre = constants.ORDER_STATUS_CLOUDSTORE_ORDERED
|
||||||
statusCode = constants.ORDERSTATUSCLOUDSTOREORDEREDMAINING
|
statusCode = constants.ORDER_STATUS_CLOUDSTORE_ORDEREDMAINING
|
||||||
}
|
}
|
||||||
payStageInt = 2
|
payStageInt = 2
|
||||||
orderPayStatusCode = constants.ORDERPAYSTATUSPAIDDREMAINING
|
orderPayStatusCode = constants.ORDERPAYSTATUSPAIDDREMAINING
|
||||||
@ -313,7 +313,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
|||||||
}
|
}
|
||||||
statusLink = ress.OrderDetail.OrderInfo.StatusLink
|
statusLink = ress.OrderDetail.OrderInfo.StatusLink
|
||||||
|
|
||||||
if ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDERSTATUSDIRECTMAILORDERED || ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDERSTATUSCLOUDSTOREORDERED {
|
if ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDER_STATUS_DIRECTMAIL_ORDERED || ress.OrderDetail.OrderInfo.Status.StatusCode == constants.ORDER_STATUS_CLOUDSTORE_ORDERED {
|
||||||
status = ress.OrderDetail.OrderInfo.Status
|
status = ress.OrderDetail.OrderInfo.Status
|
||||||
status.Children = statusChildren
|
status.Children = statusChildren
|
||||||
}
|
}
|
||||||
@ -349,7 +349,7 @@ func (d *defaultOrder) PaymentSuccessful(ctx context.Context, in *PaymentSuccess
|
|||||||
PayTitle: &payTitle,
|
PayTitle: &payTitle,
|
||||||
})
|
})
|
||||||
var sql string
|
var sql string
|
||||||
if *orderInfo.Status == int64(constants.ORDERSTATUSUNPAIDDEPOSIT) {
|
if *orderInfo.Status == int64(constants.ORDER_STATUS_UNPAIDDEPOSIT) {
|
||||||
sql = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d, `status` = %d ", ntime, orderPayStatusCode, statusCode)
|
sql = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d, `status` = %d ", ntime, orderPayStatusCode, statusCode)
|
||||||
} else {
|
} else {
|
||||||
sql = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d", ntime, orderPayStatusCode)
|
sql = fmt.Sprintf(", `utime` = '%s', `pay_status` = %d", ntime, orderPayStatusCode)
|
||||||
@ -714,7 +714,7 @@ func (d *defaultOrder) Detail(ctx context.Context, in *DetailReq) (res *DetailRe
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 是否超时支付
|
// 是否超时支付
|
||||||
if *order.Status == int64(constants.ORDERSTATUSUNPAIDDEPOSIT) {
|
if *order.Status == int64(constants.ORDER_STATUS_UNPAIDDEPOSIT) {
|
||||||
ctime := *order.Ctime
|
ctime := *order.Ctime
|
||||||
ctimeTimeOut := ctime.Add(30 * time.Minute).UTC().Unix()
|
ctimeTimeOut := ctime.Add(30 * time.Minute).UTC().Unix()
|
||||||
ntimeTimeOut := time.Now().UTC().Unix()
|
ntimeTimeOut := time.Now().UTC().Unix()
|
||||||
@ -985,8 +985,8 @@ func (d *defaultOrder) Create(ctx context.Context, in *CreateReq) (res *CreateRe
|
|||||||
var status = gmodel.OrderStatus{
|
var status = gmodel.OrderStatus{
|
||||||
Ctime: &nowTime,
|
Ctime: &nowTime,
|
||||||
Utime: &nowTime,
|
Utime: &nowTime,
|
||||||
StatusCode: constants.ORDERSTATUSUNPAIDDEPOSIT,
|
StatusCode: constants.ORDER_STATUS_UNPAIDDEPOSIT,
|
||||||
StatusTitle: constants.OrderStatusMessage[constants.ORDERSTATUSUNPAIDDEPOSIT],
|
StatusTitle: constants.OrderStatusMessage[constants.ORDER_STATUS_UNPAIDDEPOSIT],
|
||||||
}
|
}
|
||||||
// 订单状态--链路
|
// 订单状态--链路
|
||||||
var statusLink = order.GenerateOrderStatusLink(in.DeliveryMethod, nowTime, in.ExpectedDeliveryTime)
|
var statusLink = order.GenerateOrderStatusLink(in.DeliveryMethod, nowTime, in.ExpectedDeliveryTime)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user