allied-creation / allied-creation-cooperation · 提交

转到一个项目

作者 陈志颖
提交 cb9d18f27846eaabae26572dd52a44e796a169a9 1 个父辈 ce969798

fix:共创申请审核字段缺失

内嵌 并排对比
正在显示 10 个修改的文件 包含 365 行增加 和 155 行删除
@@ -202,6 +202,7 @@ func (cooperationApplicationService *CooperationApplicationService) ApprovalCoop @@ -202,6 +202,7 @@ func (cooperationApplicationService *CooperationApplicationService) ApprovalCoop
202 } 202 }
203 203
204 cooperationApplication.CooperationApplicationVerifier = verifier 204 cooperationApplication.CooperationApplicationVerifier = verifier
  205 + cooperationApplication.CooperationApplicationVerifyTime = time.Now()
205 206
206 if err := cooperationApplication.Update(tool_funs.SimpleStructToMap(approvalCooperationApplicationCommand)); err != nil { 207 if err := cooperationApplication.Update(tool_funs.SimpleStructToMap(approvalCooperationApplicationCommand)); err != nil {
207 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error()) 208 return nil, application.ThrowError(application.BUSINESS_ERROR, err.Error())
@@ -279,6 +280,7 @@ func (cooperationApplicationService *CooperationApplicationService) BatchApprova @@ -279,6 +280,7 @@ func (cooperationApplicationService *CooperationApplicationService) BatchApprova
279 cooperationApplications[i].CooperationApplicationStatus = 3 280 cooperationApplications[i].CooperationApplicationStatus = 3
280 } 281 }
281 cooperationApplications[i].CooperationApplicationVerifier = verifier 282 cooperationApplications[i].CooperationApplicationVerifier = verifier
  283 + cooperationApplications[i].CooperationApplicationVerifyTime = time.Now()
