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

Merge branch 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
richboo111
2023-06-29 09:19:11 +08:00
parent 7373f78fd7 a43780ea79
commit 57b498796b
3 changed files with 153 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -306,7 +306,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
@@ -387,7 +387,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 {
@@ -421,18 +422,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),

7
business/partner/purchase/tao_vegetable/order_afs.go
View File

@@ -15,6 +15,7 @@ import (
"git.rosy.net.cn/jx-callback/business/partner"
"git.rosy.net.cn/jx-callback/globals"
"git.rosy.net.cn/jx-callback/globals/api"
"time"
)
var (
@@ -196,7 +197,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{})
orderStatus.RefVendorOrderID = refundData.OutOrderId
orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusApplyAfs, "用户申请取消")
orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusApplyAfs)
orderStatus.StatusTime = utils.Str2Time(refundData.Timestamp)
orderStatus.StatusTime = time.Now()
orderStatus.Remark = refundData.Remarks
orderStatus.VendorOrderID = refundData.BizRefundId
case tao_vegetable.OrderStatusCancelAfs:
@@ -204,7 +205,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{})
orderStatus.RefVendorOrderID = refundData.OutOrderId
orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusCancelAfs, "用户取消售后申请")
orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusCancelAfs)
orderStatus.StatusTime = utils.Str2Time(refundData.Timestamp)
orderStatus.StatusTime = time.Now()
orderStatus.VendorOrderID = refundData.BizRefundId
//case tao_vegetable.OrderStatusOnSaleCancel:
// refundData := msg.(*tao_vegetable.OnSaleCancel)
@@ -218,7 +219,7 @@ func (c *PurchaseHandler) callbackAfsMsg2Status(status string, msg interface{})
orderStatus.RefVendorOrderID = refundData.OutMainRefundId
orderStatus.VendorStatus = fmt.Sprintf("%s:%s", tao_vegetable.OrderStatusRefundSuccess, "用户售后退款成功")
orderStatus.Status = c.GetAfsStatusFromVendorStatus(tao_vegetable.OrderStatusRefundSuccess)
orderStatus.StatusTime = utils.Str2Time(refundData.Timestamp)
orderStatus.StatusTime = time.Now()
orderStatus.VendorOrderID = refundData.BizSubRefundId
}