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:
richboo111
2022-10-31 16:13:04 +08:00
parent e54512f647
commit 8c7d7cab96
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -249,6 +249,7 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
db2 = dao.GetDB() db2 = dao.GetDB()
} }
if model.IsSyncStatusNew(storeMap.SyncStatus) { if model.IsSyncStatusNew(storeMap.SyncStatus) {
globals.SugarLogger.Debugf("1.IsSyncStatusNew(storeMap.SyncStatus)")
storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, storeMap.VendorID, storeMap.VendorOrgCode) storeDetail, _ := dao.GetStoreDetail(db, storeMap.StoreID, storeMap.VendorID, storeMap.VendorOrgCode)
if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName, nil, storeDetail); err == nil { if vendorStoreID, err = handler.CreateStore2(db2, storeMap.StoreID, userName, nil, storeDetail); err == nil {
resultList = append(resultList, 1) resultList = append(resultList, 1)
@@ -256,12 +257,14 @@ func (v *VendorSync) SyncStore2(ctx *jxcontext.Context, db *dao.DaoDB, vendorIDs
failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "创建门店") failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "创建门店")
} }
} else if model.IsSyncStatusDelete(storeMap.SyncStatus) { } else if model.IsSyncStatusDelete(storeMap.SyncStatus) {
globals.SugarLogger.Debugf("2.IsSyncStatusDelete(storeMap.SyncStatus)")
if err = handler.DeleteStore(db2, storeMap.StoreID, userName); err == nil { if err = handler.DeleteStore(db2, storeMap.StoreID, userName); err == nil {
resultList = append(resultList, 1) resultList = append(resultList, 1)
} else { } else {
failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "删除门店") failedList = putils.GetErrMsg2FailedSingleList(nil, err, storeMap.StoreID, model.VendorChineseNames[storeMap.VendorID], "删除门店")
} }
} else { } else {
globals.SugarLogger.Debugf("3.UpdateStore")
if err = handler.UpdateStore(db2, storeMap.StoreID, userName); err == nil { if err = handler.UpdateStore(db2, storeMap.StoreID, userName); err == nil {
resultList = append(resultList, 1) resultList = append(resultList, 1)
} else { } else {

4
business/partner/purchase/tiktok_store/store.go
View File

@@ -309,6 +309,7 @@ func (P *PurchaseHandler) UpdateStore(db *dao.DaoDB, storeID int, userName strin
errList.AddErr(err3) errList.AddErr(err3)
} else { } else {
//更新运费模板 //更新运费模板
err = UpdateFreightTemplate(storeID) err = UpdateFreightTemplate(storeID)
if err != nil { if err != nil {
return errors.New(fmt.Sprintf("更新运费模板失败，原因:%v", err)) return errors.New(fmt.Sprintf("更新运费模板失败，原因:%v", err))
@@ -436,6 +437,7 @@ func UpdateFreightTemplate(storeCode int) error {
if err != nil { if err != nil {
return err return err
} }
globals.SugarLogger.Debugf("storeDetail.DeliveryFeeDeductionSill===============%d", storeDetail.DeliveryFeeDeductionSill)
Template := &freightTemplate_update_request.Template{ Template := &freightTemplate_update_request.Template{
TemplateName: storeDetail.VendorStoreName + "_" + utils.Int2Str(storeCode) + "的运费模板", TemplateName: storeDetail.VendorStoreName + "_" + utils.Int2Str(storeCode) + "的运费模板",
ProductProvince: int64(storeDetail.ProvinceCode), ProductProvince: int64(storeDetail.ProvinceCode),
@@ -450,6 +452,7 @@ func UpdateFreightTemplate(storeCode int) error {
{ {
RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]), RuleAddress: fmt.Sprintf(`{"%s":{"%s":{"%s":[0]}}}`, utils.Int2Str(storeDetail.ProvinceCode), utils.Int2Str(storeDetail.CityCode)[:2], utils.Int2Str(storeDetail.DistrictCode)[:2]),
IsOverFree: true, //是否包邮 IsOverFree: true, //是否包邮
IsDefault: 0,
IsLimited: false, IsLimited: false,
OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额 OverAmount: int64(storeDetail.DeliveryFeeDeductionSill), //此字段在vendor_id=14时 存储满x包邮金额
}} }}
@@ -458,6 +461,7 @@ func UpdateFreightTemplate(storeCode int) error {
Template: Template, Template: Template,
Columns: columns, Columns: columns,
} }
globals.SugarLogger.Debugf("param.Template.TemplateName==================%v", param.Template.TemplateName)
_, err = getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateUpdate(param) _, err = getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateUpdate(param)
if err != nil { if err != nil {
return err return err