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

- 京西自营商城

Browse Source
This commit is contained in:
gazebo
2019-09-10 17:21:44 +08:00
parent cc750af2ca
commit a90941b26e
8 changed files with 219 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/model/const.go
View File

@@ -338,6 +338,10 @@ func IsOrderImportantStatus(status int) bool {
return IsOrderMainStatus(status) || IsOrderLockStatus(status) || IsOrderUnlockStatus(status)
}
func IsSpecialVendorID(vendorID int) bool {
return vendorID == VendorIDWSC || vendorID == VendorIDJX
}
func WaybillVendorID2Mask(vendorID int) (mask int8) {
if vendorID == VendorIDDada {
mask = OrderDeliveryFlagMaskDada

9
business/model/dao/store.go
View File

@@ -399,10 +399,10 @@ func GetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.Sto
func FakeGetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model.StoreMap, err error) {
vendorID2 := vendorID
if vendorID == model.VendorIDWSC {
vendorID2 = model.VendorIDJD // 微商城的属性以京东属性为准（以免再绑定）
if model.IsSpecialVendorID(vendorID) {
vendorID2 = model.VendorIDJD // 微商城与京西的属性以京东属性为准（以免再绑定）
}
if storeMap, err = GetStoreMapByStoreID(db, storeID, vendorID2); vendorID == model.VendorIDWSC && IsNoRowsError(err) {
if storeMap, err = GetStoreMapByStoreID(db, storeID, vendorID2); model.IsSpecialVendorID(vendorID) && IsNoRowsError(err) {
err = nil
storeMap = &model.StoreMap{
StoreID: storeID,
@@ -416,6 +416,9 @@ func FakeGetStoreMapByStoreID(db *DaoDB, storeID, vendorID int) (storeMap *model
IsSync: 1,
}
}
if storeMap != nil && vendorID == model.VendorIDJX {
storeMap.DeliveryType = model.StoreDeliveryTypeByStore
}
return storeMap, err
}