liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
邹宗楠
2023-06-28 18:03:14 +08:00
parent d42ff2d73e
commit ab1dc20564
2 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
business/partner/purchase/tao_vegetable/order.go
View File

@@ -305,7 +305,7 @@ func (c *PurchaseHandler) onOrderMsg(orderStatus, orderId string, orderCallback
msg := orderCallback.(*tao_vegetable.CallbackOrder)
if orderStatus == tao_vegetable.OrderStatusOnSaleCancel {
onSale := orderCallback.(*tao_vegetable.OnSaleCancel)
msg.PublicModel = onSale.PublicModel
//msg.PublicModel = onSale.PublicModel
msg.MerchantCode = onSale.MerchantCode
msg.StoreId = onSale.StoreId
msg.BizOrderId = onSale.BizOrderId
@@ -386,7 +386,8 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd
RefVendorOrderID: orderId,
RefVendorID: model.VendorIDTaoVegetable,
VendorStatus: msg.OrderStatus,
StatusTime: utils.Str2TimeWithDefault(msg.Timestamp, time.Now()),
//StatusTime: utils.Str2TimeWithDefault(msg.Timestamp, time.Now()),
StatusTime: time.Now(),
}
switch msg.OrderStatus {
@@ -420,18 +421,18 @@ func (c *PurchaseHandler) callbackOrderMsg2Status(msg *tao_vegetable.CallbackOrd
func (c *PurchaseHandler) postFakeMsg(vendorOrderID, cmd, vendorStatus string) {
msg := &tao_vegetable.CallbackOrder{
PublicModel: tao_vegetable.PublicModel{
Method: "",
AppKey: "",
Session: "",
Timestamp: utils.Time2Str(time.Now()),
V: "",
SignMethod: "",
Sign: "",
Format: "",
Simplify: false,
CustomerId: false,
},
//PublicModel: tao_vegetable.PublicModel{
// Method: "",
// AppKey: "",
// Session: "",
// Timestamp: utils.Time2Str(time.Now()),
// V: "",
// SignMethod: "",
// Sign: "",
// Format: "",
// Simplify: false,
// CustomerId: false,
//},
MerchantCode: "",
StoreId: "",
BizOrderId: utils.Str2Int64(vendorOrderID),