添加平台门店免运配置，当前只有京东实现了

business/jxstore/cms/cms.go

@@ -14,6 +14,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/mobile"
 	"git.rosy.net.cn/jx-callback/business/authz/autils"
+	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/msg"
 	"git.rosy.net.cn/jx-callback/business/partner"
 
@@ -185,6 +186,24 @@ func checkConfig(opFlag int, configType, key, value string) (err error) {
 				err = fmt.Errorf("配置:%s不合法", value)
 			}
 		}
+	case model.ConfigTypeFreightPack:
+		if value != "" {
+			freightPack := dao.FreightDeductionPack2Obj(value)
+			if freightPack == nil {
+				err = fmt.Errorf("配置:%s不合法", value)
+			} else {
+				var lastStage *model.FreightDeductionItem
+				for _, v := range freightPack.FreightDeductionList {
+					if lastStage != nil && lastStage.DeductFreight > v.DeductFreight {
+						err = fmt.Errorf("免运设置不合理:门槛:%s,免运金额:%s,门槛:%s,免运金额:%s",
+							jxutils.IntPrice2StandardString(int64(lastStage.BeginPrice)), jxutils.IntPrice2StandardString(int64(lastStage.DeductFreight)),
+							jxutils.IntPrice2StandardString(int64(v.BeginPrice)), jxutils.IntPrice2StandardString(int64(v.DeductFreight)))
+						return err
+					}
+					lastStage = v
+				}
+			}
+		}
 	case model.ConfigTypeBank:
 		if value != "" {
 			if model.BankName[key] == "" {
@@ -226,11 +245,24 @@ func DeleteConfig(ctx *jxcontext.Context, key, configType string) (err error) {
 	case model.ConfigTypePricePack:
 		storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, key)
 		if err == nil {
-			if len(storeMapList) > 0 {
-				var storeInfo []string
-				for _, v := range storeMapList {
+			var storeInfo []string
+			for _, v := range storeMapList {
+				storeInfo = append(storeInfo, fmt.Sprintf("门店:%d, 平台:%s", v.StoreID, model.VendorChineseNames[v.VendorID]))
+			}
+			if len(storeInfo) > 0 {
+				err = fmt.Errorf("还有门店在使用价格包:%s，门店信息:%s", key, strings.Join(storeInfo, ","))
+			}
+		}
+	case model.ConfigTypeFreightPack:
+		storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")
+		if err == nil {
+			var storeInfo []string
+			for _, v := range storeMapList {
+				if v.FreightDeductionPack == key {
 					storeInfo = append(storeInfo, fmt.Sprintf("门店:%d, 平台:%s", v.StoreID, model.VendorChineseNames[v.VendorID]))
 				}
+			}
+			if len(storeInfo) > 0 {
 				err = fmt.Errorf("还有门店在使用价格包:%s，门店信息:%s", key, strings.Join(storeInfo, ","))
 			}
 		}

business/jxstore/cms/store.go

@@ -829,6 +829,7 @@ func GetStoreVendorMaps(ctx *jxcontext.Context, db *dao.DaoDB, storeID int, vend
 	return storeMaps, dao.GetEntitiesByKV(db, &storeMaps, cond, false)
 }
 
+// todo 需要对字段做有效性检查
 func AddStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendorID int, storeMap *model.StoreMap) (outStoreMap *model.StoreMap, err error) {
 	if storeID == 0 {
 		return nil, fmt.Errorf("storeID不能为0")
@@ -923,14 +924,26 @@ func UpdateStoreVendorMap(ctx *jxcontext.Context, db *dao.DaoDB, storeID, vendor
 	if valid["status"] != nil {
 		syncStatus |= model.SyncFlagStoreStatus
 	}
-	if valid["pricePercentagePack"] != nil {
-		if pricePercentagePack := utils.Interface2String(valid["pricePercentagePack"]); pricePercentagePack != "" {
-			_, err2 := dao.QueryConfigs(db, pricePercentagePack, model.ConfigTypePricePack, "")
-			if err = err2; err != nil {
-				return 0, err
+	for _, v := range [][]string{
+		[]string{
+			"pricePercentagePack",
+			model.ConfigTypePricePack,
+		},
+		[]string{
+			"freightDeductionPack",
+			model.ConfigTypeFreightPack,
+		},
+	} {
+		if valid[v[0]] != nil {
+			if value := utils.Interface2String(valid[v[0]]); value != "" {
+				_, err2 := dao.QueryConfigs(db, value, v[1], "")
+				if err = err2; err != nil {
+					return 0, err
+				}
 			}
 		}
 	}
+
 	if vendorStoreID := utils.Interface2String(valid["vendorStoreID"]); vendorStoreID != "" {
 		vendorStoreInfo, err2 := storeHandler.ReadStore(ctx, vendorStoreID)
 		if err = err2; err == nil {