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

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

Browse Source
This commit is contained in:
苏尹岚
2020-08-24 10:21:19 +08:00
parent fde5bbde83 8901bb2a13
commit 5d041591e1
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
business/jxcallback/orderman/orderman_ext.go
View File

@@ -1297,8 +1297,12 @@ func RefreshJdShopOrdersEarningPrice(ctx *jxcontext.Context, orderStartTime, ord
order := &model.GoodsOrder{} order := &model.GoodsOrder{}
order.VendorOrderID = utils.Int64ToStr(v.OrderID) order.VendorOrderID = utils.Int64ToStr(v.OrderID)
dao.GetEntity(db, order, "VendorOrderID") dao.GetEntity(db, order, "VendorOrderID")
storeDeatil, _ := dao.GetStoreDetail(db, jxutils.GetSaleStoreIDFromOrder(order), order.VendorID)
order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100) order.TotalShopMoney = utils.Float64TwoInt64(v.DueAmount * 100)
dao.UpdateEntity(db, order, "TotalShopMoney") if order.NewEarningPrice == 0 {
jxutils.RefreshOrderEarningPrice2(order, storeDeatil.PayPercentage)
}
dao.UpdateEntity(db, order, "TotalShopMoney", "NewEarningPrice")
} }
} }
return err return err

8
business/jxstore/cms/store.go
View File

@@ -1159,6 +1159,10 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
} else { } else {
err = ErrCanNotFindVendor err = ErrCanNotFindVendor
} }
storeDetail, _ := dao.GetStoreDetailByVendorStoreID(db, storeMap.VendorStoreID, storeMap.VendorID)
if storeDetail != nil {
return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID)
}
} else if vendorID == model.VendorIDJX { } else if vendorID == model.VendorIDJX {
ReCalculateJxPriceLight(db, ctx, storeID) ReCalculateJxPriceLight(db, ctx, storeID)
} else if vendorID == model.VendorIDYB { } else if vendorID == model.VendorIDYB {
@@ -1186,10 +1190,6 @@ func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, vendorID int, vend
} }
} }
} }
storeDetail, _ := dao.GetStoreDetailByVendorStoreID(db, storeMap.VendorStoreID, storeMap.VendorID)
if storeDetail != nil {
return nil, fmt.Errorf("此平台门店ID已在京西有绑定，请先解除绑定，平台门店ID :[%v]", storeMap.VendorStoreID)
}
storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", true) storeMapList, err := dao.GetStoresMapList2(db, []int{vendorID}, []int{storeID}, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", "", true)
if len(storeMapList) > 0 { if len(storeMapList) > 0 {
_, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName) _, err = CurVendorSync.SyncStore(ctx, db, storeMap.VendorID, storeID, false, userName)

2
business/partner/purchase/jdshop/store_sku.go
View File

@@ -660,7 +660,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
} }
attrBzq := &jdshopapi.CreateSkuParamAttrs{ attrBzq := &jdshopapi.CreateSkuParamAttrs{
AttrID: utils.Int2Str(attrIDs["保质期"]), AttrID: utils.Int2Str(attrIDs["保质期"]),
AttrValues: []string{"5天"}, AttrValues: []string{"5"},
} }
attrsProp = append(attrsProp, attrZctj) attrsProp = append(attrsProp, attrZctj)
attrsProp = append(attrsProp, attrJhl) attrsProp = append(attrsProp, attrJhl)