|
@@ -2727,11 +2727,16 @@ func (rg *RegisterController) Import(c *gin.Context) {
|
|
|
return
|
|
|
}
|
|
|
serviceTempNameMap := make(map[string]*fms.ContractServiceTemplate)
|
|
|
+ raiServiceTempNameMap := make(map[string]*fms.ContractServiceTemplate)
|
|
|
serviceTempFullNameMap := make(map[string]*fms.ContractServiceTemplate)
|
|
|
serviceTempIdMap := make(map[int]*fms.ContractServiceTemplate)
|
|
|
for i := range serviceTempList {
|
|
|
serviceTempIdMap[serviceTempList[i].ServiceTemplateId] = serviceTempList[i]
|
|
|
- serviceTempNameMap[serviceTempList[i].Title] = serviceTempList[i]
|
|
|
+ if serviceTempList[i].ProductId == crm.CompanyProductRai {
|
|
|
+ raiServiceTempNameMap[serviceTempList[i].Title] = serviceTempList[i]
|
|
|
+ } else {
|
|
|
+ serviceTempNameMap[serviceTempList[i].Title] = serviceTempList[i]
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
for i := range serviceTempList {
|
|
@@ -3068,7 +3073,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
|
|
|
if k <= 43 {
|
|
|
//新增
|
|
|
parentName := "权益大套餐"
|
|
|
- tempItem := serviceTempNameMap[titleMap[k]]
|
|
|
+ tempItem := raiServiceTempNameMap[titleMap[k]]
|
|
|
if tempItem == nil {
|
|
|
resp.Fail(fmt.Sprintf("第%d行%d列套餐名称不匹配, 请按模板导入", i+1, k+1), c)
|
|
|
return
|
|
@@ -3083,7 +3088,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
|
|
|
}
|
|
|
rowServices = append(rowServices, cs)
|
|
|
|
|
|
- tempItem = serviceTempNameMap[parentName]
|
|
|
+ tempItem = raiServiceTempNameMap[parentName]
|
|
|
if tempItem == nil {
|
|
|
resp.Fail(fmt.Sprintf("第%d行%d列套餐名称不匹配, 请按模板导入", i+1, k+1), c)
|
|
|
return
|
|
@@ -3164,7 +3169,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
|
|
|
// 权益研选等套餐
|
|
|
if k >= 53 && k <= 60 {
|
|
|
if v == "是" {
|
|
|
- tempItem := serviceTempNameMap[titleMap[k]]
|
|
|
+ tempItem := raiServiceTempNameMap[titleMap[k]]
|
|
|
if tempItem == nil {
|
|
|
resp.Fail(fmt.Sprintf("第%d行%d列套餐名称不匹配, 请按模板导入", i+1, k+1), c)
|
|
|
return
|