282 } 284 }
283 cooperationApplicationsApproved, err := cooperationApplicationRepository.UpdateMany(cooperationApplications) 285 cooperationApplicationsApproved, err := cooperationApplicationRepository.UpdateMany(cooperationApplications)
284 if err != nil { 286 if err != nil {
@@ -311,6 +313,7 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr @@ -311,6 +313,7 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr
311 defer func() { 313 defer func() {
312 _ = transactionContext.RollbackTransaction() 314 _ = transactionContext.RollbackTransaction()
313 }() 315 }()
  316 +
314 // 共创申请仓储初始化 317 // 共创申请仓储初始化
315 var cooperationApplicationRepository domain.CooperationApplicationRepository 318 var cooperationApplicationRepository domain.CooperationApplicationRepository
316 if value, err := factory.CreateCooperationApplicationRepository(map[string]interface{}{ 319 if value, err := factory.CreateCooperationApplicationRepository(map[string]interface{}{
@@ -320,6 +323,23 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr @@ -320,6 +323,23 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr
320 } else { 323 } else {
321 cooperationApplicationRepository = value 324 cooperationApplicationRepository = value
322 } 325 }
  326 +
  327 + // 用户REST服务初始化
  328 + var userService service.UserService
  329 + if value, err := factory.CreateUserService(map[string]interface{}{}); err != nil {
  330 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, err.Error())
  331 + } else {
  332 + userService = value
  333 + }
  334 +
  335 + // 获取审核人
  336 + var verifier *domain.User
  337 + if data, err := userService.UserFrom(oneClickApprovalCooperationApplicationCommand.CompanyId, oneClickApprovalCooperationApplicationCommand.OrgId, oneClickApprovalCooperationApplicationCommand.UserId); err != nil {
  338 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "获取申请人失败")
  339 + } else {
  340 + verifier = data
  341 + }
  342 +
323 // 查询共创申请 343 // 查询共创申请
324 oneClickApprovalCooperationApplicationCommand.CooperationApplicationStatus = 1 // 待审核 344 oneClickApprovalCooperationApplicationCommand.CooperationApplicationStatus = 1 // 待审核
325 if count, cooperationApplications, err := cooperationApplicationRepository.Find(tool_funs.SimpleStructToMap(oneClickApprovalCooperationApplicationCommand)); err != nil { 345 if count, cooperationApplications, err := cooperationApplicationRepository.Find(tool_funs.SimpleStructToMap(oneClickApprovalCooperationApplicationCommand)); err != nil {
@@ -332,7 +352,9 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr @@ -332,7 +352,9 @@ func (cooperationApplicationService *CooperationApplicationService) OneClickAppr
332 } else if oneClickApprovalCooperationApplicationCommand.Action == 2 { 352 } else if oneClickApprovalCooperationApplicationCommand.Action == 2 {
333 cooperationApplications[i].CooperationApplicationStatus = 3 353 cooperationApplications[i].CooperationApplicationStatus = 3
334 } 354 }
335 - cooperationApplications[i].CooperationApplicationDescription = oneClickApprovalCooperationApplicationCommand.CooperationApplicationVerifyDescription 355 + cooperationApplications[i].CooperationApplicationVerifyDescription = oneClickApprovalCooperationApplicationCommand.CooperationApplicationVerifyDescription
  356 + cooperationApplications[i].CooperationApplicationVerifier = verifier
  357 + cooperationApplications[i].CooperationApplicationVerifyTime = time.Now()
336 } 358 }
337 cooperationApplicationsApproved, err := cooperationApplicationRepository.UpdateMany(cooperationApplications) 359 cooperationApplicationsApproved, err := cooperationApplicationRepository.UpdateMany(cooperationApplications)
338 if err != nil { 360 if err != nil {
@@ -279,7 +279,7 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -279,7 +279,7 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
279 279
280 // 返回信息表头定义 280 // 返回信息表头定义
281 var tableHeader = map[string]interface{}{ 281 var tableHeader = map[string]interface{}{
282 - "failReason": "错误详情", 282 + "failReason": "失败原因",
283 "originalOrderNum": "来源单号", 283 "originalOrderNum": "来源单号",
284 "dividendsCustomerName": "客户名称", 284 "dividendsCustomerName": "客户名称",
285 "orderGoodName": "产品名称", 285 "orderGoodName": "产品名称",
@@ -308,7 +308,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -308,7 +308,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
308 for i, dividendsOrder := range importDividendsOrderCommand.DividendsOrderData { 308 for i, dividendsOrder := range importDividendsOrderCommand.DividendsOrderData {
309 rowCnt++ 309 rowCnt++
310 nullCell := make([]interface{}, 0) 310 nullCell := make([]interface{}, 0)
311 - var myRow []string 311 + //var myRow []string
  312 + var myRow []interface{}
312 t := reflect.TypeOf(dividendsOrder) 313 t := reflect.TypeOf(dividendsOrder)
313 v := reflect.ValueOf(dividendsOrder) 314 v := reflect.ValueOf(dividendsOrder)
314 for k := 0; k < t.NumField(); k++ { 315 for k := 0; k < t.NumField(); k++ {
@@ -324,9 +325,21 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -324,9 +325,21 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
324 if nullFlag { 325 if nullFlag {
325 s := strconv.Itoa(i + 1) 326 s := strconv.Itoa(i + 1)
326 b := strings.Replace(strings.Trim(fmt.Sprint(nullCell), "[]"), " ", ",", -1) 327 b := strings.Replace(strings.Trim(fmt.Sprint(nullCell), "[]"), " ", ",", -1)
327 - myRow = append(myRow, "第"+s+"行的第"+b+"列必填项为空") // 错误信息  
328 - myRow = append(myRow, s) // 行号  
329 - myRow = append(myRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 328 + //myRow = append(myRow, "第"+s+"行的第"+b+"列必填项为空") // 错误信息
  329 + //myRow = append(myRow, s) // 行号
  330 + //myRow = append(myRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  331 + myRow = append(myRow, map[string]interface{}{
  332 + "failReason": "第" + s + "行第" + b + "列订单日期格式错误，请输入正确的订单日期",
  333 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  334 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  335 + "orderGoodName": dividendsOrder.OrderGoodName,
  336 + "orderTime": dividendsOrder.OrderTime,
  337 + "regionName": dividendsOrder.RegionName,
  338 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  339 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  340 + "expense": dividendsOrder.Expense,
  341 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  342 + })
330 nullCellError = append(nullCellError, myRow) 343 nullCellError = append(nullCellError, myRow)
331 nullFlag = false 344 nullFlag = false
332 } 345 }
@@ -346,23 +359,36 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -346,23 +359,36 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
346 // 单元格类型校验 359 // 单元格类型校验
347 typeError := make([]interface{}, 0) 360 typeError := make([]interface{}, 0)
348 for i, dividendsOrder := range importDividendsOrderCommand.DividendsOrderData { // 行 361 for i, dividendsOrder := range importDividendsOrderCommand.DividendsOrderData { // 行
349 - var myRow []string 362 + var myRow []interface{}
  363 + //var myRow []string
350 t := reflect.TypeOf(dividendsOrder) 364 t := reflect.TypeOf(dividendsOrder)
351 v := reflect.ValueOf(dividendsOrder) 365 v := reflect.ValueOf(dividendsOrder)
352 for k := 0; k < t.NumField(); k++ { // 列 366 for k := 0; k < t.NumField(); k++ { // 列
353 r := strconv.Itoa(i + 1) 367 r := strconv.Itoa(i + 1)
354 col := strconv.Itoa(k + 1) 368 col := strconv.Itoa(k + 1)
355 -  
356 switch k { 369 switch k {
357 case 3: // 订单日期校验 370 case 3: // 订单日期校验
358 { 371 {
359 regexpStr := `(\d{4})/(\d{2})/(\d{2})` 372 regexpStr := `(\d{4})/(\d{2})/(\d{2})`
360 ok := regexp.MustCompile(regexpStr).MatchString(fmt.Sprintf("%v", v.Field(k).Interface())) 373 ok := regexp.MustCompile(regexpStr).MatchString(fmt.Sprintf("%v", v.Field(k).Interface()))
361 if !ok { 374 if !ok {
362 - var tmpRow []string  
363 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列订单日期格式错误，请输入正确的订单日期") // 错误信息  
364 - tmpRow = append(tmpRow, r) // 行号  
365 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 375 + //var tmpRow []string
  376 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列订单日期格式错误，请输入正确的订单日期") // 错误信息
  377 + //tmpRow = append(tmpRow, r) // 行号
  378 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  379 + var tmpRow []interface{}
  380 + tmpRow = append(tmpRow, map[string]interface{}{
  381 + "failReason": "第" + r + "行第" + col + "列订单日期格式错误，请输入正确的订单日期",
  382 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  383 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  384 + "orderGoodName": dividendsOrder.OrderGoodName,
  385 + "orderTime": dividendsOrder.OrderTime,
  386 + "regionName": dividendsOrder.RegionName,
  387 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  388 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  389 + "expense": dividendsOrder.Expense,
  390 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  391 + })
366 myRow = tmpRow 392 myRow = tmpRow
367 } 393 }
368 } 394 }
@@ -371,18 +397,44 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -371,18 +397,44 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
371 //参数类型转换 397 //参数类型转换
372 orderGoodQuantity, err := strconv.ParseInt(fmt.Sprintf("%v", v.Field(k).Interface()), 10, 64) 398 orderGoodQuantity, err := strconv.ParseInt(fmt.Sprintf("%v", v.Field(k).Interface()), 10, 64)
373 if err != nil { 399 if err != nil {
374 - var tmpRow []string  
375 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品数量格式错误，产品数量必须整数") // 错误信息  
376 - tmpRow = append(tmpRow, r) // 行号  
377 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 400 + //var tmpRow []string
  401 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品数量格式错误，产品数量必须整数") // 错误信息
  402 + //tmpRow = append(tmpRow, r) // 行号
  403 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  404 + var tmpRow []interface{}
  405 + tmpRow = append(tmpRow, map[string]interface{}{
  406 + "failReason": "第" + r + "行第" + col + "列产品数量格式错误，产品数量必须整数",
  407 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  408 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  409 + "orderGoodName": dividendsOrder.OrderGoodName,
  410 + "orderTime": dividendsOrder.OrderTime,
  411 + "regionName": dividendsOrder.RegionName,
  412 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  413 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  414 + "expense": dividendsOrder.Expense,
  415 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  416 + })
378 myRow = tmpRow 417 myRow = tmpRow
379 } 418 }
380 // 正负判断 419 // 正负判断
381 if orderGoodQuantity < 0 { 420 if orderGoodQuantity < 0 {
382 - var tmpRow []string  
383 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品数量必须大于0，请重新填写") // 错误信息  
384 - tmpRow = append(tmpRow, r) // 行号  
385 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 421 + //var tmpRow []string
  422 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品数量必须大于0，请重新填写") // 错误信息
  423 + //tmpRow = append(tmpRow, r) // 行号
  424 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  425 + var tmpRow []interface{}
  426 + tmpRow = append(tmpRow, map[string]interface{}{
  427 + "failReason": "第" + r + "行第" + col + "列产品数量必须大于0，请重新填写",
  428 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  429 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  430 + "orderGoodName": dividendsOrder.OrderGoodName,
  431 + "orderTime": dividendsOrder.OrderTime,
  432 + "regionName": dividendsOrder.RegionName,
  433 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  434 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  435 + "expense": dividendsOrder.Expense,
  436 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  437 + })
386 myRow = tmpRow 438 myRow = tmpRow
387 } 439 }
388 } 440 }
@@ -391,19 +443,46 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -391,19 +443,46 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
391 // 参数类型转换 443 // 参数类型转换
392 univalent, typeErr := strconv.ParseFloat(fmt.Sprintf("%v", v.Field(k).Interface()), 64) 444 univalent, typeErr := strconv.ParseFloat(fmt.Sprintf("%v", v.Field(k).Interface()), 64)
393 if typeErr != nil { 445 if typeErr != nil {
394 - var tmpRow []string  
395 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品价格格式错误，产品价格必须为数字类型") // 错误信息  
396 - tmpRow = append(tmpRow, r) // 行号  
397 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 446 + //var tmpRow []string
  447 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品价格格式错误，产品价格必须为数字类型") // 错误信息
  448 + //tmpRow = append(tmpRow, r) // 行号
  449 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  450 + var tmpRow []interface{}
  451 + tmpRow = append(tmpRow, map[string]interface{}{
  452 + "failReason": "第" + r + "行第" + col + "列产品价格格式错误，产品价格必须为数字类型",
  453 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  454 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  455 + "orderGoodName": dividendsOrder.OrderGoodName,
  456 + "orderTime": dividendsOrder.OrderTime,
  457 + "regionName": dividendsOrder.RegionName,
  458 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  459 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  460 + "expense": dividendsOrder.Expense,
  461 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  462 + })
398 myRow = tmpRow 463 myRow = tmpRow
399 } 464 }
400 465
401 // 长度校验 466 // 长度校验
402 if univalent >= 1e16 { 467 if univalent >= 1e16 {
403 - var tmpRow []string  
404 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品价格超过最大限制，产品价格小数点前面不能超过十六位数字，并保留两位小数") // 错误信息  
405 - tmpRow = append(tmpRow, r) // 行号  
406 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 468 + //var tmpRow []string
  469 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列产品价格超过最大限制，产品价格小数点前面不能超过十六位数字，并保留两位小数") // 错误信息
  470 + //tmpRow = append(tmpRow, r) // 行号
  471 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface()))
  472 + var tmpRow []interface{}
  473 + tmpRow = append(tmpRow, map[string]interface{}{
  474 + "failReason": "第" + r + "行第" + col + "列产品价格超过最大限制，产品价格小数点前面不能超过十六位数字，并保留两位小数",
  475 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  476 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  477 + "orderGoodName": dividendsOrder.OrderGoodName,
  478 + "orderTime": dividendsOrder.OrderTime,
  479 + "regionName": dividendsOrder.RegionName,
  480 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  481 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  482 + "expense": dividendsOrder.Expense,
  483 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  484 + })
  485 + // 错误行数据
407 myRow = tmpRow 486 myRow = tmpRow
408 } 487 }
409 } 488 }
@@ -413,19 +492,45 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -413,19 +492,45 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
413 // 参数类型转换 492 // 参数类型转换
414 univalent, typeErr := strconv.ParseFloat(fmt.Sprintf("%v", v.Field(k).Interface()), 64) 493 univalent, typeErr := strconv.ParseFloat(fmt.Sprintf("%v", v.Field(k).Interface()), 64)
415 if typeErr != nil { 494 if typeErr != nil {
416 - var tmpRow []string  
417 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列费用格式错误，费用必须为数字类型") // 错误信息  
418 - tmpRow = append(tmpRow, r) // 行号  
419 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 495 + //var tmpRow []string
  496 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列费用格式错误，费用必须为数字类型") // 错误信息
  497 + //tmpRow = append(tmpRow, r) // 行号
  498 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  499 + var tmpRow []interface{}
  500 + tmpRow = append(tmpRow, map[string]interface{}{
  501 + "failReason": "第" + r + "行第" + col + "列费用格式错误，费用必须为数字类型",
  502 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  503 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  504 + "orderGoodName": dividendsOrder.OrderGoodName,
  505 + "orderTime": dividendsOrder.OrderTime,
  506 + "regionName": dividendsOrder.RegionName,
  507 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  508 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  509 + "expense": dividendsOrder.Expense,
  510 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  511 + })
420 myRow = tmpRow 512 myRow = tmpRow
421 } 513 }
422 514
423 // 长度校验 515 // 长度校验
424 if univalent >= 1e16 { 516 if univalent >= 1e16 {
425 - var tmpRow []string  
426 - tmpRow = append(tmpRow, "第"+r+"行第"+col+"列费用超过最大限制，费用小数点前面不能超过十六位数字，并保留两位小数") // 错误信息  
427 - tmpRow = append(tmpRow, r) // 行号  
428 - tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据 517 + //var tmpRow []string
  518 + //tmpRow = append(tmpRow, "第"+r+"行第"+col+"列费用超过最大限制，费用小数点前面不能超过十六位数字，并保留两位小数") // 错误信息
  519 + //tmpRow = append(tmpRow, r) // 行号
  520 + //tmpRow = append(tmpRow, fmt.Sprintf("%v", v.Interface())) // 错误行数据
  521 + var tmpRow []interface{}
  522 + tmpRow = append(tmpRow, map[string]interface{}{
  523 + "failReason": "第" + r + "行第" + col + "列费用超过最大限制，费用小数点前面不能超过十六位数字，并保留两位小数",
  524 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  525 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  526 + "orderGoodName": dividendsOrder.OrderGoodName,
  527 + "orderTime": dividendsOrder.OrderTime,
  528 + "regionName": dividendsOrder.RegionName,
  529 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  530 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  531 + "expense": dividendsOrder.Expense,
  532 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  533 + })
429 myRow = tmpRow 534 myRow = tmpRow
430 } 535 }
431 } 536 }
@@ -456,20 +561,27 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -456,20 +561,27 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
456 hashValue := md5.Sum([]byte(dividendsOrder.OriginalOrderNum)) 561 hashValue := md5.Sum([]byte(dividendsOrder.OriginalOrderNum))
457 hashString := hex.EncodeToString(hashValue[:]) 562 hashString := hex.EncodeToString(hashValue[:])
458 if _, ok := dividendsOrderCommands[hashString]; !ok { 563 if _, ok := dividendsOrderCommands[hashString]; !ok {
459 - // 来源单号  
460 - dividendsOrderCommands[hashString].DividendsOriginalOrderNum = dividendsOrder.OriginalOrderNum  
461 -  
462 - // 客户名称  
463 - dividendsOrderCommands[hashString].CustomerName = dividendsOrder.DividendsCustomerName  
464 -  
465 // 订单日期时间格式转换 564 // 订单日期时间格式转换
466 timeValue, err := time.ParseInLocation("2006/01/02", dividendsOrder.OrderTime, time.Local) 565 timeValue, err := time.ParseInLocation("2006/01/02", dividendsOrder.OrderTime, time.Local)
467 if err != nil { 566 if err != nil {
468 - var tmpRow []string  
469 - tmpRow = append(tmpRow, "无效的订单日期") // 错误信息 567 + //var tmpRow []string
  568 + //tmpRow = append(tmpRow, "无效的订单日期") // 错误信息
470 s := strconv.Itoa(i + 1) 569 s := strconv.Itoa(i + 1)
471 - tmpRow = append(tmpRow, s) // 行号  
472 - //tmpRow = append(tmpRow, dividendsOrder.OriginalOrderNum) // TODO 错误行数据 570 + //tmpRow = append(tmpRow, s) // 行号
  571 + //tmpRow = append(tmpRow, dividendsOrder.OriginalOrderNum)
  572 + var tmpRow []interface{}
  573 + tmpRow = append(tmpRow, map[string]interface{}{
  574 + "failReason": "第" + s + "行无效的订单日期",
  575 + "originalOrderNum": dividendsOrder.OriginalOrderNum,
  576 + "dividendsCustomerName": dividendsOrder.DividendsCustomerName,
  577 + "orderGoodName": dividendsOrder.OrderGoodName,
  578 + "orderTime": dividendsOrder.OrderTime,
  579 + "regionName": dividendsOrder.RegionName,
  580 + "orderGoodQuantity": dividendsOrder.OrderGoodQuantity,
  581 + "orderGoodPrice": dividendsOrder.OrderGoodPrice,
  582 + "expense": dividendsOrder.Expense,
  583 + "cooperationContractNumber": dividendsOrder.CooperationContractNumber,
  584 + })
473 aggregateErrorList = append(aggregateErrorList, tmpRow) 585 aggregateErrorList = append(aggregateErrorList, tmpRow)
474 break 586 break
475 } 587 }
@@ -592,20 +704,46 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -592,20 +704,46 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
592 for _, errorData := range errorDataList { 704 for _, errorData := range errorDataList {
593 if len(errorData.GoodLine) == 0 { // 订单错误 705 if len(errorData.GoodLine) == 0 { // 订单错误
594 for _, line := range errorData.LineNumbers { 706 for _, line := range errorData.LineNumbers {
595 - var tmpRow []string  
596 - tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息 707 + //var tmpRow []string5
  708 + //tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息
597 s := strconv.Itoa(line + 1) 709 s := strconv.Itoa(line + 1)
598 - tmpRow = append(tmpRow, s) // 行号 710 + //tmpRow = append(tmpRow, s) // 行号
599 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据 711 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据
  712 + var tmpRow []interface{}
  713 + tmpRow = append(tmpRow, map[string]interface{}{
  714 + "failReason": "第" + s + "行数据校验错误：" + errorData.Error.Error(),
  715 + "originalOrderNum": importDividendsOrderCommand.DividendsOrderData[line].OriginalOrderNum,
  716 + "dividendsCustomerName": importDividendsOrderCommand.DividendsOrderData[line].DividendsCustomerName,
  717 + "orderGoodName": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodName,
  718 + "orderTime": importDividendsOrderCommand.DividendsOrderData[line].OrderTime,
  719 + "regionName": importDividendsOrderCommand.DividendsOrderData[line].RegionName,
  720 + "orderGoodQuantity": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodQuantity,
  721 + "orderGoodPrice": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodPrice,
  722 + "expense": importDividendsOrderCommand.DividendsOrderData[line].Expense,
  723 + "cooperationContractNumber": importDividendsOrderCommand.DividendsOrderData[line].CooperationContractNumber,
  724 + })
600 failureDataList = append(failureDataList, tmpRow) 725 failureDataList = append(failureDataList, tmpRow)
601 } 726 }
602 } else if len(errorData.GoodLine) > 0 { // 订单产品错误 727 } else if len(errorData.GoodLine) > 0 { // 订单产品错误
603 for line := range errorData.GoodLine { 728 for line := range errorData.GoodLine {
604 - var tmpRow []string  
605 - tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息 729 + //var tmpRow []string
  730 + //tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息
606 s := strconv.Itoa(line + 1) 731 s := strconv.Itoa(line + 1)
607 - tmpRow = append(tmpRow, s) // 行号 732 + //tmpRow = append(tmpRow, s) // 行号
608 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据 733 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据
  734 + var tmpRow []interface{}
  735 + tmpRow = append(tmpRow, map[string]interface{}{
  736 + "failReason": "第" + s + "行订单产品信息错误：" + errorData.Error.Error(),
  737 + "originalOrderNum": importDividendsOrderCommand.DividendsOrderData[line].OriginalOrderNum,
  738 + "dividendsCustomerName": importDividendsOrderCommand.DividendsOrderData[line].DividendsCustomerName,
  739 + "orderGoodName": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodName,
  740 + "orderTime": importDividendsOrderCommand.DividendsOrderData[line].OrderTime,
  741 + "regionName": importDividendsOrderCommand.DividendsOrderData[line].RegionName,
  742 + "orderGoodQuantity": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodQuantity,
  743 + "orderGoodPrice": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodPrice,
  744 + "expense": importDividendsOrderCommand.DividendsOrderData[line].Expense,
  745 + "cooperationContractNumber": importDividendsOrderCommand.DividendsOrderData[line].CooperationContractNumber,
  746 + })
609 failureDataList = append(failureDataList, tmpRow) 747 failureDataList = append(failureDataList, tmpRow)
610 } 748 }
611 } 749 }
@@ -621,7 +759,6 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -621,7 +759,6 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
621 759
622 // 批量导入创建分红订单 760 // 批量导入创建分红订单
623 for _, dividendsOrder := range createDividendsOrderCommands { 761 for _, dividendsOrder := range createDividendsOrderCommands {
624 -  
625 // 生成分红订单号 762 // 生成分红订单号
626 dividendsOrderNumber, err := dividendsOrderDao.GenerateDividendsOrderNumber() 763 dividendsOrderNumber, err := dividendsOrderDao.GenerateDividendsOrderNumber()
627 if err != nil { 764 if err != nil {
@@ -641,6 +778,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -641,6 +778,8 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
641 return nil, application.ThrowError(application.TRANSACTION_ERROR, "新增分红订单异常") 778 return nil, application.ThrowError(application.TRANSACTION_ERROR, "新增分红订单异常")
642 } 779 }
643 780
  781 + // 校验共创合约是否合法
  782 +
644 // 新增订单产品 783 // 新增订单产品
645 var orderGoods []*domain.OrderGood 784 var orderGoods []*domain.OrderGood
646 var dividendsOrderAmount float64 785 var dividendsOrderAmount float64
@@ -668,7 +807,7 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -668,7 +807,7 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
668 // 订单时间转换 807 // 订单时间转换
669 orderTimeInt, err := strconv.ParseInt(dividendsOrder.OrderTime, 10, 64) 808 orderTimeInt, err := strconv.ParseInt(dividendsOrder.OrderTime, 10, 64)
670 if err != nil { 809 if err != nil {
671 - return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "订单时间错误") 810 + return nil, application.ThrowError(application.INTERNAL_SERVER_ERROR, "订单日期转换错误")
672 } 811 }
673 orderTime := utils.TransformTimestampToTime(orderTimeInt) 812 orderTime := utils.TransformTimestampToTime(orderTimeInt)
674 813
@@ -723,20 +862,46 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD @@ -723,20 +862,46 @@ func (dividendsOrderService *DividendsOrderService) ImportDividendsOrder(importD
723 for _, errorData := range errorDataList { 862 for _, errorData := range errorDataList {
724 if len(errorData.GoodLine) == 0 { // 订单错误 863 if len(errorData.GoodLine) == 0 { // 订单错误
725 for _, line := range errorData.LineNumbers { 864 for _, line := range errorData.LineNumbers {
726 - var tmpRow []string  
727 - tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息 865 + //var tmpRow []string
  866 + //tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息
728 s := strconv.Itoa(line + 1) 867 s := strconv.Itoa(line + 1)
729 - tmpRow = append(tmpRow, s) // 行号 868 + //tmpRow = append(tmpRow, s) // 行号
730 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据 869 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据
  870 + var tmpRow []interface{}
  871 + tmpRow = append(tmpRow, map[string]interface{}{
  872 + "failReason": "第" + s + "行订单数据新增错误：" + errorData.Error.Error(),
  873 + "originalOrderNum": importDividendsOrderCommand.DividendsOrderData[line].OriginalOrderNum,
  874 + "dividendsCustomerName": importDividendsOrderCommand.DividendsOrderData[line].DividendsCustomerName,
  875 + "orderGoodName": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodName,
  876 + "orderTime": importDividendsOrderCommand.DividendsOrderData[line].OrderTime,
  877 + "regionName": importDividendsOrderCommand.DividendsOrderData[line].RegionName,
  878 + "orderGoodQuantity": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodQuantity,
  879 + "orderGoodPrice": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodPrice,
  880 + "expense": importDividendsOrderCommand.DividendsOrderData[line].Expense,
  881 + "cooperationContractNumber": importDividendsOrderCommand.DividendsOrderData[line].CooperationContractNumber,
  882 + })
731 failureDataList = append(failureDataList, tmpRow) 883 failureDataList = append(failureDataList, tmpRow)
732 } 884 }
733 } else if len(errorData.GoodLine) > 0 { // 订单产品错误 885 } else if len(errorData.GoodLine) > 0 { // 订单产品错误
734 for line := range errorData.GoodLine { 886 for line := range errorData.GoodLine {
735 - var tmpRow []string  
736 - tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息 887 + //var tmpRow []string
  888 + //tmpRow = append(tmpRow, errorData.Error.Error()) // 错误信息
737 s := strconv.Itoa(line + 1) 889 s := strconv.Itoa(line + 1)
738 - tmpRow = append(tmpRow, s) // 行号 890 + //tmpRow = append(tmpRow, s) // 行号
739 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据 891 //tmpRow = append(tmpRow, importDividendsOrderCommand.DividendsOrderData[line]...) // 错误行数据
  892 + var tmpRow []interface{}
  893 + tmpRow = append(tmpRow, map[string]interface{}{
  894 + "failReason": "第" + s + "行订单数据新增错误：" + errorData.Error.Error(),
  895 + "originalOrderNum": importDividendsOrderCommand.DividendsOrderData[line].OriginalOrderNum,
  896 + "dividendsCustomerName": importDividendsOrderCommand.DividendsOrderData[line].DividendsCustomerName,
  897 + "orderGoodName": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodName,
  898 + "orderTime": importDividendsOrderCommand.DividendsOrderData[line].OrderTime,
  899 + "regionName": importDividendsOrderCommand.DividendsOrderData[line].RegionName,
  900 + "orderGoodQuantity": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodQuantity,
  901 + "orderGoodPrice": importDividendsOrderCommand.DividendsOrderData[line].OrderGoodPrice,
  902 + "expense": importDividendsOrderCommand.DividendsOrderData[line].Expense,
  903 + "cooperationContractNumber": importDividendsOrderCommand.DividendsOrderData[line].CooperationContractNumber,
  904 + })
740 failureDataList = append(failureDataList, tmpRow) 905 failureDataList = append(failureDataList, tmpRow)
741 } 906 }
742 } 907 }
@@ -9,10 +9,10 @@ import ( @@ -9,10 +9,10 @@ import (
9 9
10 type ( 10 type (
11 ImportDividendsReturnedOrderData struct { 11 ImportDividendsReturnedOrderData struct {
12 - //退货客户名称  
13 - DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`  
14 //来源单号，源单号，订单号 12 //来源单号，源单号，订单号
15 OriginalOrderNum string `json:"originalOrderNum"` 13 OriginalOrderNum string `json:"originalOrderNum"`
  14 + //退货客户名称
  15 + DividendsReturnedCustomerName string `json:"dividendsReturnedCustomerName"`
16 //订单产品名称 16 //订单产品名称
17 OrderGoodName string `json:"orderGoodName"` 17 OrderGoodName string `json:"orderGoodName"`
18 //退货日期 18 //退货日期
@@ -26,7 +26,6 @@ type ListDividendsReturnedOrderQuery struct { @@ -26,7 +26,6 @@ type ListDividendsReturnedOrderQuery struct {
26 } 26 }
27 27
28 func (listDividendsReturnedOrderQuery *ListDividendsReturnedOrderQuery) Valid(validation *validation.Validation) { 28 func (listDividendsReturnedOrderQuery *ListDividendsReturnedOrderQuery) Valid(validation *validation.Validation) {
29 - //validation.SetError("CustomValid", "未实现的自定义认证")  
30 } 29 }
31 30
32 func (listDividendsReturnedOrderQuery *ListDividendsReturnedOrderQuery) ValidateQuery() error { 31 func (listDividendsReturnedOrderQuery *ListDividendsReturnedOrderQuery) ValidateQuery() error {
@@ -317,7 +317,18 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -317,7 +317,18 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
317 } 317 }
318 318
319 // 返回信息表头定义 319 // 返回信息表头定义
320 - var tableHeader = []string{"错误详情", "行号", "来源单号", "客户名称", "产品名称", "退货日期", "订单日期", "订单区域", "退货数量", "退货价格", "项目合约编号"} 320 + var tableHeader = map[string]interface{}{
  321 + "failReason": "错误详情",
  322 + "originalOrderNum": "来源单号",
  323 + "dividendsReturnedCustomerName": "客户名称",
  324 + "orderGoodName": "产品名称",
  325 + "dividendsReturnedDate": "退货日期",
  326 + "regionName": "订单日期",
  327 + "orderGoodPrice": "订单区域",
  328 + "orderGoodQuantity": "退货数量",
  329 + "cooperationContractNumber": "退货价格",
  330 + "orderTime": "项目合约编号",
  331 + }
321 332
322 // 空文件校验 333 // 空文件校验
323 if len(importDividendsReturnedOrderCommand.DividendsReturnedOrderData) == 0 { 334 if len(importDividendsReturnedOrderCommand.DividendsReturnedOrderData) == 0 {
@@ -365,8 +376,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -365,8 +376,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
365 return map[string]interface{}{ 376 return map[string]interface{}{
366 "successCount": 0, 377 "successCount": 0,
367 "fail": map[string]interface{}{ 378 "fail": map[string]interface{}{
368 - "tableHeader": tableHeader,  
369 - "tableData": nullCellError, 379 + "header": tableHeader,
  380 + "body": nullCellError,
370 }, 381 },
371 }, nil 382 }, nil
372 } 383 }
@@ -459,8 +470,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -459,8 +470,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
459 return map[string]interface{}{ 470 return map[string]interface{}{
460 "successCount": 0, 471 "successCount": 0,
461 "fail": map[string]interface{}{ 472 "fail": map[string]interface{}{
462 - "tableHeader": tableHeader,  
463 - "tableData": typeError, 473 + "header": tableHeader,
  474 + "body": typeError,
464 }, 475 },
465 }, nil 476 }, nil
466 } 477 }
@@ -559,8 +570,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -559,8 +570,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
559 return map[string]interface{}{ 570 return map[string]interface{}{
560 "successCount": 0, 571 "successCount": 0,
561 "fail": map[string]interface{}{ 572 "fail": map[string]interface{}{
562 - "tableHeader": tableHeader,  
563 - "tableData": aggregateErrorList, 573 + "header": tableHeader,
  574 + "body": aggregateErrorList,
564 }, 575 },
565 }, nil 576 }, nil
566 } 577 }
@@ -622,8 +633,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -622,8 +633,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
622 return map[string]interface{}{ 633 return map[string]interface{}{
623 "successCount": successDataCount, 634 "successCount": successDataCount,
624 "fail": map[string]interface{}{ 635 "fail": map[string]interface{}{
625 - "tableHeader": tableHeader,  
626 - "tableData": failureDataList, 636 + "header": tableHeader,
  637 + "body": failureDataList,
627 }, 638 },
628 }, nil 639 }, nil
629 } 640 }
@@ -762,8 +773,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide @@ -762,8 +773,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) ImportDivide
762 return map[string]interface{}{ 773 return map[string]interface{}{
763 "successCount": successDataCount, 774 "successCount": successDataCount,
764 "fail": map[string]interface{}{ 775 "fail": map[string]interface{}{
765 - "tableHeader": tableHeader,  
766 - "tableData": failureDataList, 776 + "header": tableHeader,
  777 + "body": failureDataList,
767 }, 778 },
768 }, nil 779 }, nil
769 } 780 }
@@ -259,23 +259,25 @@ func (repository *CooperationApplicationRepository) Find(queryOptions map[string @@ -259,23 +259,25 @@ func (repository *CooperationApplicationRepository) Find(queryOptions map[string
259 if count, err := query.SelectAndCount(); err != nil { 259 if count, err := query.SelectAndCount(); err != nil {
260 return 0, cooperationApplications, err 260 return 0, cooperationApplications, err
261 } else { 261 } else {
262 - for _, cooperationApplicationModel := range cooperationApplicationModels {  
263 - // 获取共创项目  
264 - cooperationProjectModel := new(models.CooperationProject)  
265 - cooperationProjectQuery := tx.Model(cooperationProjectModel)  
266 - if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {  
267 - return 0, nil, err  
268 - }  
269 - // 获取共创模式  
270 - cooperationModeModel := new(models.CooperationMode)  
271 - cooperationModeQuery := tx.Model(cooperationModeModel)  
272 - if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationProjectModel.CooperationModeNumber).First(); err != nil {  
273 - return 0, nil, err  
274 - }  
275 - if cooperationApplication, err := transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel, cooperationModeModel); err != nil {  
276 - return 0, cooperationApplications, err  
277 - } else {  
278 - cooperationApplications = append(cooperationApplications, cooperationApplication) 262 + if count > 0 {
  263 + for _, cooperationApplicationModel := range cooperationApplicationModels {
  264 + // 获取共创项目
  265 + cooperationProjectModel := new(models.CooperationProject)
  266 + cooperationProjectQuery := tx.Model(cooperationProjectModel)
  267 + if err := cooperationProjectQuery.Where("cooperation_project_number = ?", cooperationApplicationModel.CooperationProjectNumber).First(); err != nil {
  268 + return 0, nil, err
  269 + }
  270 + // 获取共创模式
  271 + cooperationModeModel := new(models.CooperationMode)
  272 + cooperationModeQuery := tx.Model(cooperationModeModel)
  273 + if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationProjectModel.CooperationModeNumber).First(); err != nil {
  274 + return 0, nil, err
  275 + }
  276 + if cooperationApplication, err := transform.TransformToCooperationApplicationDomainModelFromPgModels(cooperationApplicationModel, cooperationProjectModel, cooperationModeModel); err != nil {
  277 + return 0, cooperationApplications, err
  278 + } else {
  279 + cooperationApplications = append(cooperationApplications, cooperationApplication)
  280 + }
279 } 281 }
280 } 282 }
281 return int64(count), cooperationApplications, nil 283 return int64(count), cooperationApplications, nil
@@ -1013,47 +1013,49 @@ func (repository *CooperationContractRepository) Find(queryOptions map[string]in @@ -1013,47 +1013,49 @@ func (repository *CooperationContractRepository) Find(queryOptions map[string]in
1013 if count, err := query.SelectAndCount(); err != nil { 1013 if count, err := query.SelectAndCount(); err != nil {
1014 return 0, cooperationContracts, err 1014 return 0, cooperationContracts, err
1015 } else { 1015 } else {
1016 - for _, cooperationContractModel := range cooperationContractModels {  
1017 - // 获取共创模式  
1018 - cooperationModeModel := new(models.CooperationMode)  
1019 - cooperationModeQuery := tx.Model(cooperationModeModel)  
1020 - if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationContractModel.CooperationModeNumber).First(); err != nil {  
1021 - return 0, nil, err  
1022 - }  
1023 - // 获取分红激励规则列表  
1024 - var dividendsIncentivesRuleModels []*models.DividendsIncentivesRule  
1025 - dividendsIncentivesRuleQuery := tx.Model(&dividendsIncentivesRuleModels)  
1026 - if err := dividendsIncentivesRuleQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {  
1027 - return 0, nil, err  
1028 - }  
1029 - // 获取金额激励规则列表  
1030 - var moneyIncentivesRuleModels []*models.MoneyIncentivesRule  
1031 - moneyIncentivesRuleQuery := tx.Model(&moneyIncentivesRuleModels)  
1032 - if err := moneyIncentivesRuleQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {  
1033 - return 0, nil, err  
1034 - }  
1035 - // 获取承接人列表  
1036 - var cooperationContractUndertakerModels []*models.CooperationContractUndertaker  
1037 - cooperationContractUndertakerQuery := tx.Model(&cooperationContractUndertakerModels)  
1038 - if err := cooperationContractUndertakerQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {  
1039 - return 0, nil, err  
1040 - }  
1041 - // 获取相关人列表  
1042 - var cooperationContractRelevantModels []*models.CooperationContractRelevant  
1043 - cooperationContractRelevantQuery := tx.Model(&cooperationContractRelevantModels)  
1044 - if err := cooperationContractRelevantQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {  
1045 - return 0, nil, err  
1046 - }  
1047 - if cooperationContract, err := transform.TransformToCooperationContractDomainModelFromPgModels(  
1048 - cooperationContractModel,  
1049 - cooperationModeModel,  
1050 - dividendsIncentivesRuleModels,  
1051 - moneyIncentivesRuleModels,  
1052 - cooperationContractRelevantModels,  
1053 - cooperationContractUndertakerModels); err != nil {  
1054 - return 0, cooperationContracts, err  
1055 - } else {  
1056 - cooperationContracts = append(cooperationContracts, cooperationContract) 1016 + if count > 0 {
  1017 + for _, cooperationContractModel := range cooperationContractModels {
  1018 + // 获取共创模式
  1019 + cooperationModeModel := new(models.CooperationMode)
  1020 + cooperationModeQuery := tx.Model(cooperationModeModel)
  1021 + if err := cooperationModeQuery.Where("cooperation_mode_number = ?", cooperationContractModel.CooperationModeNumber).First(); err != nil {
  1022 + return 0, nil, err
  1023 + }
  1024 + // 获取分红激励规则列表
  1025 + var dividendsIncentivesRuleModels []*models.DividendsIncentivesRule
  1026 + dividendsIncentivesRuleQuery := tx.Model(&dividendsIncentivesRuleModels)
  1027 + if err := dividendsIncentivesRuleQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {
  1028 + return 0, nil, err
  1029 + }
  1030 + // 获取金额激励规则列表
  1031 + var moneyIncentivesRuleModels []*models.MoneyIncentivesRule
  1032 + moneyIncentivesRuleQuery := tx.Model(&moneyIncentivesRuleModels)
  1033 + if err := moneyIncentivesRuleQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {
  1034 + return 0, nil, err
  1035 + }
  1036 + // 获取承接人列表
  1037 + var cooperationContractUndertakerModels []*models.CooperationContractUndertaker
  1038 + cooperationContractUndertakerQuery := tx.Model(&cooperationContractUndertakerModels)
  1039 + if err := cooperationContractUndertakerQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {
  1040 + return 0, nil, err
  1041 + }
  1042 + // 获取相关人列表
  1043 + var cooperationContractRelevantModels []*models.CooperationContractRelevant
  1044 + cooperationContractRelevantQuery := tx.Model(&cooperationContractRelevantModels)
  1045 + if err := cooperationContractRelevantQuery.Where("cooperation_contract_number = ?", cooperationContractModel.CooperationContractNumber).Select(); err != nil {
  1046 + return 0, nil, err
  1047 + }
  1048 + if cooperationContract, err := transform.TransformToCooperationContractDomainModelFromPgModels(
  1049 + cooperationContractModel,
  1050 + cooperationModeModel,
  1051 + dividendsIncentivesRuleModels,
  1052 + moneyIncentivesRuleModels,
  1053 + cooperationContractRelevantModels,
  1054 + cooperationContractUndertakerModels); err != nil {
  1055 + return 0, cooperationContracts, err
  1056 + } else {
  1057 + cooperationContracts = append(cooperationContracts, cooperationContract)
  1058 + }
1057 } 1059 }
1058 } 1060 }
1059 return int64(count), cooperationContracts, nil 1061 return int64(count), cooperationContracts, nil
@@ -25,6 +25,7 @@ func (repository *CooperationContractUndertakerRepository) nextIdentify() (int64 @@ -25,6 +25,7 @@ func (repository *CooperationContractUndertakerRepository) nextIdentify() (int64
25 id, err := IdWorker.NextId() 25 id, err := IdWorker.NextId()
26 return id, err 26 return id, err
27 } 27 }
  28 +
28 func (repository *CooperationContractUndertakerRepository) Save(cooperationContractUndertaker *domain.CooperationContractUndertaker) (*domain.CooperationContractUndertaker, error) { 29 func (repository *CooperationContractUndertakerRepository) Save(cooperationContractUndertaker *domain.CooperationContractUndertaker) (*domain.CooperationContractUndertaker, error) {
29 sqlBuildFields := []string{ 30 sqlBuildFields := []string{
30 "cooperation_contract_undertaker_id", 31 "cooperation_contract_undertaker_id",
@@ -150,6 +151,7 @@ func (repository *CooperationContractUndertakerRepository) Save(cooperationContr @@ -150,6 +151,7 @@ func (repository *CooperationContractUndertakerRepository) Save(cooperationContr
150 } 151 }
151 return cooperationContractUndertaker, nil 152 return cooperationContractUndertaker, nil
152 } 153 }
  154 +
153 func (repository *CooperationContractUndertakerRepository) Remove(cooperationContractUndertaker *domain.CooperationContractUndertaker) (*domain.CooperationContractUndertaker, error) { 155 func (repository *CooperationContractUndertakerRepository) Remove(cooperationContractUndertaker *domain.CooperationContractUndertaker) (*domain.CooperationContractUndertaker, error) {
154 tx := repository.transactionContext.PgTx 156 tx := repository.transactionContext.PgTx
155 cooperationContractUndertakerModel := new(models.CooperationContractUndertaker) 157 cooperationContractUndertakerModel := new(models.CooperationContractUndertaker)
@@ -159,6 +161,7 @@ func (repository *CooperationContractUndertakerRepository) Remove(cooperationCon @@ -159,6 +161,7 @@ func (repository *CooperationContractUndertakerRepository) Remove(cooperationCon
159 } 161 }
160 return cooperationContractUndertaker, nil 162 return cooperationContractUndertaker, nil
161 } 163 }
  164 +
162 func (repository *CooperationContractUndertakerRepository) FindOne(queryOptions map[string]interface{}) (*domain.CooperationContractUndertaker, error) { 165 func (repository *CooperationContractUndertakerRepository) FindOne(queryOptions map[string]interface{}) (*domain.CooperationContractUndertaker, error) {
163 tx := repository.transactionContext.PgTx 166 tx := repository.transactionContext.PgTx
164 cooperationContractUndertakerModel := new(models.CooperationContractUndertaker) 167 cooperationContractUndertakerModel := new(models.CooperationContractUndertaker)
@@ -177,6 +180,7 @@ func (repository *CooperationContractUndertakerRepository) FindOne(queryOptions @@ -177,6 +180,7 @@ func (repository *CooperationContractUndertakerRepository) FindOne(queryOptions
177 return transform.TransformToCooperationContractUndertakerDomainModelFromPgModels(cooperationContractUndertakerModel) 180 return transform.TransformToCooperationContractUndertakerDomainModelFromPgModels(cooperationContractUndertakerModel)
178 } 181 }
179 } 182 }
  183 +
180 func (repository *CooperationContractUndertakerRepository) Find(queryOptions map[string]interface{}) (int64, []*domain.CooperationContractUndertaker, error) { 184 func (repository *CooperationContractUndertakerRepository) Find(queryOptions map[string]interface{}) (int64, []*domain.CooperationContractUndertaker, error) {
181 tx := repository.transactionContext.PgTx 185 tx := repository.transactionContext.PgTx
182 var cooperationContractUndertakerModels []*models.CooperationContractUndertaker 186 var cooperationContractUndertakerModels []*models.CooperationContractUndertaker
@@ -216,6 +220,7 @@ func (repository *CooperationContractUndertakerRepository) Find(queryOptions map @@ -216,6 +220,7 @@ func (repository *CooperationContractUndertakerRepository) Find(queryOptions map
216 return int64(count), cooperationContractUndertakers, nil 220 return int64(count), cooperationContractUndertakers, nil
217 } 221 }
218 } 222 }
  223 +
219 func NewCooperationContractUndertakerRepository(transactionContext *pgTransaction.TransactionContext) (*CooperationContractUndertakerRepository, error) { 224 func NewCooperationContractUndertakerRepository(transactionContext *pgTransaction.TransactionContext) (*CooperationContractUndertakerRepository, error) {
220 if transactionContext == nil { 225 if transactionContext == nil {
221 return nil, fmt.Errorf("transactionContext参数不能为nil") 226 return nil, fmt.Errorf("transactionContext参数不能为nil")
@@ -428,18 +428,20 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa @@ -428,18 +428,20 @@ func (repository *DividendsOrderRepository) Find(queryOptions map[string]interfa
428 if count, err := query.SelectAndCount(); err != nil { 428 if count, err := query.SelectAndCount(); err != nil {
429 return 0, dividendsOrders, err 429 return 0, dividendsOrders, err
430 } else { 430 } else {
431 - for _, dividendsOrderModel := range dividendsOrderModels {  
432 - //获取订单产品  
433 - var orderGoodModels []*models.OrderGood  
434 - orderGoodModelQuery := tx.Model(&orderGoodModels)  
435 - if err := orderGoodModelQuery.Where("dividends_order_number = ?", dividendsOrderModel.DividendsOrderNumber).Select(); err != nil {  
436 - return 0, nil, err  
437 - }  
438 - // 聚合分红订单  
439 - if dividendsOrder, err := transform.TransformToDividendsOrderDomainModelFromPgModels(dividendsOrderModel, orderGoodModels); err != nil {  
440 - return 0, dividendsOrders, err  
441 - } else {  
442 - dividendsOrders = append(dividendsOrders, dividendsOrder) 431 + if count > 0 {
  432 + for _, dividendsOrderModel := range dividendsOrderModels {
  433 + //获取订单产品
  434 + var orderGoodModels []*models.OrderGood
  435 + orderGoodModelQuery := tx.Model(&orderGoodModels)
  436 + if err := orderGoodModelQuery.Where("dividends_order_number = ?", dividendsOrderModel.DividendsOrderNumber).Select(); err != nil {
  437 + return 0, nil, err
  438 + }
  439 + // 聚合分红订单
  440 + if dividendsOrder, err := transform.TransformToDividendsOrderDomainModelFromPgModels(dividendsOrderModel, orderGoodModels); err != nil {
  441 + return 0, dividendsOrders, err
  442 + } else {
  443 + dividendsOrders = append(dividendsOrders, dividendsOrder)
  444 + }
443 } 445 }
444 } 446 }
445 return int64(count), dividendsOrders, nil 447 return int64(count), dividendsOrders, nil
@@ -430,17 +430,19 @@ func (repository *DividendsReturnedOrderRepository) Find(queryOptions map[string @@ -430,17 +430,19 @@ func (repository *DividendsReturnedOrderRepository) Find(queryOptions map[string
430 if count, err := query.SelectAndCount(); err != nil { 430 if count, err := query.SelectAndCount(); err != nil {
431 return 0, dividendsReturnedOrders, err 431 return 0, dividendsReturnedOrders, err
432 } else { 432 } else {
433 - for _, dividendsReturnedOrderModel := range dividendsReturnedOrderModels {  
434 - // 获取订单产品  
435 - var orderGoodModels []*models.OrderGood  
436 - orderGoodModelQuery := tx.Model(&orderGoodModels)  
437 - if err := orderGoodModelQuery.Where("dividends_returned_order_number = ?", dividendsReturnedOrderModel.DividendsReturnedOrderNumber).Select(); err != nil {  
438 - return 0, nil, err  
439 - }  
440 - if dividendsReturnedOrder, err := transform.TransformToDividendsReturnedOrderDomainModelFromPgModels(dividendsReturnedOrderModel, orderGoodModels); err != nil {  
441 - return 0, dividendsReturnedOrders, err  
442 - } else {  
443 - dividendsReturnedOrders = append(dividendsReturnedOrders, dividendsReturnedOrder) 433 + if count > 0 {
  434 + for _, dividendsReturnedOrderModel := range dividendsReturnedOrderModels {
  435 + // 获取订单产品
  436 + var orderGoodModels []*models.OrderGood
  437 + orderGoodModelQuery := tx.Model(&orderGoodModels)
  438 + if err := orderGoodModelQuery.Where("dividends_returned_order_number = ?", dividendsReturnedOrderModel.DividendsReturnedOrderNumber).Select(); err != nil {
  439 + return 0, nil, err
  440 + }
  441 + if dividendsReturnedOrder, err := transform.TransformToDividendsReturnedOrderDomainModelFromPgModels(dividendsReturnedOrderModel, orderGoodModels); err != nil {
  442 + return 0, dividendsReturnedOrders, err
  443 + } else {
  444 + dividendsReturnedOrders = append(dividendsReturnedOrders, dividendsReturnedOrder)
  445 + }
444 } 446 }
445 } 447 }
446 return int64(count), dividendsReturnedOrders, nil 448 return int64(count), dividendsReturnedOrders, nil