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:
邹宗楠
2024-06-21 10:55:51 +08:00
parent 070d3853c7
commit 78e523ea9d
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
business/jxstore/cms/sku.go
View File

@@ -1095,26 +1095,26 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
}
if len(skuIDs) > 0 {
// 判断是否改价
if payload["price"] != nil {
nowPrice, _ := payload["price"].(json.Number).Int64()
if skuName.Price != int(nowPrice) && nowPrice != 0 && payload["skus"] != nil {
for _, v1 := range payload["skus"].([]interface{}) {
v := v1.(map[string]interface{})
skuInfo := &aa{}
if err := utils.Map2StructByJson(v, skuInfo, false); err != nil {
globals.SugarLogger.Debugf("errr %v", err)
continue
}
var skuPrice int64 = 0
if payload["unit"] == "份" { // 商品规格等于份的时候,标准重量保持为500g
skuPrice = int64(float64(skuInfo.SpecQuality) / float64(500) * float64(nowPrice))
} else {
skuPrice = nowPrice
}
SetUpdateSkuPriceIfChange(db, skuPrice, nowPrice, skuInfo.Id)
}
}
}
//if payload["price"] != nil {
// nowPrice, _ := payload["price"].(json.Number).Int64()
// if skuName.Price != int(nowPrice) && nowPrice != 0 && payload["skus"] != nil {
// for _, v1 := range payload["skus"].([]interface{}) {
// v := v1.(map[string]interface{})
// skuInfo := &aa{}
// if err := utils.Map2StructByJson(v, skuInfo, false); err != nil {
// globals.SugarLogger.Debugf("errr %v", err)
// continue
// }
// var skuPrice int64 = 0
// if payload["unit"] == "份" { // 商品规格等于份的时候,标准重量保持为500g
// skuPrice = int64(float64(skuInfo.SpecQuality) / float64(500) * float64(nowPrice))
// } else {
// skuPrice = nowPrice
// }
// SetUpdateSkuPriceIfChange(db, skuPrice, nowPrice, skuInfo.Id)
// }
// }
//}
// 更新skuIds对应在store_sku_bind中的价格体系,解决老版本改价之前关注的商品,在价格修改后,store_sku_bind中京西价未修改的问题
if _, err = SetStoreSkuSyncStatus2(db, nil, partner.GetSingleStoreVendorIDs(), skuIDs, model.SyncFlagModifiedMask); err != nil {

2
business/partner/purchase/ebai/ebai.go
View File

@@ -177,7 +177,7 @@ func OrderDeliveryCoordinate(param map[string]interface{}) error {
case 0, 5:
selfStatus = ebaiapi.OrderDeliveryStatusWaitRider // 2:配送待分配
case 10:
selfStatus = ebaiapi.OrderDeliveryStatusReceived // 骑士接单
selfStatus = ebaiapi.OrderDeliveryStatusReceived // 3.骑士接单
case 15:
selfStatus = ebaiapi.OrderDeliveryStatusToStore // 骑士到店
case 20: