作者 陈志颖

fix:订单、退货单导入必填项修改

@@ -406,8 +406,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -406,8 +406,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
406 v := reflect.ValueOf(dividendsOrder) 406 v := reflect.ValueOf(dividendsOrder)
407 for k := 0; k < t.NumField(); k++ { 407 for k := 0; k < t.NumField(); k++ {
408 //fmt.Println("name:", fmt.Sprintf("%+v", t.Field(k).Name), ", value:", fmt.Sprintf("%v", v.Field(k).Interface()), ", yaml:", t.Field(k).Tag.Get("yaml")) 408 //fmt.Println("name:", fmt.Sprintf("%+v", t.Field(k).Name), ", value:", fmt.Sprintf("%v", v.Field(k).Interface()), ", yaml:", t.Field(k).Tag.Get("yaml"))
409 - fmt.Println("name:", fmt.Sprintf("%+v", t.Field(k).Name), ", value:", fmt.Sprintf("%v", v.Field(k).Interface()))  
410 - if t.Field(k).Name != "RegionName" && t.Field(k).Name != "Expense" { 409 + //fmt.Println("name:", fmt.Sprintf("%+v", t.Field(k).Name), ", value:", fmt.Sprintf("%v", v.Field(k).Interface()))
  410 + if t.Field(k).Name != "Expense" {
411 if v.Field(k).Interface() == "" { 411 if v.Field(k).Interface() == "" {
412 col := strconv.Itoa(k + 1) 412 col := strconv.Itoa(k + 1)
413 nullCell = append(nullCell, col) 413 nullCell = append(nullCell, col)
@@ -445,14 +445,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -445,14 +445,14 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
445 t := reflect.TypeOf(dividendsReturnedOrder) 445 t := reflect.TypeOf(dividendsReturnedOrder)
446 v := reflect.ValueOf(dividendsReturnedOrder) 446 v := reflect.ValueOf(dividendsReturnedOrder)
447 for k := 0; k < t.NumField(); k++ { 447 for k := 0; k < t.NumField(); k++ {
448 - fmt.Println("name:", fmt.Sprintf("%+v", t.Field(k).Name), ", value:", fmt.Sprintf("%v", v.Field(k).Interface()))  
449 - if t.Field(k).Name != "RegionName" {  
450 - if v.Field(k).Interface() == "" {  
451 - col := strconv.Itoa(k + 1)  
452 - nullCell = append(nullCell, col)  
453 - nullFlag = true  
454 - } 448 + //fmt.Println("name:", fmt.Sprintf("%+v", t.Field(k).Name), ", value:", fmt.Sprintf("%v", v.Field(k).Interface()))
  449 + //if t.Field(k).Name != "RegionName" {
  450 + if v.Field(k).Interface() == "" {
  451 + col := strconv.Itoa(k + 1)
  452 + nullCell = append(nullCell, col)
  453 + nullFlag = true
455 } 454 }
  455 + //}
456 } 456 }
457 if nullFlag { 457 if nullFlag {
458 myRow := &domain.FailReturnedInfo{ 458 myRow := &domain.FailReturnedInfo{