This commit is contained in:
richboo111
2022-11-07 09:23:17 +08:00
parent d4bc09c9d9
commit 15f67e9d2d

View File

@@ -178,7 +178,7 @@ func CreateOrUpdateAll(vendorOrgCode string, storeID, vendorStoreID int64) error
if err != nil || warehouseID == 0 || utils.IsNil(warehouseID) { if err != nil || warehouseID == 0 || utils.IsNil(warehouseID) {
globals.SugarLogger.Debugf("门店(%d) 创建仓库失败:%v", storeID, err) globals.SugarLogger.Debugf("门店(%d) 创建仓库失败:%v", storeID, err)
errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err)) errList.AddErr(fmt.Errorf("门店(%d) 创建仓库失败:%v", storeID, err))
} else { //绑定 } else { //绑定
if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID if err = BindStoreWarehouse(vendorOrgCode, utils.Int64ToStr(storeID), vendorStoreID); err != nil { //仓库绑定通过自定义外部ID
globals.SugarLogger.Debugf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err) globals.SugarLogger.Debugf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err)
errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err)) errList.AddErr(fmt.Errorf("门店(%d) 绑定仓库:%d 失败:%v", storeID, warehouseID, err))
@@ -417,7 +417,7 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
} }
param := &freightTemplate_create_request.FreightTemplateCreateParam{ param := &freightTemplate_create_request.FreightTemplateCreateParam{
Template: &freightTemplate_create_request.Template{ Template: &freightTemplate_create_request.Template{
TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")", TemplateName: storeDetail.VendorStoreName + "(" + utils.Int2Str(storeCode) + ")_",
ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]), ProductProvince: utils.Str2Int64(utils.Int2Str(storeDetail.ProvinceCode)[:2]),
ProductCity: int64(storeDetail.CityCode), ProductCity: int64(storeDetail.CityCode),
CalculateType: 2, //计价方式-1.按重量 2.按数量 CalculateType: 2, //计价方式-1.按重量 2.按数量
@@ -427,6 +427,7 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
}, },
} }
if int64(storeDetail.DeliveryFeeDeductionSill) != 0 { if int64(storeDetail.DeliveryFeeDeductionSill) != 0 {
param.Template.TemplateName += "满减包邮模板"
columns := []freightTemplate_create_request.ColumnsItem{ columns := []freightTemplate_create_request.ColumnsItem{
{ {
IsOverFree: true, //是否包邮 IsOverFree: true, //是否包邮
@@ -451,10 +452,11 @@ func CreateFreightTemplate(storeCode int) (int64, error) {
}, },
}} }}
param.Columns = columns param.Columns = columns
param.Template.TemplateName += "满减包邮模板"
} else { } else {
param.Template.TemplateName += "固定运费模板" param.Template.TemplateName += "固定运费模板"
param.Columns = nil
} }
globals.SugarLogger.Debugf("param.Template.TemplateName===============%s", param.Template.TemplateName)
resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param) resp, err := getAPI(storeDetail.VendorOrgCode, storeCode, storeDetail.VendorStoreID).FreightTemplateCreate(param)
if err != nil { if err != nil {
return 0, err return 0, err