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

Merge branch 'jdshop' of e.coding.net:rosydev/jx-callback into jdshop

Browse Source
This commit is contained in:
苏尹岚
2020-07-02 18:08:20 +08:00
parent d23eb99d9e 61df974d7b
commit 25b5a5f8a9
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/jxstore/cms/store_sku_check.go
View File

@@ -590,6 +590,7 @@ func StoreOpenAll(ctx *jxcontext.Context) {
sl := make(map[string]interface{}) sl := make(map[string]interface{})
sl["vendorStoreID"] = StoreInfoList11.OuterPoiID sl["vendorStoreID"] = StoreInfoList11.OuterPoiID
sl["status"] = StoreInfoList11.OpenType sl["status"] = StoreInfoList11.OpenType
sl["vendorStatus"] = StoreInfoList11.OpenType
globals.SugarLogger.Debugf("被修改配送状态的VendorStoreID是:%s,名称是:%s,美团状态是:%s,本地状态是:%s", globals.SugarLogger.Debugf("被修改配送状态的VendorStoreID是:%s,名称是:%s,美团状态是:%s,本地状态是:%s",
StoreInfoList11.OuterPoiID, StoreInfoList11.PoiName, strconv.Itoa(StoreInfoList11.OpenType), strconv.Itoa(StoreCourierList1.Status)) StoreInfoList11.OuterPoiID, StoreInfoList11.PoiName, strconv.Itoa(StoreInfoList11.OpenType), strconv.Itoa(StoreCourierList1.Status))
UpdateStoreCourierMap(ctx, nil, StoreCourierList1.StoreID, StoreCourierList1.VendorID, sl, ctx.GetUserName()) UpdateStoreCourierMap(ctx, nil, StoreCourierList1.StoreID, StoreCourierList1.VendorID, sl, ctx.GetUserName())
@@ -809,6 +810,9 @@ func StoreOpenAll(ctx *jxcontext.Context) {
// } // }
// var StoreMapLists []*model.StoreMap // var StoreMapLists []*model.StoreMap
// for _, StoreList := range StoreLists { // for _, StoreList := range StoreLists {
// if StoreList.StoreLevel == "E" {
// continue
// }
// if StoreMapLists, err = dao.GetStoresMapList(db, []int{0, 1, 3}, []int{StoreList.ID}, nil, 1, -1, "", ""); err != nil { // if StoreMapLists, err = dao.GetStoresMapList(db, []int{0, 1, 3}, []int{StoreList.ID}, nil, 1, -1, "", ""); err != nil {
// globals.SugarLogger.Debugf("商店列表获取失败") // globals.SugarLogger.Debugf("商店列表获取失败")
// } // }
@@ -856,6 +860,7 @@ func StoreOpenAll(ctx *jxcontext.Context) {
// StoreList.LastOperator = ctx.GetUserName() // StoreList.LastOperator = ctx.GetUserName()
// dao.UpdateEntity(db, StoreList, "DeliveryRange", "DeliveryRangeType", "LastOperator", "UpdatedAt") // dao.UpdateEntity(db, StoreList, "DeliveryRange", "DeliveryRangeType", "LastOperator", "UpdatedAt")
// } // }
// globals.SugarLogger.Debug("StoreOpenAll skuID is Complete")
//} //}
func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) { func TestDiff(ctx *jxcontext.Context, vendorIDList []int, storeIDList []int) {
@@ -1332,9 +1337,9 @@ func WriteToExcel(task *tasksch.SeqTask, data map[int][]DiffData, depotData map[
} }
} }
func SetJxPrice(jxSkuInfoDataMulti *dao.StoreSkuNamesInfo, storeId int, Vendorid int) (err error) { func SetJxPrice(jxSkuInfoDataMulti *dao.StoreSkuNamesInfo, storeId int, vendorid int) (err error) {
db := dao.GetDB() db := dao.GetDB()
storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, Vendorid) storeDetail, err := dao.GetStoreDetail(dao.GetDB(), storeId, vendorid)
if err != nil { if err != nil {
dao.Rollback(db) dao.Rollback(db)
return err return err

1
business/jxstore/cms/sync.go
View File

@@ -1288,6 +1288,7 @@ func SetMTPSStatus(ctx *jxcontext.Context) {
sl := make(map[string]interface{}) sl := make(map[string]interface{})
sl["vendorStoreID"] = StoreInfoList11.OuterPoiID sl["vendorStoreID"] = StoreInfoList11.OuterPoiID
sl["status"] = StoreInfoList11.OpenType sl["status"] = StoreInfoList11.OpenType
sl["vendorStatus"] = StoreInfoList11.OpenType
globals.SugarLogger.Debugf("被修改配送状态的VendorStoreID是:%s,名称是:%s,美团状态是:%s,本地状态是:%s", globals.SugarLogger.Debugf("被修改配送状态的VendorStoreID是:%s,名称是:%s,美团状态是:%s,本地状态是:%s",
StoreInfoList11.OuterPoiID, StoreInfoList11.PoiName, strconv.Itoa(StoreInfoList11.OpenType), strconv.Itoa(StoreCourierList1.Status)) StoreInfoList11.OuterPoiID, StoreInfoList11.PoiName, strconv.Itoa(StoreInfoList11.OpenType), strconv.Itoa(StoreCourierList1.Status))
UpdateStoreCourierMap(ctx, nil, StoreCourierList1.StoreID, StoreCourierList1.VendorID, sl, ctx.GetUserName()) UpdateStoreCourierMap(ctx, nil, StoreCourierList1.StoreID, StoreCourierList1.VendorID, sl, ctx.GetUserName())

2
business/model/store.go
View File

@@ -459,7 +459,7 @@ type StoreCourierMap struct {
VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"` VendorStoreID string `orm:"column(vendor_store_id);size(48)" json:"vendorStoreID"`
Status int `json:"status"` Status int `json:"status"`
AuditStatus int `json:"auditStatus"` AuditStatus int `json:"auditStatus"`
VendorStatus int `json:"vendorStatus"`
// 以下数据仅用于同步使用 // 以下数据仅用于同步使用
Lng int `json:"-"` // 乘了10的6次方 Lng int `json:"-"` // 乘了10的6次方
Lat int `json:"-"` // 乘了10的6次方 Lat int `json:"-"` // 乘了10的6次方