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

Merge remote-tracking branch 'origin/jdshop' into jxact

Browse Source
This commit is contained in:
苏尹岚
2020-08-18 08:49:00 +08:00
parent d4a7014280 927c261f0d
commit 9589d9562c
19 changed files with 262 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
business/jxcallback/orderman/order.go
View File

@@ -215,7 +215,7 @@ func (c *OrderManager) OnOrderStatusChanged(vendorOrgCode string, orderStatus *m
// }
// } else {
if order.NewEarningPrice == 0 || order.NewEarningPrice != (order.TotalShopMoney-waybill.DesiredFee)*int64(100-store.PayPercentage/2)/int64(100) {
order.NewEarningPrice = (order.TotalShopMoney - waybill.DesiredFee) * int64(100-store.PayPercentage/2) / int64(100)
order.NewEarningPrice = order.TotalShopMoney*int64(100-store.PayPercentage/2)/int64(100) - waybill.DesiredFee
}
// }
}
@@ -361,12 +361,16 @@ func ModifyOrderSkusStock(db *dao.DaoDB, order *model.GoodsOrder, isAdd bool) (e
for _, sku := range skus {
storeSkus, _ := dao.GetStoresSkusInfo(db, []int{jxutils.GetSaleStoreIDFromOrder(order)}, []int{sku.SkuID})
if len(storeSkus) == 0 {
globals.SugarLogger.Warnf("此订单商品没得storsku，%v,%v", order.VendorOrderID, sku.SkuID)
if !isAdd {
globals.SugarLogger.Warnf("此订单商品没得storsku，%v,%v", order.VendorOrderID, sku.SkuID)
}
continue
}
storeSku, stock := storeSkus[0], 0
if storeSku.Stock == 0 {
globals.SugarLogger.Warnf("此订单商品库存为0，%v,%v", order.VendorOrderID, sku.SkuID)
if !isAdd {
globals.SugarLogger.Warnf("此订单商品库存为0，%v,%v", order.VendorOrderID, sku.SkuID)
}
continue
}
if isAdd {
@@ -1486,8 +1490,9 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
waybill = v
}
}
handler := partner.DeliveryPlatformHandlers[waybill.WaybillVendorID]
err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
if handler := partner.GetDeliveryPlatformFromVendorID(model.VendorIDJDWL); handler != nil {
err = handler.Handler.CancelWaybill(waybill, 0, "订单已发送其他物流")
}
if err != nil {
return err
}
@@ -1543,12 +1548,13 @@ func SendJdwlForJdsOrder(ctx *jxcontext.Context, vendorOrderID string) (err erro
dao.UpdateEntity(db, order, "EclpOutID")
vendorWaybillID = eclpSoNo
} else {
handler := partner.DeliveryPlatformHandlers[model.VendorIDJDWL]
waybill2, err := handler.Handler.CreateWaybill(order, 0)
if err != nil {
return err
if handler := partner.GetDeliveryPlatformFromVendorID(model.VendorIDJDWL); handler != nil {
waybill2, err := handler.Handler.CreateWaybill(order, 0)
if err != nil {
return err
}
vendorWaybillID = waybill2.VendorWaybillID
}
vendorWaybillID = waybill2.VendorWaybillID
}
jdshop.CurPurchaseHandler.OrderExport(ctx, vendorOrderID, vendorWaybillID, false)
return err