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

- 从OrderSkuFinancial中移除VendorOrderID2

Browse Source
This commit is contained in:
gazebo
2019-05-11 14:06:36 +08:00
parent aa4e9c3507
commit acacc7a1b2
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxcallback/orderman/order_afs.go
View File

@@ -49,7 +49,7 @@ func (c *OrderManager) onAfsOrderNew(afsOrder *model.AfsOrder, orderStatus *mode
} }
return err return err
} }
if afsOrder.Status == model.AfsOrderStatusNew { if orderStatus.Status == model.AfsOrderStatusNew {
if _, err = c.loadAfsOrder(db, afsOrder.AfsOrderID, afsOrder.VendorID); err != nil { if _, err = c.loadAfsOrder(db, afsOrder.AfsOrderID, afsOrder.VendorID); err != nil {
if !dao.IsNoRowsError(err) { if !dao.IsNoRowsError(err) {
return err return err

9
business/model/order_financial.go
View File

@@ -115,11 +115,10 @@ func (o *AfsOrder) TableUnique() [][]string {
type OrderSkuFinancial struct { type OrderSkuFinancial struct {
ModelIDCUL ModelIDCUL
VendorID int `orm:"column(vendor_id)" json:"vendorID"` // 平台id VendorID int `orm:"column(vendor_id)" json:"vendorID"` // 平台id
VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` // 关联原始订单ID VendorOrderID string `orm:"column(vendor_order_id);size(48)" json:"vendorOrderID"` // 关联原始订单ID
VendorOrderID2 string `orm:"column(vendor_order_id2);size(48);index" json:"vendorOrderID2"` // 关联原始订单ID2,饿百独有 AfsOrderID string `orm:"column(afs_order_id);size(48)" json:"afsOrderID"` // 售后单ID
AfsOrderID string `orm:"column(afs_order_id);size(48)" json:"afsOrderID"` // 售后单ID IsAfsOrder int8 `json:"isAfsOrder"` // 0--正向单， 1--售后单
IsAfsOrder int8 `json:"isAfsOrder"` // 0--正向单， 1--售后单
// ConfirmTime time.Time `orm:"type(datetime)" json:"confirmTime"` // 订单生成/完成时间 // ConfirmTime time.Time `orm:"type(datetime)" json:"confirmTime"` // 订单生成/完成时间
VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` // 外部系统里记录的storeid VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` // 外部系统里记录的storeid

12
business/partner/purchase/ebai/financial.go
View File

@@ -86,10 +86,9 @@ func (p *PurchaseHandler) OrderFinancialDetail2Refund(orderFinancial *model.Orde
} }
for _, sku := range orderFinancial.Skus { for _, sku := range orderFinancial.Skus {
orderSkuFinancial := &model.OrderSkuFinancial{ orderSkuFinancial := &model.OrderSkuFinancial{
VendorID: sku.VendorID, VendorID: sku.VendorID,
VendorOrderID: sku.VendorOrderID, VendorOrderID: sku.VendorOrderID,
VendorOrderID2: sku.VendorOrderID2, AfsOrderID: sku.VendorOrderID,
AfsOrderID: sku.VendorOrderID,
// ConfirmTime: afsOrder.AfsCreateAt, // ConfirmTime: afsOrder.AfsCreateAt,
VendorStoreID: afsOrder.VendorStoreID, VendorStoreID: afsOrder.VendorStoreID,
StoreID: afsOrder.StoreID, StoreID: afsOrder.StoreID,
@@ -232,9 +231,8 @@ func (p *PurchaseHandler) OrderDetail2Financial(result map[string]interface{}) (
for _, y := range x.([]interface{}) { for _, y := range x.([]interface{}) {
product := y.(map[string]interface{}) product := y.(map[string]interface{})
orderSkuFinancial := &model.OrderSkuFinancial{ orderSkuFinancial := &model.OrderSkuFinancial{
VendorID: orderFinancial.VendorID, VendorID: orderFinancial.VendorID,
VendorOrderID: orderFinancial.VendorOrderID, VendorOrderID: orderFinancial.VendorOrderID,
VendorOrderID2: orderFinancial.VendorOrderID2,
// OrderFinancialID: orderFinancial.VendorOrderID, // OrderFinancialID: orderFinancial.VendorOrderID,
// ConfirmTime: getTimeFromInterface(order1["create_time"]), // ConfirmTime: getTimeFromInterface(order1["create_time"]),
VendorStoreID: utils.Interface2String(shop["baidu_shop_id"]), VendorStoreID: utils.Interface2String(shop["baidu_shop_id"]),

3
business/partner/purchase/jd/order_afs.go
View File

@@ -135,6 +135,7 @@ func (c *PurchaseHandler) buildAfsOrder(afsInfo *jdapi.AfsServiceResponse) (afsO
TongchengFreightMoney: afsInfo.TongchengFreightMoney, TongchengFreightMoney: afsInfo.TongchengFreightMoney,
SkuBoxMoney: afsInfo.MealBoxMoney, SkuBoxMoney: afsInfo.MealBoxMoney,
VendorStatus: utils.Int2Str(afsInfo.AfsServiceState),
VendorReasonType: utils.Int2Str(afsInfo.QuestionTypeCid), VendorReasonType: utils.Int2Str(afsInfo.QuestionTypeCid),
ReasonType: c.convertAfsReasonType(afsInfo.QuestionTypeCid), ReasonType: c.convertAfsReasonType(afsInfo.QuestionTypeCid),
ReasonDesc: utils.LimitUTF8StringLen(afsInfo.QuestionDesc, 1024), ReasonDesc: utils.LimitUTF8StringLen(afsInfo.QuestionDesc, 1024),
@@ -142,6 +143,8 @@ func (c *PurchaseHandler) buildAfsOrder(afsInfo *jdapi.AfsServiceResponse) (afsO
VendorAppealType: afsInfo.ApplyDeal, VendorAppealType: afsInfo.ApplyDeal,
AppealType: c.convertAfsAppealType(afsInfo.ApplyDeal), AppealType: c.convertAfsAppealType(afsInfo.ApplyDeal),
} }
afsOrder.Status = c.GetAfsStatusFromVendorStatus(afsOrder.VendorStatus)
for _, x := range afsInfo.AfsDetailList { for _, x := range afsInfo.AfsDetailList {
orderSku := &model.OrderSkuFinancial{ orderSku := &model.OrderSkuFinancial{
VendorID: model.VendorIDJD, VendorID: model.VendorIDJD,

5
business/partner/purchase/mtwm/financial.go
View File

@@ -64,9 +64,8 @@ func (p *PurchaseHandler) OrderFinancialDetail2Refund(orderFinancial *model.Orde
} }
for _, sku := range orderFinancial.Skus { for _, sku := range orderFinancial.Skus {
orderSkuFinancial := &model.OrderSkuFinancial{ orderSkuFinancial := &model.OrderSkuFinancial{
VendorID: sku.VendorID, VendorID: sku.VendorID,
VendorOrderID: sku.VendorOrderID, VendorOrderID: sku.VendorOrderID,
VendorOrderID2: sku.VendorOrderID2,
// OrderFinancialID: sku.VendorOrderID, // OrderFinancialID: sku.VendorOrderID,
// ConfirmTime: afsOrder.AfsCreateAt, // ConfirmTime: afsOrder.AfsCreateAt,
VendorStoreID: afsOrder.VendorStoreID, VendorStoreID: afsOrder.VendorStoreID,