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-10-19 10:45:34 +08:00
parent 131c9b5182
commit ea41d3815a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -396,7 +396,6 @@ func (c *OrderManager) SaveOrder(order *model.GoodsOrder, isAdjust bool, db *dao
} }
_, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID") _, _, err = db.Db.ReadOrCreate(originalOrder, "VendorOrderID", "VendorID")
if created { if created {
globals.SugarLogger.Debugf("==========================order.sku := %s", utils.Format4Output(order.Skus, false))
if err = dao.CreateMultiEntities(db, order.Skus); err != nil { if err = dao.CreateMultiEntities(db, order.Skus); err != nil {
baseapi.SugarLogger.Warnf("saveOrder orderID:%s, save order_sku failed with error:%v", order.VendorOrderID, err) baseapi.SugarLogger.Warnf("saveOrder orderID:%s, save order_sku failed with error:%v", order.VendorOrderID, err)
} }

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

@@ -101,7 +101,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
//var weight int = 0 //var weight int = 0
order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠 order.PmSubsidyMoney = *orderDetail.SkuDiscountPlatformFee // 平台承担优惠
// 添加需要赠送的东西(暂时没有赠品套餐直接商品) // 添加需要赠送的东西(暂时没有赠品套餐直接商品)
globals.SugarLogger.Debugf("======orderDetail := %s", utils.Format4Output(orderDetail, false))
multiSkuMap := make(map[int]int) multiSkuMap := make(map[int]int)
if len(*orderDetail.SubOrderResponseList) > 0 { if len(*orderDetail.SubOrderResponseList) > 0 {
for _, extra := range *orderDetail.SubOrderResponseList { for _, extra := range *orderDetail.SubOrderResponseList {
@@ -113,8 +112,8 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
StoreSubName: "", StoreSubName: "",
Count: utils.Float64TwoInt(*extra.BuySaleQuantity), Count: utils.Float64TwoInt(*extra.BuySaleQuantity),
VendorSkuID: *extra.SkuCode, VendorSkuID: *extra.SkuCode,
SkuID: utils.Str2Int(*extra.SkuCode), SkuID: 0,
JxSkuID: utils.Str2Int(*extra.SkuCode), JxSkuID: 0,
SkuName: *extra.SkuName, SkuName: *extra.SkuName,
ShopPrice: *extra.Price, ShopPrice: *extra.Price,
VendorPrice: *extra.OriginalFee / utils.Float64TwoInt64(*extra.BuySaleQuantity), VendorPrice: *extra.OriginalFee / utils.Float64TwoInt64(*extra.BuySaleQuantity),
@@ -127,7 +126,11 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
IsVendorAct: 0, IsVendorAct: 0,
Upc: *extra.Barcode, Upc: *extra.Barcode,
} }
// extra.SkuCode 为int类型会超出长度,有时商品为平台创建
if len(*extra.SkuCode) <= 10 {
sku.SkuID = utils.Str2Int(*extra.SkuCode)
sku.JxSkuID = utils.Str2Int(*extra.SkuCode)
}
activityId := make([]int64, 0) activityId := make([]int64, 0)
activityName := make([]string, 0) activityName := make([]string, 0)
if extra.Activitys != nil { if extra.Activitys != nil {
@@ -202,7 +205,6 @@ func (p *PurchaseHandler) getOrder(vendorOrgCode string, vendorOrderID int64, ve
order.OrderSeq = orderSeq + 1 order.OrderSeq = orderSeq + 1
// 包装袋金额 // 包装袋金额
globals.SugarLogger.Debugf("==============order := %s", utils.Format4Output(order, false))
store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode) store, _ := dao.GetStoreDetailByVendorStoreID(dao.GetDB(), order.VendorStoreID, model.VendorIDTaoVegetable, order.VendorOrgCode)
if store != nil { if store != nil {
order.StoreName = store.Name // 真实门店名称 order.StoreName = store.Name // 真实门店名称