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

updateOrderOtherInfo中不特殊处理VendorIDJX

Browse Source
This commit is contained in:
gazebo
2019-10-28 13:44:06 +08:00
parent 349bb45095
commit a2252e6487
2 changed files with 17 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,37 +385,19 @@ func (c *OrderManager) updateOrderOtherInfo(order *model.GoodsOrder, db *dao.Dao
globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID) globals.SugarLogger.Debugf("updateOrderOtherInfo orderID:%s, VendorStoreID:%s", order.VendorOrderID, order.VendorStoreID)
payPercentage := 0 payPercentage := 0
if order.VendorID != model.VendorIDJX { storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID)
storeDetail, err := dao.GetStoreDetailByVendorStoreID(db, order.VendorStoreID, order.VendorID) if err != nil {
if err != nil { if !dao.IsNoRowsError(err) {
if !dao.IsNoRowsError(err) { globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
globals.SugarLogger.Warnf("updateOrderOtherInfo GetStoreDetailByVendorStoreID orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err) return err
return err
}
if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
}
err = nil
} else {
order.JxStoreID = storeDetail.Store.ID
payPercentage = storeDetail.PayPercentage
} }
if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
globals.SugarLogger.Infof("updateOrderOtherInfo [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
}
err = nil
} else { } else {
store := &model.Store{} order.JxStoreID = storeDetail.Store.ID
store.ID = order.StoreID payPercentage = storeDetail.PayPercentage
if err = dao.GetEntity(dao.GetDB(), store); err != nil {
if !dao.IsNoRowsError(err) {
globals.SugarLogger.Warnf("updateOrderOtherInfo GetEntity orderID:%s, VendorStoreID:%s, error:%v", order.VendorOrderID, order.VendorStoreID, err)
return err
}
if time.Now().Sub(order.OrderCreatedAt) < 1*time.Hour {
globals.SugarLogger.Infof("updateOrderOtherInfo b, [运营]订单在京西与平台都找不到京西门店信息,订单:%s,平台门店ID:%s,平台:%s", order.VendorOrderID, order.VendorStoreID, model.VendorChineseNames[order.VendorID])
}
err = nil
} else {
payPercentage = store.PayPercentage
}
order.JxStoreID = order.StoreID
} }
if err = c.updateOrderSkuOtherInfo(order, db, payPercentage); err == nil { if err = c.updateOrderSkuOtherInfo(order, db, payPercentage); err == nil {
jxutils.RefreshOrderSkuRelated(order) jxutils.RefreshOrderSkuRelated(order)

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

@@ -101,6 +101,10 @@ func getStoreDetail(db *DaoDB, storeID, vendorID int, vendorStoreID string) (sto
if err = GetRow(db, storeDetail, sql, sqlParams...); err == nil { if err = GetRow(db, storeDetail, sql, sqlParams...); err == nil {
storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr) storeDetail.PricePercentagePackObj = PricePercentagePack2Obj(storeDetail.PricePercentagePackStr)
storeDetail.FreightDeductionPackObj = FreightDeductionPack2Obj(storeDetail.FreightDeductionPackStr) storeDetail.FreightDeductionPackObj = FreightDeductionPack2Obj(storeDetail.FreightDeductionPackStr)
if vendorID == model.VendorIDJX {
storeDetail.VendorStatus = storeDetail.Status
storeDetail.PricePercentage = 100
}
return storeDetail, nil return storeDetail, nil
} }
return nil, err return nil, err
@@ -114,16 +118,8 @@ func GetStoreDetailByVendorStoreID(db *DaoDB, vendorStoreID string, vendorID int
if vendorID != model.VendorIDJX { if vendorID != model.VendorIDJX {
return getStoreDetail(db, 0, vendorID, vendorStoreID) return getStoreDetail(db, 0, vendorID, vendorStoreID)
} }
store := &model.Store{} if storeDetail, err = getStoreDetail(db, int(utils.Str2Int64WithDefault(vendorStoreID, 0)), vendorID, ""); err == nil {
store.ID = int(utils.Str2Int64WithDefault(vendorStoreID, 0)) storeDetail.VendorStoreID = vendorStoreID
if err = GetEntity(db, store); err == nil {
// todo 还要补全其它参数
storeDetail = &StoreDetail{
Store: *store,
VendorStoreID: vendorStoreID,
VendorStatus: store.Status,
PricePercentage: 100,
}
} }
return storeDetail, err return storeDetail, err
} }